aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Verona2011-02-12 11:32:30 +0100
committerJoakim Verona2011-02-12 11:32:30 +0100
commit1c53fde4e2b3987dff87c7a2f8953398b7aadcd9 (patch)
tree51cfcb41d2459824b05810db3dbe20138d58a46f
parentb78c0eb3ff296bbeb2142de6894981408e3d27f6 (diff)
downloademacs-old-branches/imagemagick.tar.gz
emacs-old-branches/imagemagick.zip
Include a test for required Im version. The exact version isnt known yet so I guess a version from reportsold-branches/imagemagick
-rwxr-xr-xconfigure3
-rw-r--r--configure.in3
2 files changed, 4 insertions, 2 deletions
diff --git a/configure b/configure
index e67071dfd83..4e1ecd9c2aa 100755
--- a/configure
+++ b/configure
@@ -9184,7 +9184,8 @@ fi
9184HAVE_IMAGEMAGICK=no 9184HAVE_IMAGEMAGICK=no
9185if test "${HAVE_X11}" = "yes"; then 9185if test "${HAVE_X11}" = "yes"; then
9186 if test "${with_imagemagick}" != "no"; then 9186 if test "${with_imagemagick}" != "no"; then
9187 IMAGEMAGICK_MODULE="Wand" 9187 IMAGEMAGICK_REQUIRED=4.0.5
9188 IMAGEMAGICK_MODULE="Wand >= $IMAGEMAGICK_REQUIRED"
9188 9189
9189 succeeded=no 9190 succeeded=no
9190 9191
diff --git a/configure.in b/configure.in
index a7317833619..3b4c4853434 100644
--- a/configure.in
+++ b/configure.in
@@ -1822,7 +1822,8 @@ fi
1822HAVE_IMAGEMAGICK=no 1822HAVE_IMAGEMAGICK=no
1823if test "${HAVE_X11}" = "yes"; then 1823if test "${HAVE_X11}" = "yes"; then
1824 if test "${with_imagemagick}" != "no"; then 1824 if test "${with_imagemagick}" != "no"; then
1825 IMAGEMAGICK_MODULE="Wand" 1825 IMAGEMAGICK_REQUIRED=4.0.5
1826 IMAGEMAGICK_MODULE="Wand >= $IMAGEMAGICK_REQUIRED"
1826 PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, HAVE_IMAGEMAGICK=yes, :) 1827 PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, HAVE_IMAGEMAGICK=yes, :)
1827 AC_SUBST(IMAGEMAGICK_CFLAGS) 1828 AC_SUBST(IMAGEMAGICK_CFLAGS)
1828 AC_SUBST(IMAGEMAGICK_LIBS) 1829 AC_SUBST(IMAGEMAGICK_LIBS)