diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2006-04-22 09:41:10 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2006-04-22 09:41:10 +0000 |
| commit | ef0ba0047acc27a4d9e438e18fcf68e26331bd59 (patch) | |
| tree | 92ee5f962110de8f16165b9e2af76449d7b9d50d | |
| parent | 77cf0118050f7e1500991dd516c2b3a19b2e0d29 (diff) | |
| download | xine-lib-ef0ba0047acc27a4d9e438e18fcf68e26331bd59.tar.gz xine-lib-ef0ba0047acc27a4d9e438e18fcf68e26331bd59.tar.bz2 | |
Use --cppflags from Wand-config of ImageMagick (fixes rare cases with ImageMagick on non-standard prefix).
CVS patchset: 7980
CVS date: 2006/04/22 09:41:10
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/libxinevdec/Makefile.am | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 55bf54ae9..3f4593999 100644 --- a/configure.ac +++ b/configure.ac @@ -1255,6 +1255,7 @@ if test "x$with_imagemagick" = "xyes"; then have_imagemagick="no" else WAND_CFLAGS=`$WAND_CONFIG --cflags` + WAND_CPPFLAGS=`$WAND_CONFIG --cppflags` WAND_LDFLAGS=`$WAND_CONFIG --ldflags` WAND_LIBS=`$WAND_CONFIG --libs` have_imagemagick="yes" @@ -1266,6 +1267,7 @@ fi AM_CONDITIONAL(HAVE_WAND, test x"$have_imagemagick" = "xyes" ) AC_SUBST(WAND_CFLAGS) +AC_SUBST(WAND_CPPFLAGS) AC_SUBST(WAND_LDFLAGS) AC_SUBST(WAND_LIBS) diff --git a/src/libxinevdec/Makefile.am b/src/libxinevdec/Makefile.am index bf1ae1d68..084b2be93 100644 --- a/src/libxinevdec/Makefile.am +++ b/src/libxinevdec/Makefile.am @@ -31,6 +31,7 @@ xineplug_decode_yuv_la_LIBADD = $(XINE_LIB) xineplug_decode_yuv_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_decode_image_la_SOURCES = image.c +xineplug_decode_image_la_CPPFLAGS = $(WAND_CPPFLAGS) xineplug_decode_image_la_CFLAGS = $(WAND_CFLAGS) xineplug_decode_image_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS) $(WAND_LIBS) xineplug_decode_image_la_LDFLAGS = $(WAND_LDFLAGS) -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ |