From 15357a98758cb9573ce35869de6d366ca6443dc0 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sun, 17 Feb 2002 17:49:32 +0000 Subject: [PATCH] 0.9.0beta11 and changed --with-soundbase and --with-kernel --- configure.in | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index 97f131eb..65fde92c 100644 --- 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. -- 2.47.1