aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorPaul Eggert2014-05-03 14:06:04 -0700
committerPaul Eggert2014-05-03 14:06:04 -0700
commit7e00998fbc3e04e5bb613076cec816eccfa8bb3e (patch)
tree571e0d26af38404ba924afad63344054db0f111d /configure.ac
parentd355cad6b78c35050ba94016bb7ee12acbd257ee (diff)
downloademacs-7e00998fbc3e04e5bb613076cec816eccfa8bb3e.tar.gz
emacs-7e00998fbc3e04e5bb613076cec816eccfa8bb3e.zip
Require ImageMagick >= 6.3.5, due to PixelSetMagickColor.
* configure.ac (IMAGEMAGICK_MODULE): Bump prereq from 6.2.8 to 6.3.5. A more-complicated fix would be to remove uses of PixelSetMagickColor, introduced in ImageMagick 6.3.5 (Sept. 2007). Fixes: debbugs:17339
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac6
1 files changed, 2 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index ee4826f1574..4fd842817b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2225,11 +2225,9 @@ fi
2225HAVE_IMAGEMAGICK=no 2225HAVE_IMAGEMAGICK=no
2226if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${HAVE_W32}" = "yes"; then 2226if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${HAVE_W32}" = "yes"; then
2227 if test "${with_imagemagick}" != "no"; then 2227 if test "${with_imagemagick}" != "no"; then
2228 ## 6.2.8 is the earliest version known to work, but earlier versions 2228 ## 6.3.5 is the earliest version known to work; see Bug#17339.
2229 ## might work - let us know if you find one.
2230 ## 6.0.7 does not work. See bug#7955.
2231 ## 6.8.2 makes Emacs crash; see Bug#13867. 2229 ## 6.8.2 makes Emacs crash; see Bug#13867.
2232 IMAGEMAGICK_MODULE="Wand >= 6.2.8 Wand != 6.8.2" 2230 IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2"
2233 PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, HAVE_IMAGEMAGICK=yes, :) 2231 PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, HAVE_IMAGEMAGICK=yes, :)
2234 AC_SUBST(IMAGEMAGICK_CFLAGS) 2232 AC_SUBST(IMAGEMAGICK_CFLAGS)
2235 AC_SUBST(IMAGEMAGICK_LIBS) 2233 AC_SUBST(IMAGEMAGICK_LIBS)