1.1 --- a/acinclude.m4	Sat Aug 21 20:35:50 2004 +0000
     1.2 +++ b/acinclude.m4	Tue Aug 24 06:32:50 2004 +0000
     1.3 @@ -19,24 +19,22 @@
     1.4    cat >>$new <$old
     1.5  ])
     1.6  
     1.7 -#
     1.8 -# --- alsa.m4 ---
     1.9 -#
    1.10 +##############################################################################
    1.11  dnl Configure Paths for Alsa
    1.12  dnl Some modifications by Richard Boulton <richard-alsa@tartarus.org>
    1.13  dnl Christopher Lansdown <lansdoct@cs.alfred.edu>
    1.14  dnl Jaroslav Kysela <perex@suse.cz>
    1.15 -dnl Last modification: alsa.m4,v 1.22 2002/05/27 11:14:20 tiwai Exp
    1.16 +dnl Last modification: alsa.m4,v 1.23 2004/01/16 18:14:22 tiwai Exp
    1.17  dnl AM_PATH_ALSA([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
    1.18  dnl Test for libasound, and define ALSA_CFLAGS and ALSA_LIBS as appropriate.
    1.19  dnl enables arguments --with-alsa-prefix=
    1.20  dnl                   --with-alsa-enc-prefix=
    1.21 -dnl                   --disable-alsatest  (this has no effect, as yet)
    1.22 +dnl                   --disable-alsatest
    1.23  dnl
    1.24  dnl For backwards compatibility, if ACTION_IF_NOT_FOUND is not specified,
    1.25  dnl and the alsa libraries are not found, a fatal AC_MSG_ERROR() will result.
    1.26  dnl
    1.27 -AC_DEFUN(AM_PATH_ALSA,
    1.28 +AC_DEFUN([AM_PATH_ALSA],
    1.29  [dnl Save the original CFLAGS, LDFLAGS, and LIBS
    1.30  alsa_save_CFLAGS="$CFLAGS"
    1.31  alsa_save_LDFLAGS="$LDFLAGS"
    1.32 @@ -57,7 +55,7 @@
    1.33  dnl FIXME: this is not yet implemented
    1.34  AC_ARG_ENABLE(alsatest,
    1.35  [  --disable-alsatest      Do not try to compile and run a test Alsa program],
    1.36 -[enable_alsatest=no],
    1.37 +[enable_alsatest="$enableval"],
    1.38  [enable_alsatest=yes])
    1.39  
    1.40  dnl Add any special include directories
    1.41 @@ -140,17 +138,20 @@
    1.42  AC_LANG_RESTORE
    1.43  
    1.44  dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
    1.45 +if test "x$enable_alsatest" = "xyes"; then
    1.46  AC_CHECK_LIB([asound], [snd_ctl_open],,
    1.47  	[ifelse([$3], , [AC_MSG_ERROR(No linkable libasound was found.)])
    1.48  	 alsa_found=no]
    1.49  )
    1.50 -
    1.51 -CFLAGS="$alsa_save_CFLAGS"
    1.52 -LDFLAGS="$alsa_save_LDFLAGS"
    1.53 -LIBS="$alsa_save_LIBS"
    1.54 +fi
    1.55 +
    1.56  if test "x$alsa_found" = "xyes" ; then
    1.57     ifelse([$2], , :, [$2])
    1.58 -else
    1.59 +   LIBS=`echo $LIBS | sed 's/-lasound//g'`
    1.60 +   LIBS=`echo $LIBS | sed 's/  //'`
    1.61 +   LIBS="-lasound $LIBS"
    1.62 +fi
    1.63 +if test "x$alsa_found" = "xno" ; then
    1.64     ifelse([$3], , :, [$3])
    1.65     CFLAGS="$alsa_save_CFLAGS"
    1.66     LDFLAGS="$alsa_save_LDFLAGS"
    1.67 @@ -164,8 +165,7 @@
    1.68  AC_SUBST(ALSA_LIBS)
    1.69  ])
    1.70  
    1.71 -
    1.72 -
    1.73 +##############################################################################
    1.74  #
    1.75  # --- esd.m4 ---
    1.76  #
    1.77 @@ -334,6 +334,7 @@
    1.78    rm -f conf.esdtest
    1.79  ])
    1.80  
    1.81 +##############################################################################
    1.82  # Based on libtool-1.5.8
    1.83  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
    1.84  ## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004