diff options
author | Zaheer Abbas Merali <zaheerabbas@merali.org> | 2004-08-19 22:44:50 +0000 |
---|---|---|
committer | Zaheer Abbas Merali <zaheerabbas@merali.org> | 2004-08-19 22:44:50 +0000 |
commit | 7eca08051eff4bbbde0158c38211df039242c657 (patch) | |
tree | 406649182c4e5c426c62d09b747506065e00ede0 | |
parent | de02c9a928759621afbba814ee4f49d1c8a14a17 (diff) | |
download | gst-plugins-bad-7eca08051eff4bbbde0158c38211df039242c657.tar.gz gst-plugins-bad-7eca08051eff4bbbde0158c38211df039242c657.tar.bz2 gst-plugins-bad-7eca08051eff4bbbde0158c38211df039242c657.zip |
Only enable lame presets if version of lame has presets in API
Original commit message from CVS:
2004-08-19 Zaheer Abbas Merali <zaheerabbas at merali dot org>
* configure.ac:
* ext/lame/Makefile.am:
* ext/lame/gstlame.c: (gst_lame_class_init),
(gst_lame_set_property), (gst_lame_get_property), (gst_lame_setup):
Only enable lame presets if version of lame has presets in API
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | configure.ac | 11 |
2 files changed, 17 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2004-08-19 Zaheer Abbas Merali <zaheerabbas at merali dot org> + + * configure.ac: + * ext/lame/Makefile.am: + * ext/lame/gstlame.c: (gst_lame_class_init), + (gst_lame_set_property), (gst_lame_get_property), (gst_lame_setup): + Only enable lame presets if version of lame has presets in API + 2004-08-19 Jan Schmidt <thaytan@mad.scientist.com> * gst/udp/gstudpsrc.c: (gst_udpsrc_init), (gst_udpsrc_get): * gst/udp/gstudpsrc.h: diff --git a/configure.ac b/configure.ac index 25525cf1..e491469b 100644 --- a/configure.ac +++ b/configure.ac @@ -1193,8 +1193,15 @@ GST_CHECK_FEATURE(LADSPA, [ladspa], ladspa, [ dnl *** lame *** translit(dnm, m, l) AM_CONDITIONAL(USE_LAME, true) GST_CHECK_FEATURE(LAME, [lame mp3 encoder library], lame, [ - GST_CHECK_LIBHEADER(LAME, mp3lame, lame_init, -lm, lame/lame.h, HAVE_LAME="yes" LAME_LIBS="-lmp3lame") -]) + GST_CHECK_LIBHEADER(LAME, mp3lame, lame_init, -lm, lame/lame.h, HAVE_LAME="yes" LAME_LIBS="-lmp3lame -lm") +]) +dnl is lame presets available +ac_save_LIBS="$LIBS" +LIBS="$LAME_LIBS" +LAME_CFLAGS="" +AC_CHECK_FUNC(lame_set_preset, LAME_CFLAGS="-DGSTLAME_PRESET",) +LIBS="$ac_save_LIBS" +AC_SUBST(LAME_CFLAGS) AC_SUBST(LAME_LIBS) dnl *** libcaca *** |