From 2539e7d022b0b6cdd4305ba840017393699957fa Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 19 Mar 2004 15:31:13 +0000 Subject: [PATCH] removed --with-soundbase and --with-kernel configure options. the header files are now included in alsa-lib. --- hdspconf/configure.in | 41 ---------------------------------------- hdsploader/configure.in | 41 ---------------------------------------- hdspmixer/configure.in | 41 ---------------------------------------- sb16_csp/configure.in | 41 ---------------------------------------- seq/sbiload/configure.in | 41 ---------------------------------------- sscape_ctl/configure.in | 41 ---------------------------------------- 6 files changed, 246 deletions(-) diff --git a/hdspconf/configure.in b/hdspconf/configure.in index 75f87d7..1aa6feb 100644 --- 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 e60343a..4801124 100644 --- 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 32f6872..6fb5abe 100644 --- 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 2b53eb1..d0b90ca 100644 --- 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 54d1a64..a00dd6c 100644 --- 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 e1bf70b..282a56b 100644 --- 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" -- 2.47.1