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).
This commit is contained in:
Tim-Philipp Müller 2006-06-17 15:09:39 +00:00
parent ba223f1144
commit f9f4ae768b
2 changed files with 35 additions and 0 deletions

View file

@ -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 Zaheer Abbas Merali <zaheerabbas at merali dot org>
* gst/spectrum/Makefile.am:

View file

@ -654,6 +654,35 @@ GST_CHECK_FEATURE(WAVPACK, [wavpack plug-in], wavpack, [
AC_SUBST(WAVPACK_LIBS)
])
else
dnl not building plugins with external dependencies,
dnl but we still need to set the conditionals
AM_CONDITIONAL(USE_OPENGL, false)
AM_CONDITIONAL(USE_X, false)
AM_CONDITIONAL(USE_GST_V4L2, false)
AM_CONDITIONAL(USE_ALSA, false)
AM_CONDITIONAL(USE_AMRWB, false)
AM_CONDITIONAL(USE_BZ2, false)
AM_CONDITIONAL(USE_DIRECTFB, false)
AM_CONDITIONAL(USE_DTS, false)
AM_CONDITIONAL(USE_DIVX, false)
AM_CONDITIONAL(USE_FAAC, false)
AM_CONDITIONAL(USE_FAAD, false)
AM_CONDITIONAL(USE_GSM, false)
AM_CONDITIONAL(USE_IVORBIS, false)
AM_CONDITIONAL(USE_LIBMMS, false)
AM_CONDITIONAL(USE_MUSEPACK, false)
AM_CONDITIONAL(USE_MUSICBRAINZ, false)
AM_CONDITIONAL(USE_NEON, false)
AM_CONDITIONAL(USE_SDL, false)
AM_CONDITIONAL(USE_SOUNDTOUCH, false)
AM_CONDITIONAL(USE_SWFDEC, false)
AM_CONDITIONAL(USE_THEORADEC, false)
AM_CONDITIONAL(USE_XVID, false)
AM_CONDITIONAL(USE_WAVPACK, false)
fi dnl of EXT plugins
dnl *** finalize CFLAGS, LDFLAGS, LIBS