From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 24 Jul 2017 22:13:26 +0000 (-0700)
Subject: Do not use ImageMagick 7 and later
X-Git-Tag: emacs-26.0.90~518^2~4
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b46a02eda44161afd4b2a6b0cdb1fed3efc504fd;p=emacs.git

Do not use ImageMagick 7 and later

Suggested by Glenn Morris (Bug#25967#15).
* configure.ac (IMAGEMAGICK_MODULE): Reject 7 and later.
---

diff --git a/configure.ac b/configure.ac
index 5e6dbda2b63..648da9939da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2507,7 +2507,8 @@ if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${HAVE_W32}"
   if test "${with_imagemagick}" != "no"; then
     ## 6.3.5 is the earliest version known to work; see Bug#17339.
     ## 6.8.2 makes Emacs crash; see Bug#13867.
-    IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2"
+    ## 7 and later have not been ported to; See Bug#25967.
+    IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2 Wand < 7"
     EMACS_CHECK_MODULES([IMAGEMAGICK], [$IMAGEMAGICK_MODULE])
 
     if test $HAVE_IMAGEMAGICK = yes; then