diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-06-15 13:05:50 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-06-15 13:05:50 +0000 |
| commit | 0a8ac9501bf5385d3088183de3b0b63d6c018579 (patch) | |
| tree | 67f2058ea1fee7487246ec9b3ee31b7adc0c8e1f | |
| parent | a2f94b010a30ad2e4b013ca7e35a5d8ba1c4c2d3 (diff) | |
| download | xine-lib-0a8ac9501bf5385d3088183de3b0b63d6c018579.tar.gz xine-lib-0a8ac9501bf5385d3088183de3b0b63d6c018579.tar.bz2 | |
Make HAVE_WAND and HAVE_GDK_PIXBUF a single conditional.
CVS patchset: 8037
CVS date: 2006/06/15 13:05:50
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/demuxers/Makefile.am | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index d623f4f7f..b89ec065d 100644 --- a/configure.ac +++ b/configure.ac @@ -2270,6 +2270,8 @@ dnl as long as neither autoconf nor automake offer an A[CM]_PROG_OBJC dnl check we will have to call it _AM_DEPENDENCIES([OBJC]) +AM_CONDITIONAL([BUILD_DMX_IMAGE], [test x"$have_imagemagick" = "xyes" -o x"$no_gdkpixbuf" != "xyes"]) + dnl --------------------------------------------- dnl Output configuration files diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am index 0e5d210b0..7e15cda28 100644 --- a/src/demuxers/Makefile.am +++ b/src/demuxers/Makefile.am @@ -19,10 +19,7 @@ if HAVE_LIBMNG mng_module = xineplug_dmx_mng.la endif -if HAVE_WAND -image_module = xineplug_dmx_image.la -endif -if HAVE_GDK_PIXBUF +if BUILD_DMX_IMAGE image_module = xineplug_dmx_image.la endif |