duplicated the required alsa-kernel header files into the local

include/sound directory, so that alsa-lib can be compiled without
alsa-driver.

with this addition, --with-kernel and --with-soundbase options are
removed from configure.  they are obviously unnecessary.

the relevant parts in INSTALL are removed/modified.

diff --git a/INSTALL b/INSTALL
index 4939cb2..bc1e76c 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -10,37 +10,6 @@ For installation you can use these commands:
        ./configure
        make install
 
-If ./configure command complain that alsa-driver package is not installed,
-please, check if --prefix option is same for alsa-driver and alsa-lib
-package. The configure script from alsa-lib package probably cannot find
-header file asound.h in $prefix/include/sound directory (usually in
-/usr/include/sound directory).
-
-Note: If you change kernel sources frequently, please, check if you have
-      compiled and installed alsa-driver for current version of your kernel.
-
-
-Installation using a build-in version of ALSA in Linux kernel
--------------------------------------------------------------
-
-If you use a kernel build-in version of ALSA, use:
-
-       ./configure --with-kernel=<version>
-       make install
-
-The directory /lib/modules/<version>/build/include/sound must exists for
-this kind of configuration.
-
-You may also specify the full-base for ALSA kernel headers:
-
-       ./configure --with-soundbase=<path_to_linux_include_dir>
-       make install
-
-example:
-
-       ./configure --with-soundbase=/usr/src/linux-2.5.5/include
-       make install
-
 
 Compilation from CVS sources
 ----------------------------
@@ -82,30 +51,16 @@ When you would like to cross-compile ALSA library (e.g. compile on
 i686 host but for arm architecture) you will need to call ./configure
 script with aditional parameters:
 
-CC=arm-linux-gcc ./configure --target=arm-linux \
---with-soundbase=/usr/local/arm/src/linux/include
+CC=arm-linux-gcc ./configure --target=arm-linux
 
 In this example host where the library is build is guessed (should be
 given with --host=platform) and target for which is the library build is
-Linux on ARM architecture. You need to specify location of kernel includes
-configured for target architecture. This is used to find ALSA include
-files and so it should be set to prefix where '/sound' directory should
-be found. You should ommit setting 'CC' variable and cross-compiler will
-be guessed too. You could also use option '--prefix' to specify ALSA include
-directory directly if $prefix/include/sound exists.
+Linux on ARM architecture.  You should ommit setting 'CC' variable and
+cross-compiler will be guessed too.
 
 So simplest version would be:
 
-./configure --target=arm-linux --with-soundbase=/usr/local/arm/include
-
-or
-
-./configure --target=arm-linux --prefix=/usr/local/arm
-
-As you will likely specify the prefix, the last posibbility would be
-the best if everything match. On the listing of 'configure' script
-check if directory with ALSA headers was found properly same as platform
-specific configurations like processor type and selected cross-compiler. 
+./configure --target=arm-linux
 
 For platform names in the form cpu-vendor-os (or aliases for this)
 you should look in 'config.guess' script. Target and all paths

diff --git a/acinclude.m4 b/acinclude.m4
index 8fc6cfc..88a3939 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,28 +1,3 @@
-dnl Check for ALSA driver package.
-AC_DEFUN(ALSA_CHECK_DRIVER, [
-AC_MSG_CHECKING(for alsa-driver package)
-
-AC_TRY_COMPILE([
-#include <sound/asound.h>
-],[
-void main(void)
-{
-#if !defined(SNDRV_PROTOCOL_VERSION) || !defined(SNDRV_PROTOCOL_INCOMPATIBLE)
-#error not found
-#else
-#if !defined(SNDRV_PCM_IOCTL_REWIND)
-#error wrong version
-#endif
-  exit(0);
-#endif
-}
-],
-  AC_MSG_RESULT(present),
-  [AC_MSG_RESULT(not found or wrong version);
-   AC_MSG_ERROR([Install alsa-driver v0.9.0 package first...])]
-)
-])
-
 AC_DEFUN(SAVE_LIBRARY_VERSION, [
 AC_MSG_CHECKING(for library version)
 SND_LIB_VERSION=$VERSION

diff --git a/configure.in b/configure.in
index ebc4641..253514a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -39,51 +39,9 @@ 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    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 x"$aprefix" != x/usr -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.
 AC_HEADER_STDC
 AM_CONFIG_HEADER(include/config.h)
-AC_CHECK_HEADERS(sound/asound.h)
 
 
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -96,7 +54,6 @@ AC_PROG_GCC_TRADITIONAL
 AC_CHECK_FUNC([hsearch_r], [HAVE_HSEARCH_R=yes])
 AM_CONDITIONAL(ALSA_HSEARCH_R, [test "x$HAVE_HSEARCH_R" != xyes])
 
-ALSA_CHECK_DRIVER
 SAVE_LIBRARY_VERSION
 AC_SUBST(LIBTOOL_VERSION_INFO)