ALSA checks use alsa_save_* names and gst attempt to save flags fails when using the same names. Prefixed with gst_.

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_.
This commit is contained in:
David I. Lehn 2001-06-18 04:56:50 +00:00
parent 5023598cb3
commit 56d428f57f

View file

@ -294,25 +294,34 @@ dnl AM_PATH_XMMS(0.1.0, HAVE_LIBXMMS=yes, HAVE_LIBXMMS=no)
dnl Check for libasound dnl Check for libasound
alsa_save_LIBS=$LIBS dnl alsa_save also used in ALSA macro, use our own namespace
alsa_save_CFLAGS=$CFLAGS gst_alsa_save_LIBS=$LIBS
gst_alsa_save_LDFLAGS=$LDFLAGS
gst_alsa_save_CFLAGS=$CFLAGS
AM_PATH_ALSA(0.5.0, AM_PATH_ALSA(0.5.0,
HAVE_LIBASOUND=yes, HAVE_LIBASOUND=yes,
HAVE_LIBASOUND=no HAVE_LIBASOUND=no
AC_MSG_WARN( AC_MSG_WARN(
***** NOTE: These plugins won't be built: gstalsa ***** 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 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, AM_PATH_ALSA(0.9.0,
HAVE_LIBASOUND=no HAVE_LIBASOUND=no
AC_MSG_WARN(Alsa 0.9.x not yet supported. AC_MSG_WARN(Alsa 0.9.x not yet supported.
***** NOTE: These plugins won't be built: gstalsa ***** NOTE: These plugins won't be built: gstalsa
) )
,:) ,:)
LIBS=$gst_alsa_save_LIBS
LDFLAGS=$gst_alsa_save_LDFLAGS
CFLAGS=$gst_alsa_save_CFLAGS
fi fi
LIBS=$alsa_save_LIBS
CFLAGS=$alsa_save_CFLAGS
AC_ARG_ENABLE(alsasink, AC_ARG_ENABLE(alsasink,
[ --enable-alsasink enable the building of the alsasink], [ --enable-alsasink enable the building of the alsasink],
[case "${enableval}" in [case "${enableval}" in
@ -575,7 +584,7 @@ AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no)
dnl Check for liblame dnl Check for liblame
AC_MSG_CHECKING(LAME library) 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) AC_CHECK_HEADER(lame/lame.h, :, HAVE_LIBLAME=no)
dnl Check for libshout dnl Check for libshout