From: Glenn Morris <rgm@gnu.org>
Date: Tue, 12 Apr 2011 03:55:07 +0000 (-0700)
Subject: ImageMagick fix for bug#7955.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~283^2~20
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f5b06c3546138ce5181ff6efd211dfe2516edcaa;p=emacs.git

ImageMagick fix for bug#7955.

* configure.in: Require ImageMagick >= 6.2.8.  (Bug#7955)

* etc/NEWS: Mention ImageMagick version.
---

diff --git a/ChangeLog b/ChangeLog
index b766dbed7dd..a63fbc96bff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-12  Glenn Morris  <rgm@gnu.org>
+
+	* configure.in: Require ImageMagick >= 6.2.8.  (Bug#7955)
+
 2011-04-09  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* lib/allocator.c: New file, automatically generated by gnulib.
diff --git a/configure.in b/configure.in
index fef19f27642..3d99873eabb 100644
--- a/configure.in
+++ b/configure.in
@@ -1805,7 +1805,10 @@ fi
 HAVE_IMAGEMAGICK=no
 if test "${HAVE_X11}" = "yes"; then
   if test "${with_imagemagick}" != "no"; then
-    IMAGEMAGICK_MODULE="Wand"
+    ## 6.2.8 is the earliest version known to work, but earlier versions
+    ## might work - let us know if you find one.
+    ## 6.0.7 does not work.  See bug#7955.
+    IMAGEMAGICK_MODULE="Wand >= 6.2.8"
     PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, HAVE_IMAGEMAGICK=yes, :)
     AC_SUBST(IMAGEMAGICK_CFLAGS)
     AC_SUBST(IMAGEMAGICK_LIBS)
diff --git a/etc/NEWS b/etc/NEWS
index 08d94a4e9cb..869e95216e5 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -131,8 +131,10 @@ for this.
 ** ImageMagick support.
 It is now possible to use the ImageMagick library to load many new
 image formats in Emacs.  By default, Emacs links with the ImageMagick
-libraries if they are present at build time.  To disable this, use
-the configure option `--without-imagemagick'.
+libraries if they are present at build time.  This needs ImageMagick
+6.2.8 or newer (versions newer than 6.0.7 _may_ work but have not been
+tested).  To disable ImageMagick support, use the configure option
+`--without-imagemagick'.  
 
 The new function `imagemagick-types' returns a list of image file
 extensions that your installation of ImageMagick supports.  The