From cd1e49d8956faddee91fd5ed4bb73450a030039e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Loeuillet?= Date: Fri, 17 Sep 2004 22:13:07 +0000 Subject: update esound, gconf, alsa and ogg m4 files from upstream versions Original commit message from CVS: update esound, gconf, alsa and ogg m4 files from upstream versions --- m4/gst-alsa.m4 | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'm4/gst-alsa.m4') diff --git a/m4/gst-alsa.m4 b/m4/gst-alsa.m4 index bb69c924..4141d066 100644 --- a/m4/gst-alsa.m4 +++ b/m4/gst-alsa.m4 @@ -2,12 +2,12 @@ dnl Configure Paths for Alsa dnl Some modifications by Richard Boulton dnl Christopher Lansdown dnl Jaroslav Kysela -dnl Last modification: 07/01/2001 +dnl Last modification: alsa.m4,v 1.23 2004/01/16 18:14:22 tiwai Exp dnl AM_PATH_ALSA([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for libasound, and define ALSA_CFLAGS and ALSA_LIBS as appropriate. dnl enables arguments --with-alsa-prefix= dnl --with-alsa-enc-prefix= -dnl --disable-alsatest (this has no effect, as yet) +dnl --disable-alsatest dnl dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified, dnl and the alsa libraries are not found, a fatal AC_MSG_ERROR() will result. @@ -54,9 +54,10 @@ if test "$alsa_prefix" != "" ; then fi dnl add the alsa library -ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl" +ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread" LIBS=`echo $LIBS | sed 's/-lm//'` LIBS=`echo $LIBS | sed 's/-ldl//'` +LIBS=`echo $LIBS | sed 's/-lpthread//'` LIBS=`echo $LIBS | sed 's/ //'` LIBS="$ALSA_LIBS $LIBS" AC_MSG_RESULT($ALSA_LIBS) @@ -75,7 +76,7 @@ no_alsa="" AC_LANG_SAVE AC_LANG_C AC_TRY_COMPILE([ -#include +#include ], [ void main(void) { @@ -120,10 +121,12 @@ exit(0); AC_LANG_RESTORE dnl Now that we know that we have the right version, let's see if we have the library and not just the headers. -AC_CHECK_LIB([asound], [snd_seq_create_event],, +if test "x$enable_alsatest" = "xyes"; then +AC_CHECK_LIB([asound], [snd_ctl_open],, [ifelse([$3], , [AC_MSG_ERROR(No linkable libasound was found.)]) alsa_found=no] ) +fi if test "x$alsa_found" = "xyes" ; then ifelse([$2], , :, [$2]) @@ -144,3 +147,4 @@ dnl That should be it. Now just export out symbols: AC_SUBST(ALSA_CFLAGS) AC_SUBST(ALSA_LIBS) ]) + -- cgit v1.2.1