diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-08-30 13:56:08 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-08-30 13:56:08 -0400 |
| commit | 3cc42bb60099c32f64e57d2ee33c8321adba7942 (patch) | |
| tree | f70640ad22c470328406126c7dcb56afc018ac4b /configure.ac | |
| parent | 42ed35c68b7c199aa797e655fdc3547c5c3087d2 (diff) | |
| download | emacs-3cc42bb60099c32f64e57d2ee33c8321adba7942.tar.gz | |
* configure.ac: Fix goofs in my recent ImageMagick change.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 85ac932688c..6f3d7338c35 100644 --- a/configure.ac +++ b/configure.ac @@ -2515,10 +2515,9 @@ if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${HAVE_W32}" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH$PATH_SEPARATOR`$BREW --prefix imagemagick@6 2>/dev/null`/lib/pkgconfig" fi - EMACS_CHECK_MODULES([IMAGEMAGICK7], [MagickWand >= 7]) - if test $HAVE_IMAGEMAGICK7 = yes; then + EMACS_CHECK_MODULES([IMAGEMAGICK], [MagickWand >= 7]) + if test $HAVE_IMAGEMAGICK = yes; then AC_DEFINE([HAVE_IMAGEMAGICK7], 1, [Define to 1 if using ImageMagick7.]) - HAVE_IMAGEMAGICK = yes else ## 6.3.5 is the earliest version known to work; see Bug#17339. ## 6.8.2 makes Emacs crash; see Bug#13867. @@ -2543,8 +2542,6 @@ if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${HAVE_W32}" fi if test $HAVE_IMAGEMAGICK = yes; then AC_DEFINE([HAVE_IMAGEMAGICK], 1, [Define to 1 if using ImageMagick.]) - AC_DEFINE_UNQUOTED([IMAGEMAGICK_MAJOR], [$IMAGEMAGICK_MAJOR], - [ImageMagick major version number (from configure).]) else IMAGEMAGICK_CFLAGS= IMAGEMAGICK_LIBS= |