diff --git a/ChangeLog b/ChangeLog index 7596c9a5ce..0b826f2cb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-06-17 Tim-Philipp Müller + + * configure.ac: + Fix --disable-extern (can't set conditionals conditionally, + #343602). + 2006-06-16 Tim-Philipp Müller * tests/check/elements/audioresample.c: (test_reuse), diff --git a/configure.ac b/configure.ac index 7019f60dbe..0ac0621c9e 100644 --- a/configure.ac +++ b/configure.ac @@ -489,6 +489,19 @@ vorbis_synthesis_restart (v); CFLAGS="$ac_cflags_save" fi +else + +dnl not building plugins with external dependencies, +dnl but we still need to set the conditionals +AM_CONDITIONAL(USE_ALSA, false) +AM_CONDITIONAL(USE_CDPARANOIA, false) +AM_CONDITIONAL(USE_GNOME_VFS, false) +AM_CONDITIONAL(USE_LIBVISUAL, false) +AM_CONDITIONAL(USE_OGG, false) +AM_CONDITIONAL(USE_PANGO, false) +AM_CONDITIONAL(USE_THEORA, false) +AM_CONDITIONAL(USE_VORBIS, false) + fi dnl of EXT plugins dnl seeking needs freetype, so check for it here