Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added check for MagickLibAddendum (replaced MagickLibSubversion).

  • Loading branch information...
commit 70dfc29c883588a6bf7d609dd70193f3ce49509d 1 parent 3fb06f2
Omer Bar-or authored
Showing with 10 additions and 2 deletions.
  1. +2 −1  ext/RMagick/extconf.rb
  2. +8 −1 ext/RMagick/rmagick.h
View
3  ext/RMagick/extconf.rb
@@ -204,7 +204,7 @@ def check_partial_imagemagick_versions()
if RUBY_PLATFORM !~ /mswin|mingw/
- unless have_library("MagickCore", "InitializeMagick", headers) || have_library("Magick", "InitializeMagick", headers) || have_library("Magick++", "InitializeMagick", headers)
+ unless have_library("MagickCore", "InitializeMagick", headers) || have_library("Magick", "InitializeMagick", headers) || have_library("Magick++","InitializeMagick",headers)
exit_failure "Can't install RMagick #{RMAGICK_VERS}. " +
"Can't find the ImageMagick library or one of the dependent libraries. " +
"Check the mkmf.log file for more detailed information.\n"
@@ -233,6 +233,7 @@ def check_partial_imagemagick_versions()
"LevelColorsImageChannel", # 6.5.6-4
"LevelizeImageChannel", # 6.4.2
"LiquidRescaleImage", # 6.3.8-2
+ "MagickLibAddendum", # 6.5.9-1
"OpaquePaintImageChannel", # 6.3.7-10
"QueueAuthenticPixels", # 6.4.5-6
"RemapImage", # 6.4.4-0
View
9 ext/RMagick/rmagick.h
@@ -6,7 +6,7 @@
* Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
*
* @file rmagick.h
- * @version $Id: rmagick.h,v 1.281 2009/12/21 10:34:56 baror Exp $
+ * @version $Id: rmagick.h,v 1.282 2010/02/16 06:50:28 baror Exp $
* @author Tim Hunter
******************************************************************************/
@@ -162,6 +162,13 @@
#define DestroyConstitute(void) ConstituteComponentTerminus(void)
#endif
+/** ImageMagick 6.5.9 replaced MagickLibSubversion with
+ * MagickLibAddendum.
+ */
+#if defined(HAVE_MAGICKLIBADDENDUM)
+#define MagickLibSubversion MagickLibAddendum
+#endif
+
/** IM 6.4.1 replaced AllocateImage with AcquireImage.
* Both have the same signature.
*/
Please sign in to comment.
Something went wrong with that request. Please try again.