diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-07-29 20:35:28 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-07-29 20:35:28 +0100 |
| commit | 9a6e4bd01cdde4ef55afdda47c4d8b34f42e767b (patch) | |
| tree | 8ecff5b5aa6da25c8c4feb97c8b3f4dfb04ae76c /m4 | |
| parent | 51ee5df118326a3d2374f2432fff63dd3edceaf6 (diff) | |
| parent | c41975a7b4ca8e473979bfa13229f6077b951697 (diff) | |
| download | xine-lib-9a6e4bd01cdde4ef55afdda47c4d8b34f42e767b.tar.gz xine-lib-9a6e4bd01cdde4ef55afdda47c4d8b34f42e767b.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/decoders.m4 | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/m4/decoders.m4 b/m4/decoders.m4 index ac5b6a1c4..ea3bf98d2 100644 --- a/m4/decoders.m4 +++ b/m4/decoders.m4 @@ -116,12 +116,23 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [ [AS_HELP_STRING([--with-imagemagick], [Enable ImageMagick image decoder support (default: enabled)])], [test x"$withval" != x"no" && with_imagemagick="yes"]) if test x"$with_imagemagick" != x"no"; 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]) + PKG_CHECK_MODULES([WAND], [Wand], [have_imagemagick=yes], [AC_MSG_RESULT([no]); have_imagemagick=no]) + if test "x$have_imagemagick" = 'xno'; then + PKG_CHECK_MODULES([MAGICKWAND], [MagickWand], [have_imagemagick=yes], [AC_MSG_RESULT([no]); have_imagemagick=no]) + dnl Avoid $(WAND_FLAGS) $(MAGICKWAND_FLAGS) ... + WAND_CFLAGS="$MAGICKWAND_CFLAGS" + WAND_LIBS="$MAGICKWAND_LIBS" + fi + if test "x$have_imagemagick" = 'xno'; then + PKG_CHECK_MODULES([GRAPHICSMAGICK], [ImageMagick], [have_imagemagick=yes], [AC_MSG_RESULT([no]); have_imagemagick=no]) + PKG_CHECK_MODULES([GRAPHICSMAGICKWAND], [GraphicsMagickWand], [have_imagemagick=yes], [AC_MSG_RESULT([no]); have_imagemagick=no]) + dnl The following assignments are safe, since they include + dnl the flags for plain GraphicsMagick + WAND_CFLAGS="$GRAPHICSMAGICKWAND_CFLAGS" + WAND_LIBS="$GRAPHICSMAGICKWAND_LIBS" fi if test x"$with_imagemagick" = x"yes" && test x"$have_imagemagick" = x"no"; then - AC_MSG_ERROR([ImageMagick support requested, but ImageMagick not found]) + AC_MSG_ERROR([ImageMagick support requested, but neither Wand, MagickWand, nor GraphicsMagick were found]) fi fi AM_CONDITIONAL([ENABLE_IMAGEMAGICK], [test x"$have_imagemagick" = x"yes"]) |