mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-08 07:35:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

Really disable Matroska this time. Reenable smoothwave until someone decides to delete it. Fix ivorbis detection.

Browse source 
Original commit message from CVS:
Really disable Matroska this time.  Reenable smoothwave until someone
decides to delete it.  Fix ivorbis detection.
This commit is contained in:
David Schleef 2003-07-17 04:27:01 +00:00
parent 7c6f49bf6b
commit 5987de78f2
1 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
configure.ac
View file

@ -104,9 +104,7 @@ GST_CHECK_FEATURE(BROKEN, [enable building of broken plug-ins],,
HAVE_BROKEN=yes,disabled, HAVE_BROKEN=yes,disabled,
[ [
AC_MSG_WARN([building broken plug-ins -- no bug reports on these, only patches :)]) AC_MSG_WARN([building broken plug-ins -- no bug reports on these, only patches :)])
USE_SMOOTHWAVE="yes"
],[ ],[
USE_SMOOTHWAVE="no"
AC_MSG_NOTICE([not building broken plug-ins]) AC_MSG_NOTICE([not building broken plug-ins])
]) ])
@ -739,8 +737,14 @@ dnl *** ivorbis ***
dnl AM_PATH_IVORBIS only takes two options dnl AM_PATH_IVORBIS only takes two options
translit(dnm, m, l) AM_CONDITIONAL(USE_IVORBIS, true) translit(dnm, m, l) AM_CONDITIONAL(USE_IVORBIS, true)
GST_CHECK_FEATURE(IVORBIS, [integer vorbis plug-in], ivorbisdec, [ GST_CHECK_FEATURE(IVORBIS, [integer vorbis plug-in], ivorbisdec, [
XIPH_PATH_IVORBIS(HAVE_IVORBIS=yes, HAVE_IVORBIS=no) IVORBIS_LIBS=
AS_SCRUB_INCLUDE(IVORBIS_CFLAGS) IVORBIS_CFLAGS=
AC_CHECK_LIB(vorbisidec, vorbis_block_init,
[IVORBIS_LIBS=-lvorbisidec
HAVE_IVORBIS=yes],
HAVE_IVORBIS=no)
AC_SUBST(IVORBIS_LIBS)
AC_SUBST(IVORBIS_CFLAGS)
]) ])
dnl *** Jack *** dnl *** Jack ***
@ -840,12 +844,13 @@ AC_SUBST(MAD_LIBS)
dnl *** matroska *** dnl *** matroska ***
translit(dnm, m, l) AM_CONDITIONAL(USE_MATROSKA, true) translit(dnm, m, l) AM_CONDITIONAL(USE_MATROSKA, true)
GST_CHECK_FEATURE(MATROSKA, [matroska muxer/demuxer], matroska muxer/demuxer, [ #GST_CHECK_FEATURE(MATROSKA, [matroska muxer/demuxer], matroska muxer/demuxer, [
PATH_EBML([HAVE_MATROSKA=yes], [HAVE_MATROSKA=no]) # PATH_EBML([HAVE_MATROSKA=yes], [HAVE_MATROSKA=no])
if test x$HAVE_MATROSKA = xyes; then # if test x$HAVE_MATROSKA = xyes; then
PATH_MATROSKA(0.4.4, [HAVE_MATROSKA=yes], [HAVE_MATROSKA=no]) # PATH_MATROSKA(0.4.4, [HAVE_MATROSKA=yes], [HAVE_MATROSKA=no])
fi # fi
]) #])
GST_CHECK_FEATURE(MATROSKA, [matroska muxer/demuxer], matroska muxer/demuxer, HAVE_MATROSKA=no)
dnl *** mikmod *** dnl *** mikmod ***
translit(dnm, m, l) AM_CONDITIONAL(USE_MIKMOD, true) translit(dnm, m, l) AM_CONDITIONAL(USE_MIKMOD, true)
@ -921,6 +926,14 @@ GST_CHECK_FEATURE(LIBPNG, [snapshot plug-in], snapshot, [
AC_SUBST(LIBPNG_LIBS) AC_SUBST(LIBPNG_LIBS)
]) ])
dnl *** speex ***
translit(dnm, m, l) AM_CONDITIONAL(USE_SPEEX, true)
GST_CHECK_FEATURE(SPEEX, [speex plug-in], speex, [
GST_CHECK_LIBHEADER(SPEEX, speex, speex_bits_init, , speex.h, HAVE_SPEEX="yes" SPEEX_LIBS="-lspeex")
AC_SUBST(SPEEX_CFLAGS)
AC_SUBST(SPEEX_LIBS)
])
dnl *** sndfile *** dnl *** sndfile ***
translit(dnm, m, l) AM_CONDITIONAL(USE_SNDFILE, true) translit(dnm, m, l) AM_CONDITIONAL(USE_SNDFILE, true)
GST_CHECK_FEATURE(SNDFILE, [sndfile plug-in], sfsrc sfsink, [ GST_CHECK_FEATURE(SNDFILE, [sndfile plug-in], sfsrc sfsink, [
@ -1263,6 +1276,7 @@ ext/shout2/Makefile
ext/sidplay/Makefile ext/sidplay/Makefile
ext/smoothwave/Makefile ext/smoothwave/Makefile
ext/snapshot/Makefile ext/snapshot/Makefile
ext/speex/Makefile
ext/sndfile/Makefile ext/sndfile/Makefile
ext/swfdec/Makefile ext/swfdec/Makefile
ext/vorbis/Makefile ext/vorbis/Makefile