removed --with-soundbase and --with-kernel configure options.

the header files are now included in alsa-lib.

diff --git a/hdspconf/configure.in b/hdspconf/configure.in
index 75f87d7c7c93b430d00de53a3e52988e9968522c..1aa6feb15a0073442fd7056dea4ddbcdee507ee8 100644 (file)
--- a/hdspconf/configure.in
+++ b/hdspconf/configure.in
@@ -8,47 +8,6 @@ AC_PATH_X
 
 AM_PATH_ALSA(1.0.0)
 
-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    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"
-  CXXFLAGS="$CXXFLAGS -I$soundbasedir"
-  AC_MSG_RESULT($ALSA_CFLAGS)
-else
-  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"
-    CXXFLAGS="$CXXFLAGS -I$aprefix/include"
-    AC_MSG_RESULT($ALSA_CFLAGS)
-  else
-    AC_MSG_RESULT("not specified - using C compiler defaults")
-  fi
-fi
-
 dnl desktop install
 AC_ARG_WITH(desktop-dir,
   [ --with-desktop-dir  specify the path to install desktop file],

diff --git a/hdsploader/configure.in b/hdsploader/configure.in
index e60343a6c667a406df9234cf45e1e29c535d8e80..480112436352a70162b35cb5dc1c3ef1020aba90 100644 (file)
--- a/hdsploader/configure.in
+++ b/hdsploader/configure.in
@@ -8,45 +8,4 @@ AM_PATH_ALSA(0.9.0)
 CFLAGS="$CFLAGS $ALSA_CFLAGS"
 LDFLAGS="$LDFLAGS $ALSA_LIBS"
 
-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    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
-  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
-
 AC_OUTPUT(Makefile)

diff --git a/hdspmixer/configure.in b/hdspmixer/configure.in
index 32f6872b8957744feb953ee49608d294fa593664..6fb5abec60a9f4e576ee60b4dff696f07f14eacf 100644 (file)
--- a/hdspmixer/configure.in
+++ b/hdspmixer/configure.in
@@ -8,47 +8,6 @@ AC_PATH_X
 
 AM_PATH_ALSA(1.0.0)
 
-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/hdsp.h
-AC_MSG_CHECKING(for directory with ALSA kernel headers)
-AC_ARG_WITH(soundbase,
-  [  --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"
-  CXXFLAGS="$CXXFLAGS -I$soundbasedir"
-  AC_MSG_RESULT($ALSA_CFLAGS)
-else
-  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"
-    CXXFLAGS="$CXXFLAGS -I$aprefix/include"
-    AC_MSG_RESULT($ALSA_CFLAGS)
-  else
-    AC_MSG_RESULT("not specified - using C compiler defaults")
-  fi
-fi
-
 dnl desktop install
 AC_ARG_WITH(desktop-dir,
   [ --with-desktop-dir  specify the path to install desktop file],

diff --git a/sb16_csp/configure.in b/sb16_csp/configure.in
index 2b53eb1689251cc078946237acd57a4882e104ed..d0b90ca4c42e73249022d07cd709454ed87c7d07 100644 (file)
--- a/sb16_csp/configure.in
+++ b/sb16_csp/configure.in
@@ -5,47 +5,6 @@ AC_PROG_INSTALL
 AC_HEADER_STDC
 AM_PATH_ALSA(1.0.0)
 
-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    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
-  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
-
 CFLAGS="$CFLAGS $ALSA_CFLAGS"
 LDFLAGS="$LDFLAGS $ALSA_LIBS"
 

diff --git a/seq/sbiload/configure.in b/seq/sbiload/configure.in
index 54d1a6480de5df8fb9b8beded55a9e290e3d1617..a00dd6c7c774c66d40e7b0b89913471decd0fd9e 100644 (file)
--- a/seq/sbiload/configure.in
+++ b/seq/sbiload/configure.in
@@ -5,47 +5,6 @@ AC_PROG_INSTALL
 AC_HEADER_STDC
 AM_PATH_ALSA(0.9.0)
 
-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    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
-  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
-
 CFLAGS="$CFLAGS $ALSA_CFLAGS"
 LDFLAGS="$LDFLAGS $ALSA_LIBS"
 

diff --git a/sscape_ctl/configure.in b/sscape_ctl/configure.in
index e1bf70b31a402f5a69d307849bab171404fd08e6..282a56b19eaac0dbc5cb9f1532f8d11ed45c4823 100644 (file)
--- a/sscape_ctl/configure.in
+++ b/sscape_ctl/configure.in
@@ -5,47 +5,6 @@ AC_PROG_INSTALL
 AC_HEADER_STDC
 AM_PATH_ALSA(1.0.0)
 
-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    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
-  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
-
 CFLAGS="$CFLAGS $ALSA_CFLAGS"
 LDFLAGS="$LDFLAGS $ALSA_LIBS"