diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-01-14 00:58:53 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-01-14 00:58:53 +0000 |
| commit | 7dc471882c5cb83af78a9357fa71efed75ac47df (patch) | |
| tree | 6d3989052d13d40c608c15a529d6f9afe29ed1ea /m4 | |
| parent | 101c3a13de83f9e344b00a06eeecbcd43e1be638 (diff) | |
| parent | 9776c5dad4e77cb84f27961a50cc24993785e54a (diff) | |
| download | xine-lib-7dc471882c5cb83af78a9357fa71efed75ac47df.tar.gz xine-lib-7dc471882c5cb83af78a9357fa71efed75ac47df.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libxinevdec/image.c => src/video_dec/image.c
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/decoders.m4 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/m4/decoders.m4 b/m4/decoders.m4 index d8e3ac571..203d651b5 100644 --- a/m4/decoders.m4 +++ b/m4/decoders.m4 @@ -113,6 +113,9 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [ [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]) + 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]) fi |