[Emacs-diffs] /srv/bzr/emacs/trunk r103891: ImageMagick fix for bug#7955.

[Glenn Morris]

------------------------------------------------------------
revno: 103891
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2011-04-11 20:55:07 -0700
message:
  ImageMagick fix for bug#7955.
  
  * configure.in: Require ImageMagick >= 6.2.8.  (Bug#7955)
  
  * etc/NEWS: Mention ImageMagick version.
modified:
  ChangeLog
  configure.in
  etc/NEWS

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-04-09 18:42:31 +0000
+++ b/ChangeLog 2011-04-12 03:55:07 +0000
@@ -1,3 +1,7 @@
+2011-04-12  Glenn Morris  <address@hidden>
+
+       * configure.in: Require ImageMagick >= 6.2.8.  (Bug#7955)
+
 2011-04-09  Paul Eggert  <address@hidden>
 
        * lib/allocator.c: New file, automatically generated by gnulib.

=== modified file 'configure.in'
--- a/configure.in      2011-04-05 19:59:08 +0000
+++ b/configure.in      2011-04-12 03:55:07 +0000
@@ -1805,7 +1805,10 @@
 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)

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2011-04-06 20:10:51 +0000
+++ b/etc/NEWS  2011-04-12 03:55:07 +0000
@@ -131,8 +131,10 @@
 ** 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