aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2021-10-12 16:12:35 +0200
committerTakashi Iwai <tiwai@suse.de>2021-10-12 16:12:35 +0200
commitb712bb72a41a1cdf1997d509ee053d5b41a17761 (patch)
tree0cc0d5c0dffa0530fa35dfd06efe635ac66fcc36
parent1cd521197cc4c036585c8de56c53e8c4f2cfe216 (diff)
downloadsalsa-lib-b712bb72a41a1cdf1997d509ee053d5b41a17761.tar.gz
Don't test linking with snd_ctl_open in alsa.m4
It's broken. salsa doesn't provide the symbol but it's inlined. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--alsa.m434
1 files changed, 0 insertions, 34 deletions
diff --git a/alsa.m4 b/alsa.m4
index 3b94e30..5ef5a7b 100644
--- a/alsa.m4
+++ b/alsa.m4
@@ -1,17 +1,3 @@
-dnl Configure Paths for Alsa
-dnl Some modifications by Richard Boulton <richard-alsa@tartarus.org>
-dnl Christopher Lansdown <lansdoct@cs.alfred.edu>
-dnl Jaroslav Kysela <perex@suse.cz>
-dnl Last modification: $Id: alsa.m4,v 1.24 2004/09/15 18:48:07 tiwai Exp $
-dnl AM_PATH_ALSA([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for libsalsa, and define ALSA_CFLAGS and ALSA_LIBS as appropriate.
-dnl enables arguments --with-alsa-prefix=
-dnl --with-alsa-enc-prefix=
-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.
-dnl
AC_DEFUN([AM_PATH_ALSA],
[dnl Save the original CFLAGS, LDFLAGS, and LIBS
alsa_save_CFLAGS="$CFLAGS"
@@ -30,12 +16,6 @@ AC_ARG_WITH(alsa-inc-prefix,
[ --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional)],
[alsa_inc_prefix="$withval"], [alsa_inc_prefix=""])
-dnl FIXME: this is not yet implemented
-AC_ARG_ENABLE(alsatest,
-[ --disable-alsatest Do not try to compile and run a test Alsa program],
-[enable_alsatest="$enableval"],
-[enable_alsatest=yes])
-
dnl Add any special include directories
AC_MSG_CHECKING(for ALSA CFLAGS)
if test "$alsa_inc_prefix" != "" ; then
@@ -111,20 +91,6 @@ 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.
-if test "x$enable_alsatest" = "xyes"; then
-AC_CHECK_LIB([salsa], [snd_ctl_open],,
- [ifelse([$3], , [AC_MSG_ERROR(No linkable libsalsa was found.)])
- alsa_found=no]
-)
-fi
-
-if test "x$alsa_found" = "xyes" ; then
- ifelse([$2], , :, [$2])
- LIBS=`echo $LIBS | sed 's/-lsalsa//g'`
- LIBS=`echo $LIBS | sed 's/ //'`
- LIBS="-lsalsa $LIBS"
-fi
if test "x$alsa_found" = "xno" ; then
ifelse([$3], , :, [$3])
CFLAGS="$alsa_save_CFLAGS"