diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 23 |
2 files changed, 20 insertions, 8 deletions
@@ -1,3 +1,8 @@ +2004-12-23 Thomas Vander Stichele <thomas at apestaart dot org> + + * configure.ac: + Put additional LAME check inside the conditional. Fixes #152339 + 2004-12-23 Ronald S. Bultje <rbultje@ronald.bitfreak.net> * gst/avi/gstavidemux.c: (gst_avi_demux_stream_index), diff --git a/configure.ac b/configure.ac index 63d26287..97064bbe 100644 --- a/configure.ac +++ b/configure.ac @@ -1188,20 +1188,27 @@ 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 -lm") -]) -dnl is lame presets available -LAME_CFLAGS="" -AC_TRY_RUN([ + GST_CHECK_LIBHEADER(LAME, mp3lame, lame_init, -lm, lame/lame.h, + [ + HAVE_LAME="yes" + LAME_LIBS="-lmp3lame -lm" + dnl is lame presets available + LAME_CFLAGS="" + AC_TRY_RUN([ #include <lame/lame.h> int main (int argc, char *argv[]) { printf("%d\n", MEDIUM); return 0; } -],[LAME_CFLAGS="-DGSTLAME_PRESET"],[LAME_CFLAGS=""]) -AC_SUBST(LAME_CFLAGS) -AC_SUBST(LAME_LIBS) + ], + [LAME_CFLAGS="-DGSTLAME_PRESET"], + [LAME_CFLAGS=""] + ) + AC_SUBST(LAME_CFLAGS) + AC_SUBST(LAME_LIBS) + ]) +]) dnl *** MAS (TODO) *** dnl translit(dnm, m, l) AM_CONDITIONAL(USE_MAS, true) |