diff options
| author | Stefan Holst <holstsn@users.sourceforge.net> | 2005-02-03 23:18:33 +0000 |
|---|---|---|
| committer | Stefan Holst <holstsn@users.sourceforge.net> | 2005-02-03 23:18:33 +0000 |
| commit | 484a83b43658b3b0a6e06bc97eec9395e8917322 (patch) | |
| tree | c6ff6d1d3932f99667e8584568178aba7bcc2ad1 /configure.ac | |
| parent | a24e8ab569599c0ed5782211383a23b85e3ad45f (diff) | |
| download | xine-lib-484a83b43658b3b0a6e06bc97eec9395e8917322.tar.gz xine-lib-484a83b43658b3b0a6e06bc97eec9395e8917322.tar.bz2 | |
make the image decoder use imagemagick to decode images. slight improvements of image dummy demuxer which now sends proper end-of-frame flags
CVS patchset: 7381
CVS date: 2005/02/03 23:18:33
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 60637c56a..4a0dad4fb 100644 --- a/configure.ac +++ b/configure.ac @@ -1039,28 +1039,25 @@ AC_CHECK_LIB(mng, mng_initialize, AM_CONDITIONAL(HAVE_LIBMNG, test x"$have_libmng" = "xyes") AC_SUBST(MNG_LIBS) - dnl --------------------------------------------- -dnl PNG lib. +dnl MagickWand API of Imagemagick. dnl --------------------------------------------- -AC_PATH_PROG(LIBPNG_CONFIG, libpng-config, no) -if test "$LIBPNG_CONFIG" = "no" ; then - AC_CHECK_LIB(png, png_create_read_struct, - have_libpng=yes - PNG_LIBS="-lpng", - AC_MSG_RESULT([*** All libpng dependent parts will be disabled ***])) +AC_PATH_PROG(WAND_CONFIG, Wand-config, no) +if test "$WAND_CONFIG" = "no" ; then + AC_MSG_RESULT([*** All Imagemagick dependent parts will be disabled, Wand-config not found. ***]) else - PNG_CFLAGS=`$LIBPNG_CONFIG --cflags` - PNG_LIBS=`$LIBPNG_CONFIG --libs` - have_libpng="yes" - AC_DEFINE(HAVE_LIBPNG,1,[Define this if you have png library]) + WAND_CFLAGS=`$WAND_CONFIG --cflags` + WAND_LDFLAGS=`$WAND_CONFIG --ldflags` + WAND_LIBS=`$WAND_CONFIG --libs` + have_imagemagick="yes" + AC_DEFINE(HAVE_WAND,1,[Define this if you have Imagemagick]) fi -AM_CONDITIONAL(HAVE_LIBPNG, test x"$have_libpng" = "xyes" ) -AC_SUBST(PNG_CFLAGS) -AC_SUBST(PNG_LIBS) - +AM_CONDITIONAL(HAVE_WAND, test x"$have_imagemagick" = "xyes" ) +AC_SUBST(WAND_CFLAGS) +AC_SUBST(WAND_LDFLAGS) +AC_SUBST(WAND_LIBS) dnl --------------------------------------------- dnl freetype2 lib. |