AC_SUBST(IMAGEMAGICK_LIBS)
--- emacs-24.3/src/image.c~ 2016-12-25 12:47:48.000000000 +0100
+++ emacs-24.3/src/image.c 2016-12-25 12:52:35.931084598 +0100
-@@ -7618,11 +7618,11 @@
+@@ -7618,14 +7618,14 @@
/* The GIF library also defines DrawRectangle, but its never used in Emacs.
Therefore rename the function so it doesn't collide with ImageMagick. */
#define DrawRectangle DrawRectangleGif
+#include <MagickCore/version.h>
#if 0x653 <= MagickLibVersion && MagickLibVersion <= 0x665
extern WandExport void PixelGetMagickColor (const PixelWand *,
- MagickPixelPacket *);
+- MagickPixelPacket *);
++ PixelInfo *);
+ #endif
+
+ /* Log ImageMagick error message.
+@@ -8402,7 +8402,7 @@
+ PixelWand **source, **dest;
+ size_t source_width, source_height;
+ ssize_t source_left, source_top;
+- MagickPixelPacket pixel;
++ PixelInfo pixel;
+ DisposeType dispose;
+ ptrdiff_t lines = 0;
+
+@@ -8467,7 +8467,7 @@
+ if (dispose == BackgroundDispose || PixelGetAlpha (source[x]))
+ {
+ PixelGetMagickColor (source[x], &pixel);
+- PixelSetMagickColor (dest[x + source_left], &pixel);
++ PixelSetPixelColor (dest[x + source_left], &pixel);
+ }
+ }
+ PixelSyncIterator (dest_iterator);
+@@ -8512,7 +8512,7 @@
+ MagickWand *image_wand;
+ PixelIterator *iterator;
+ PixelWand **pixels, *bg_wand = NULL;
+- MagickPixelPacket pixel;
++ PixelInfo pixel;
+ Lisp_Object image;
+ Lisp_Object value;
+ Lisp_Object crop;