* configure.ac, src/image.c: Tweak previous ImageMagick change.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/image.c b/src/image.c
index 7e518ce34f8..36a909ba053 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8274,15 +8274,15 @@ imagemagick_image_p (Lisp_Object object)
    Therefore rename the function so it doesn't collide with ImageMagick.  */
 #define DrawRectangle DrawRectangleGif
 
-#if IMAGEMAGICK_MAJOR == 6
-# include <wand/MagickWand.h>
-# include <magick/version.h>
-#else
+#ifdef HAVE_IMAGEMAGICK7
 # include <MagickWand/MagickWand.h>
 # include <MagickCore/version.h>
-/* ImageMagick 7 compatibility definitions */
+/* ImageMagick 7 compatibility definitions.  */
 # define PixelSetMagickColor PixelSetPixelColor
 typedef PixelInfo MagickPixelPacket;
+#else
+# include <wand/MagickWand.h>
+# include <magick/version.h>
 #endif
 
 /* ImageMagick 6.5.3 through 6.6.5 hid PixelGetMagickColor for some reason.