diff options
| author | Paul Eggert | 2017-07-24 15:13:26 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-07-24 15:14:32 -0700 |
| commit | b46a02eda44161afd4b2a6b0cdb1fed3efc504fd (patch) | |
| tree | cf0ced8a0b5d272f1f5a0c138ffd6deb5cd3a40b | |
| parent | 3d847fa9fd68592c50ea5e18c86b9f3eb5030654 (diff) | |
| download | emacs-b46a02eda44161afd4b2a6b0cdb1fed3efc504fd.tar.gz emacs-b46a02eda44161afd4b2a6b0cdb1fed3efc504fd.zip | |
Do not use ImageMagick 7 and later
Suggested by Glenn Morris (Bug#25967#15).
* configure.ac (IMAGEMAGICK_MODULE): Reject 7 and later.
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 2 insertions, 1 deletions
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}" | |||
| 2507 | if test "${with_imagemagick}" != "no"; then | 2507 | if test "${with_imagemagick}" != "no"; then |
| 2508 | ## 6.3.5 is the earliest version known to work; see Bug#17339. | 2508 | ## 6.3.5 is the earliest version known to work; see Bug#17339. |
| 2509 | ## 6.8.2 makes Emacs crash; see Bug#13867. | 2509 | ## 6.8.2 makes Emacs crash; see Bug#13867. |
| 2510 | IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2" | 2510 | ## 7 and later have not been ported to; See Bug#25967. |
| 2511 | IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2 Wand < 7" | ||
| 2511 | EMACS_CHECK_MODULES([IMAGEMAGICK], [$IMAGEMAGICK_MODULE]) | 2512 | EMACS_CHECK_MODULES([IMAGEMAGICK], [$IMAGEMAGICK_MODULE]) |
| 2512 | 2513 | ||
| 2513 | if test $HAVE_IMAGEMAGICK = yes; then | 2514 | if test $HAVE_IMAGEMAGICK = yes; then |