From 370f10f1a08177345c547af0554d995c95c7ef8e 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:48:04 +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 ++++++
 common       |  2 +-
 configure.ac | 15 +++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 54ad21117a..ecc63e07a7 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-15  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/a52dec/Makefile.am:
diff --git a/common b/common
index dd85f55044..bbfa014696 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit dd85f550441bd5722b98f4dd304e40826383240f
+Subproject commit bbfa0146961f4ca61ddbca7b42360b5741a6354b
diff --git a/configure.ac b/configure.ac
index 1a976d5983..b5d4dcc9d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -348,6 +348,21 @@ GST_CHECK_FEATURE(SIDPLAY, [libsidplay], sid, [
   GST_PATH_SIDPLAY()
 ])
 
+else
+
+dnl not building plugins with external dependencies,
+dnl but we still need to set the conditionals
+
+AM_CONDITIONAL(USE_A52DEC, false)
+AM_CONDITIONAL(USE_AMRNB, false)
+AM_CONDITIONAL(USE_DVDREAD, false)
+AM_CONDITIONAL(USE_DVDNAV, false)
+AM_CONDITIONAL(USE_LAME, false)
+AM_CONDITIONAL(USE_ID3TAG, false)
+AM_CONDITIONAL(USE_MAD, false)
+AM_CONDITIONAL(USE_MPEG2DEC, false)
+AM_CONDITIONAL(USE_SIDPLAY, false)
+
 fi dnl of EXT plugins
 
 dnl *** finalize CFLAGS, LDFLAGS, LIBS