diff options
author | David Schleef <ds@schleef.org> | 2004-12-16 05:32:07 +0000 |
---|---|---|
committer | David Schleef <ds@schleef.org> | 2004-12-16 05:32:07 +0000 |
commit | e803c9f86d25e07da2fb30212505018b6f2644b9 (patch) | |
tree | c3b539ec71a3a28b6d3fa001a17ad90bf1ce001c /configure.ac | |
parent | 7de6c44f445f0bf72fb34f751c1ae333e7a8a661 (diff) | |
download | gst-plugins-bad-e803c9f86d25e07da2fb30212505018b6f2644b9.tar.gz gst-plugins-bad-e803c9f86d25e07da2fb30212505018b6f2644b9.tar.bz2 gst-plugins-bad-e803c9f86d25e07da2fb30212505018b6f2644b9.zip |
configure.ac: add audioresample and cairo plugins. Remove
Original commit message from CVS:
* configure.ac: add audioresample and cairo plugins. Remove
HAVE_MMX stuff, because it's not used.
* ext/Makefile.am: same
* ext/audioresample/Makefile.am: You are not ready for an
audio resampling element based on audioresample.
* ext/audioresample/gstaudioresample.c:
* ext/audioresample/gstaudioresample.h:
* ext/cairo/Makefile.am: You are not ready for overlay elements
based on cairo. Don't look too closely, these elements kinda
suck right now.
* ext/cairo/gstcairo.c: new
* ext/cairo/gsttextoverlay.c: new
* ext/cairo/gsttextoverlay.h: new
* ext/cairo/gsttimeoverlay.c: new
* ext/cairo/gsttimeoverlay.h: new
* gst-libs/gst/media-info/media-info-priv.h: fix compile
problem with compilers that don't support variadic macros.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 72514037..e64bea79 100644 --- a/configure.ac +++ b/configure.ac @@ -806,6 +806,22 @@ GST_CHECK_FEATURE(AUDIOFILE, [audiofile], afsink afsrc, [ AC_CHECK_LIB(audiofile, af_virtual_file_new, , HAVE_AUDIOFILE="no") fi]) +dnl *** audioresample *** +translit(dnm, m, l) AM_CONDITIONAL(USE_AUDIORESAMPLE, true) +GST_CHECK_FEATURE(AUDIORESAMPLE, [audioresample plug-in], audioresample, [ + PKG_CHECK_MODULES(AUDIORESAMPLE, audioresample-0.1, HAVE_AUDIORESAMPLE=yes, HAVE_AUDIORESAMPLE=no) + AC_SUBST(AUDIORESAMPLE_CFLAGS) + AC_SUBST(AUDIORESAMPLE_LIBS) +]) + +dnl *** cairo *** +translit(dnm, m, l) AM_CONDITIONAL(USE_CAIRO, true) +GST_CHECK_FEATURE(CAIRO, [cairo plug-in], cairo, [ + PKG_CHECK_MODULES(CAIRO, cairo, HAVE_CAIRO=yes, HAVE_CAIRO=no) + AC_SUBST(CAIRO_CFLAGS) + AC_SUBST(CAIRO_LIBS) +]) + dnl *** cdaudio *** translit(dnm, m, l) AM_CONDITIONAL(USE_CDAUDIO, true) GST_CHECK_FEATURE(CDAUDIO, [cdaudio], cdaudio, [ @@ -1722,15 +1738,6 @@ dnl ###################################################################### dnl # Check command line parameters, and set shell variables accordingly # dnl ###################################################################### -AC_ARG_ENABLE(libmmx, - AC_HELP_STRING([--enable-libmmx],[use libmmx, if available]), -[case "${enableval}" in - yes) USE_LIBMMX=$HAVE_LIBMMX ;; - no) USE_LIBMMX=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-libmmx) ;; -esac], -[USE_LIBMMX=$HAVE_LIBMMX]) dnl Default value - AC_ARG_ENABLE(atomic, AC_HELP_STRING([--enable-atomic],[use atomic reference counting header]), [case "${enableval}" in @@ -1783,10 +1790,6 @@ dnl # Set defines according to variables set above # dnl ################################################ -if test "x$USE_LIBMMX" = xyes; then - AC_DEFINE(HAVE_LIBMMX, 1, [Define if libmmx is available]) -fi - if test "x$USE_ATOMIC_H" = xyes; then AC_DEFINE(HAVE_ATOMIC_H, 1, [Define if atomic.h header file is available]) fi @@ -1804,8 +1807,6 @@ dnl ############################# dnl These should be "USE_*" instead of "HAVE_*", but some packages expect dnl HAVE_ and it is likely to be easier to stick with the old name -AM_CONDITIONAL(HAVE_LIBMMX, test "x$USE_LIBMMX" = "xyes") - AM_CONDITIONAL(HAVE_ATOMIC_H, test "x$USE_ATOMIC_H" = "xyes") AM_CONDITIONAL(EXPERIMENTAL, test "$EXPERIMENTAL" = "$xyes") @@ -1980,6 +1981,8 @@ ext/alsa/Makefile ext/arts/Makefile ext/artsd/Makefile ext/audiofile/Makefile +ext/audioresample/Makefile +ext/cairo/Makefile ext/cdaudio/Makefile ext/cdparanoia/Makefile ext/dirac/Makefile |