aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Verona2010-05-13 16:04:53 +0200
committerJoakim Verona2010-05-13 16:04:53 +0200
commitef30d1ad3e9abe32001d8d863ae7314ca2a636f2 (patch)
treec6b399fc725edfab600975d950fbeb34edd255e1
parentce07fa9adcea121b5515f98e161e257d1210c9b0 (diff)
downloademacs-ef30d1ad3e9abe32001d8d863ae7314ca2a636f2.tar.gz
emacs-ef30d1ad3e9abe32001d8d863ae7314ca2a636f2.zip
make configure.in less particular about themagickwand version
-rwxr-xr-xconfigure3
-rw-r--r--configure.in3
2 files changed, 2 insertions, 4 deletions
diff --git a/configure b/configure
index ae6f8266211..8c4dc2df865 100755
--- a/configure
+++ b/configure
@@ -11785,8 +11785,7 @@ fi
11785 11785
11786HAVE_IMAGEMAGICK=no 11786HAVE_IMAGEMAGICK=no
11787if test "${with_imagemagick}" != "no"; then 11787if test "${with_imagemagick}" != "no"; then
11788 IMAGEMAGICK_REQUIRED=1 11788 IMAGEMAGICK_MODULE="Wand"
11789 IMAGEMAGICK_MODULE="MagickWand >= $IMAGEMAGICK_REQUIRED"
11790 11789
11791 succeeded=no 11790 succeeded=no
11792 11791
diff --git a/configure.in b/configure.in
index cd6500b51e1..58cace5895f 100644
--- a/configure.in
+++ b/configure.in
@@ -1755,8 +1755,7 @@ fi
1755 1755
1756HAVE_IMAGEMAGICK=no 1756HAVE_IMAGEMAGICK=no
1757if test "${with_imagemagick}" != "no"; then 1757if test "${with_imagemagick}" != "no"; then
1758 IMAGEMAGICK_REQUIRED=1 1758 IMAGEMAGICK_MODULE="Wand"
1759 IMAGEMAGICK_MODULE="MagickWand >= $IMAGEMAGICK_REQUIRED"
1760 PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, :, :) 1759 PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, :, :)
1761 AC_SUBST(IMAGEMAGICK_CFLAGS) 1760 AC_SUBST(IMAGEMAGICK_CFLAGS)
1762 AC_SUBST(IMAGEMAGICK_LIBS) 1761 AC_SUBST(IMAGEMAGICK_LIBS)