diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2006-06-17 15:09:39 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2006-06-17 15:09:39 +0000 |
| commit | f9f4ae768b1a7295ccd92f143c2d37e11c66b1c0 (patch) | |
| tree | 9b06a07f0bf09fa8e54463ef83f9deb1c51edd4d | |
| parent | ba223f1144591ae0a143813c8b124d587ac297c9 (diff) | |
| download | gst-plugins-bad-f9f4ae768b1a7295ccd92f143c2d37e11c66b1c0.tar.gz gst-plugins-bad-f9f4ae768b1a7295ccd92f143c2d37e11c66b1c0.tar.bz2 gst-plugins-bad-f9f4ae768b1a7295ccd92f143c2d37e11c66b1c0.zip | |
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).
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 29 |
2 files changed, 35 insertions, 0 deletions
@@ -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: diff --git a/configure.ac b/configure.ac index ae307b75..8d267d23 100644 --- a/configure.ac +++ b/configure.ac @@ -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 |