summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac24
2 files changed, 19 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index a66f257d..6e06b3d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-01 Tim-Philipp Müller <tim.muller at collabora co uk>
+
+ * configure.ac:
+ Fix --disable-external
+
2008-08-31 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* ext/wavpack/gstwavpackenc.c: (gst_wavpack_enc_reset),
diff --git a/configure.ac b/configure.ac
index 382bd679..2b3c4f18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -949,33 +949,37 @@ 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_DIRECTDRAW, false)
-AM_CONDITIONAL(USE_DIRECTSOUND, false)
-AM_CONDITIONAL(USE_OSS, false)
-AM_CONDITIONAL(USE_SUNAUDIO, false)
-AM_CONDITIONAL(USE_OSX_AUDIO, false)
-AM_CONDITIONAL(USE_OSX_VIDEO, false)
-AM_CONDITIONAL(USE_X, false)
-AM_CONDITIONAL(USE_XSHM, false)
AM_CONDITIONAL(USE_AALIB, false)
AM_CONDITIONAL(USE_ANNODEX, false)
+AM_CONDITIONAL(USE_BZ2, false)
AM_CONDITIONAL(USE_CAIRO, false)
+AM_CONDITIONAL(USE_DIRECTDRAW, false)
+AM_CONDITIONAL(USE_DIRECTSOUND, false)
+AM_CONDITIONAL(USE_DV1394, false)
AM_CONDITIONAL(USE_ESD, false)
AM_CONDITIONAL(USE_FLAC, false)
AM_CONDITIONAL(USE_GCONF, false)
+AM_CONDITIONAL(USE_GCONFTOOL, false)
AM_CONDITIONAL(USE_GDK_PIXBUF, false)
+AM_CONDITIONAL(USE_GST_V4L2, false)
AM_CONDITIONAL(USE_HAL, false)
AM_CONDITIONAL(USE_JPEG, false)
AM_CONDITIONAL(USE_LIBCACA, false)
AM_CONDITIONAL(USE_LIBDV, false)
AM_CONDITIONAL(USE_LIBPNG, false)
-AM_CONDITIONAL(USE_DV1394, false)
+AM_CONDITIONAL(USE_OSS, false)
+AM_CONDITIONAL(USE_OSX_AUDIO, false)
+AM_CONDITIONAL(USE_OSX_VIDEO, false)
+AM_CONDITIONAL(USE_PULSE, false)
AM_CONDITIONAL(USE_SHOUT2, false)
AM_CONDITIONAL(USE_SOUP, false)
AM_CONDITIONAL(USE_SPEEX, false)
+AM_CONDITIONAL(USE_SUNAUDIO, false)
AM_CONDITIONAL(USE_TAGLIB, false)
AM_CONDITIONAL(USE_WAVPACK, false)
+AM_CONDITIONAL(USE_X, false)
+AM_CONDITIONAL(USE_XSHM, false)
+AM_CONDITIONAL(USE_XVIDEO, false)
AM_CONDITIONAL(USE_ZLIB, false)
fi dnl of EXT plugins