From bf9e04e2db0d26cdd7a4343cd41170dc2c6b0b00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Sat, 17 Jun 2006 14:35:37 +0000
Subject: [PATCH] configure.ac: Fix --disable-external (can't set conditionals
 conditionally, #343602).

Original commit message from CVS:
* configure.ac:
Fix --disable-external (can't set conditionals conditionally,
#343602).
---
 ChangeLog    |  6 ++++++
 configure.ac | 29 +++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 9d2548f6fc..8f737a1cac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-17  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* configure.ac:
+	  Fix --disable-external (can't set conditionals conditionally,
+	  #343602).
+
 2006-06-16  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* autogen.sh:
diff --git a/configure.ac b/configure.ac
index f267a818ac..636061fa62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -651,6 +651,35 @@ GST_CHECK_FEATURE(ZLIB, [zlib support for id3demux],, [
   ])
 ])
 
+else
+
+dnl not building plugins with external dependencies,
+dnl but we still need to set the conditionals
+AM_CONDITIONAL(USE_GCONFTOOL, false)
+AM_CONDITIONAL(USE_OSS, false)
+AM_CONDITIONAL(USE_SUNAUDIO, false)
+AM_CONDITIONAL(USE_X, false)
+AM_CONDITIONAL(USE_XSHM, false)
+AM_CONDITIONAL(USE_AALIB, false)
+AM_CONDITIONAL(USE_ANNODEX, false)
+AM_CONDITIONAL(USE_CAIRO, false)
+AM_CONDITIONAL(USE_CDIO, false)
+AM_CONDITIONAL(USE_ESD, false)
+AM_CONDITIONAL(USE_FLAC, false)
+AM_CONDITIONAL(USE_GCONF, false)
+AM_CONDITIONAL(USE_GDK_PIXBUF, false)
+AM_CONDITIONAL(USE_HAL, false)
+AM_CONDITIONAL(USE_JPEG, false)
+AM_CONDITIONAL(USE_LADSPA, false)
+AM_CONDITIONAL(USE_LIBCACA, false)
+AM_CONDITIONAL(USE_LIBDV, false)
+AM_CONDITIONAL(USE_LIBPNG, false)
+AM_CONDITIONAL(USE_DV1394, false)
+AM_CONDITIONAL(USE_SHOUT2, false)
+AM_CONDITIONAL(USE_SPEEX, false)
+AM_CONDITIONAL(USE_TAGLIB, false)
+AM_CONDITIONAL(USE_ZLIB, false)
+
 fi dnl of EXT plugins
 
 dnl *** finalize CFLAGS, LDFLAGS, LIBS