summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dahl <matt2000@users.sourceforge.net>2002-04-27 20:06:50 +0000
committerMatthias Dahl <matt2000@users.sourceforge.net>2002-04-27 20:06:50 +0000
commitd9cf913d4ac4c7eba7b1ed3e64535bc36a94834e (patch)
tree42ecf6df4cf46a0f141b51b82ce62dbaa770bf93
parent5a09ae3c5cddd75f4f507645a90e0990d5ee974c (diff)
downloadxine-lib-d9cf913d4ac4c7eba7b1ed3e64535bc36a94834e.tar.gz
xine-lib-d9cf913d4ac4c7eba7b1ed3e64535bc36a94834e.tar.bz2
Fixing bug and alsa09 detection...
CVS patchset: 1785 CVS date: 2002/04/27 20:06:50
-rw-r--r--m4/alsa.m410
1 files changed, 4 insertions, 6 deletions
diff --git a/m4/alsa.m4 b/m4/alsa.m4
index 7918cfc62..2d82993b2 100644
--- a/m4/alsa.m4
+++ b/m4/alsa.m4
@@ -65,10 +65,8 @@ if test x"$enable_alsa" != "xno"; then
fi
ALSA_CFLAGS="$ALSA_CFLAGS"
- AC_CHECK_HEADERS(alsa/asoundlib.h,
- asoundlib_h="alsa/asoundlib.h",
- AC_CHECK_HEADERS(sys/asoundlib.h,
- asoundlib_h="sys/asoundlib.h"))
+ AC_CHECK_HEADER(alsa/asoundlib.h, [asoundlib_h="alsa/asoundlib.h"], \
+ [AC_CHECK_HEADER(sys/asoundlib.h, asoundlib_h="sys/asoundlib.h")])
min_alsa_version=ifelse([$1], ,0.1.1,$1)
AC_MSG_CHECKING([for ALSA version >= $min_alsa_version])
@@ -181,7 +179,7 @@ dnl
#include <stdlib.h>
#include <string.h>
-#include <sys/asoundlib.h>
+#include <$asoundlib_h>
int main() {
@@ -213,7 +211,7 @@ dnl
CFLAGS="$CFLAGS $ALSA_CFLAGS"
LIBS="$LIBS $ALSA_LIBS"
AC_TRY_LINK([
-#include <sys/asoundlib.h>
+#include <$asoundlib_h>
#include <stdio.h>
],
[return ((SND_LIB_MAJOR) || (SND_LIB_MINOR) || (SND_LIB_SUBMINOR));],