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).

diff --git a/ChangeLog b/ChangeLog
index 9d2548f..8f737a1 100644 (file)
--- 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 f267a81..636061f 100644 (file)
--- 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