diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-07-28 21:51:30 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-07-28 21:51:30 +0100 |
| commit | 909a16537e3bc305ddb8a77bd7df163269ac1803 (patch) | |
| tree | d931759dfb3a4705021877e61ca00d261a5d8a0b | |
| parent | d28c6200f668f7631a396af199dd6bc04b27900c (diff) | |
| download | xine-lib-909a16537e3bc305ddb8a77bd7df163269ac1803.tar.gz xine-lib-909a16537e3bc305ddb8a77bd7df163269ac1803.tar.bz2 | |
Allow GraphicsMagick (compat layer) to be used instead of ImageMagick.
Debian build deps are adjusted accordingly.
| -rw-r--r-- | configure.ac | 21 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 17 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index dc53a73a5..52ea29b0b 100644 --- a/configure.ac +++ b/configure.ac @@ -1416,15 +1416,26 @@ dnl MagickWand API of Imagemagick. dnl --------------------------------------------- AC_ARG_WITH([imagemagick], - AS_HELP_STRING([--without-imagemagick], [Build without ImageMagick image decoder])) + AS_HELP_STRING([--without-imagemagick], [Build without ImageMagick image decoder (or GraphicsMagick's compat layer)])) 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]) + 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" = "xyes" && test "x$have_imagemagick" = "xno"; then - AC_MSG_ERROR([ImageMagick support requested, but neither Wand nor MagickWand were found]) + AC_MSG_ERROR([ImageMagick support requested, but neither Wand, MagickWand, nor GraphicsMagick were found]) elif test "x$have_imagemagick" = "xyes"; then AC_DEFINE([HAVE_WAND], [1], [Define this if you have ImageMagick installed]) fi diff --git a/debian/control b/debian/control index 175db7225..7ce52370e 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config, libcam-dev [kfreebsd-i386 kfreebsd-amd64], libaa1-dev, libcaca-dev, libmodplug-dev, libjack-dev, libpulse-dev, libartsc0-dev, - libmagick9-dev | libmagick-dev |libmagickwand-dev, + graphicsmagick-libmagick-dev-compat | libmagick9-dev | libmagick-dev | libmagickwand-dev, libpng12-dev, libfreetype6-dev, libogg-dev, libvorbis-dev, libtheora-dev, libesd0-dev, libgnomevfs2-dev, |