From: <tp...@ke...> - 2006-06-17 14:35:49
|
CVS Root: /cvs/gstreamer Module: gst-plugins-good Changes by: tpm Date: Sat Jun 17 2006 14:35:49 UTC Log message: * configure.ac: Fix --disable-external (can't set conditionals conditionally, #343602). Modified files: . : ChangeLog configure.ac Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.2393&r2=1.2394 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/configure.ac.diff?r1=1.664&r2=1.665 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v retrieving revision 1.2393 retrieving revision 1.2394 diff -u -d -r1.2393 -r1.2394 --- ChangeLog 16 Jun 2006 10:56:24 -0000 1.2393 +++ ChangeLog 17 Jun 2006 14:35:37 -0000 1.2394 @@ -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: Index: configure.ac RCS file: /cvs/gstreamer/gst-plugins-good/configure.ac,v retrieving revision 1.664 retrieving revision 1.665 diff -u -d -r1.664 -r1.665 --- configure.ac 16 Jun 2006 10:56:24 -0000 1.664 +++ configure.ac 17 Jun 2006 14:35:37 -0000 1.665 @@ -651,6 +651,35 @@ ]) ]) +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 |