[Emacs-diffs] master b46a02e: Do not use ImageMagick 7 and later

[Paul Eggert]

branch: master
commit b46a02eda44161afd4b2a6b0cdb1fed3efc504fd
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Do not use ImageMagick 7 and later
    
    Suggested by Glenn Morris (Bug#25967#15).
    * configure.ac (IMAGEMAGICK_MODULE): Reject 7 and later.
---
 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 5e6dbda..648da99 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