summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac11
2 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c0b536bd..d934ee07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 ***