0.9.0beta11 and changed --with-soundbase and --with-kernel

diff --git a/configure.in b/configure.in
index 97f131ebc3c13dd09f808c54a3abdc5d38baf6a5..65fde92ca43e5ea97b90a86948e1ac004bd8f2d1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ dnl change API = c+1:0:a
 dnl add API = c+1:0:a+1
 dnl remove API = c+1:0:0
 dnl *************************************************
-AM_INIT_AUTOMAKE(alsa-lib, 0.9.0beta10a)
+AM_INIT_AUTOMAKE(alsa-lib, 0.9.0beta11)
 eval LIBTOOL_VERSION_INFO="2:0:0"
 dnl *************************************************
 AM_CONDITIONAL(INSTALL_M4, test "x${ACLOCAL}" = "xaclocal")
@@ -22,17 +22,45 @@ AC_DISABLE_STATIC
 AC_LIBTOOL_DLOPEN
 AM_PROG_LIBTOOL
 
+dnl kernel header files
+AC_MSG_CHECKING(for kernel header files)
+AC_ARG_WITH(kernel,
+  [  --with-kernel=ver       specify kernel version (for example 2.5.5-pre1)],
+  [kerneldir="$withval"], [kerneldir=""])
+if test "$kerneldir" != "" -a -r "/lib/modules/$kerneldir/build/include/sound"; then
+  kerneldir="/lib/modules/$kerneldir/build/include"
+  AC_MSG_RESULT($kerneldir)
+else
+  if test -z "$kerneldir"; then
+    AC_MSG_RESULT("not specified")
+  else
+    AC_MSG_RESULT("directory /lib/modules/$kerneldir/build/include/sound not found")
+  fi
+  kerneldir=""
+fi
+
 dnl path for sound/asound.h
 AC_MSG_CHECKING(for directory with ALSA kernel headers)
 AC_ARG_WITH(soundbase,
-  [  --with-soundbase=dir    give the base directory with sound headers (optional)],
-  [soundbasedir="$withval"], [soundbasedir=""])
+  [  --with-soundbase=dir    specify base directory with kernel sound headers (optional)],
+  [soundbasedir="$withval"], [soundbasedir="$kerneldir"])
 if test "$soundbasedir" != "" -a -r "$soundbasedir/sound" ; then
   ALSA_CFLAGS="$ALSA_CFLAGS -I$soundbasedir"
   CFLAGS="$CFLAGS -I$soundbasedir"
   AC_MSG_RESULT($ALSA_CFLAGS)
 else
-  AC_MSG_RESULT("not specified - using C compilator defaults")
+  if test "x$prefix" != xNONE; then
+    aprefix=$prefix
+  else
+    aprefix=$ac_default_prefix
+  fi
+  if test -z "$soundbasedir" -a -r "$aprefix/include/sound"; then
+    ALSA_CFLAGS="$ALSA_CFLAGS -I$aprefix/include"
+    CFLAGS="$CFLAGS -I$aprefix/include"
+    AC_MSG_RESULT($ALSA_CFLAGS)
+  else
+    AC_MSG_RESULT("not specified - using C compilator defaults")
+  fi
 fi
 
 dnl Checks for header files.