From 0a8ac9501bf5385d3088183de3b0b63d6c018579 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Thu, 15 Jun 2006 13:05:50 +0000
Subject: Make HAVE_WAND and HAVE_GDK_PIXBUF a single conditional.

CVS patchset: 8037
CVS date: 2006/06/15 13:05:50
---
 configure.ac             | 2 ++
 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
 
-- 
cgit v1.2.3