ALSA checks use alsa_save_* names and gst attempt to save flags fails when using...

Original commit message from CVS:
ALSA checks use alsa_save_* names and gst attempt to save flags fails
when using the same names.  Prefixed with gst_.

diff --git a/configure.base b/configure.base
index 1c1b4a1..d7ae00d 100644 (file)
--- a/configure.base
+++ b/configure.base
@@ -294,25 +294,34 @@ dnl AM_PATH_XMMS(0.1.0, HAVE_LIBXMMS=yes, HAVE_LIBXMMS=no)
 
 
 dnl Check for libasound
-alsa_save_LIBS=$LIBS
-alsa_save_CFLAGS=$CFLAGS
+dnl alsa_save also used in ALSA macro, use our own namespace
+gst_alsa_save_LIBS=$LIBS
+gst_alsa_save_LDFLAGS=$LDFLAGS
+gst_alsa_save_CFLAGS=$CFLAGS
 AM_PATH_ALSA(0.5.0,
   HAVE_LIBASOUND=yes,
   HAVE_LIBASOUND=no
   AC_MSG_WARN(
 ***** NOTE: These plugins won't be built: gstalsa
 ))
+LIBS=$gst_alsa_save_LIBS
+LDFLAGS=$gst_alsa_save_LDFLAGS
+CFLAGS=$gst_alsa_save_CFLAGS
 if test x$HAVE_LIBASOUND = xyes;then
+  gst_alsa_save_LIBS=$LIBS
+  gst_alsa_save_LDFLAGS=$LDFLAGS
+  gst_alsa_save_CFLAGS=$CFLAGS
   AM_PATH_ALSA(0.9.0,
     HAVE_LIBASOUND=no
     AC_MSG_WARN(Alsa 0.9.x not yet supported.
 ***** NOTE: These plugins won't be built: gstalsa
 )
     ,:)
+  LIBS=$gst_alsa_save_LIBS
+  LDFLAGS=$gst_alsa_save_LDFLAGS
+  CFLAGS=$gst_alsa_save_CFLAGS
 fi
 
-LIBS=$alsa_save_LIBS
-CFLAGS=$alsa_save_CFLAGS
 AC_ARG_ENABLE(alsasink,
 [  --enable-alsasink          enable the building of the alsasink],
 [case "${enableval}" in
@@ -575,7 +584,7 @@ AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no)
 
 dnl Check for liblame
 AC_MSG_CHECKING(LAME library)
-AC_CHECK_LIB(mp3lame, lame_init, HAVE_LIBLAME=yes, HAVE_LIBLAME=no, )
+AC_CHECK_LIB(mp3lame, lame_init, HAVE_LIBLAME=yes, HAVE_LIBLAME=no, -lm)
 AC_CHECK_HEADER(lame/lame.h, :, HAVE_LIBLAME=no)
 
 dnl Check for libshout