summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-11-29 00:44:40 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-11-29 00:44:40 +0000
commitb76642ecafab4e4f17c3edb6142da1ffb7d92965 (patch)
tree16530f600a8a522e538a003352912cb02a23657a
parentc3f26e9ecfbaeddbecbb49f80e7995781597fbc4 (diff)
downloadxine-lib-b76642ecafab4e4f17c3edb6142da1ffb7d92965.tar.gz
xine-lib-b76642ecafab4e4f17c3edb6142da1ffb7d92965.tar.bz2
Newer ImageMagick has GraphicsMagickWand.pc, not Wand.pc
(Reported by Loïc Minier.)
-rw-r--r--configure.ac5
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 3d04b2a60..41bed9e70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1370,8 +1370,11 @@ AC_ARG_WITH([imagemagick],
if test "x$with_imagemagick" != "xno"; then
PKG_CHECK_MODULES([WAND], [Wand], [have_imagemagick=yes], [have_imagemagick=no])
+ if test "x$with_imagemagick" = 'xno'; then
+ PKG_CHECK_MODULES([WAND], [MagickWand], [have_imagemagick=yes], [have_imagemagick=no])
+ fi
if test "x$with_imagemagick" = "xyes" && test "x$have_imagemagick" = "xno"; then
- AC_MSG_ERROR([ImageMagick support requested, but Wand not found])
+ AC_MSG_ERROR([ImageMagick support requested, but neither Wand nor MagickWand were found])
elif test "x$have_imagemagick" = "xyes"; then
AC_DEFINE([HAVE_WAND], [1], [Define this if you have ImageMagick installed])
fi