[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-driver (7 files)
David B Harris
dbharris-guest@quantz.debian.org
Mon, 09 Feb 2004 06:10:34 +0100
Date: Monday, February 9, 2004 @ 06:10:34
Author: dbharris-guest
Path: /cvsroot/pkg-alsa/debian/alsa-driver
Modified: Rules.make configure configure.in debian/changelog
include/config.h.in include/config1.h.in
Removed: acore/pcm_lib.c
Imported new upstream release of alsa-driver, 1.0.2c
----------------------+
Rules.make | 9 -
acore/pcm_lib.c | 2
configure | 332 ++++++++++++++++++++++++++++++++++++++-----------
configure.in | 120 ++++++++++++++---
debian/changelog | 2
include/config.h.in | 2
include/config1.h.in | 3
7 files changed, 368 insertions(+), 102 deletions(-)
Index: debian/alsa-driver/Rules.make
diff -u debian/alsa-driver/Rules.make:1.13 debian/alsa-driver/Rules.make:1.14
--- debian/alsa-driver/Rules.make:1.13 Tue Feb 3 19:36:40 2004
+++ debian/alsa-driver/Rules.make Mon Feb 9 06:10:32 2004
@@ -17,8 +17,9 @@
# apply patches beforehand
prepare: $(clean-files)
@for d in $(patsubst %/,%,$(filter %/, $(obj-y))) \
- $(patsubst %/,%,$(filter %/, $(obj-m))); do \
- $(MAKE) -C $$d prepare; \
+ $(patsubst %/,%,$(filter %/, $(obj-m))) DUMMY; do \
+ echo $$d; \
+ if [ $$d != DUMMY ]; then $(MAKE) -C $$d prepare; fi; \
done
ALL_MOBJS := $(filter-out $(obj-y), $(obj-m))
@@ -29,8 +30,8 @@
cp $(ALL_MOBJS:.o=.ko) $(DESTDIR)$(moddir)/$(MODCURDIR)
endif
@for d in $(patsubst %/,%,$(filter %/, $(obj-y))) \
- $(patsubst %/,%,$(filter %/, $(obj-m))); do \
- $(MAKE) -C $$d modules_install; \
+ $(patsubst %/,%,$(filter %/, $(obj-m))) DUMMY; do \
+ if [ $$d != DUMMY ]; then $(MAKE) -C $$d modules_install; fi; \
done
else
Index: debian/alsa-driver/acore/pcm_lib.c
diff -u debian/alsa-driver/acore/pcm_lib.c:1.1.1.1 debian/alsa-driver/acore/pcm_lib.c:removed
--- debian/alsa-driver/acore/pcm_lib.c:1.1.1.1 Mon Aug 12 10:44:50 2002
+++ debian/alsa-driver/acore/pcm_lib.c Mon Feb 9 06:10:34 2004
@@ -1,2 +0,0 @@
-#define __NO_VERSION__
-#include "../alsa-kernel/core/pcm_lib.c"
Index: debian/alsa-driver/configure
diff -u debian/alsa-driver/configure:1.20 debian/alsa-driver/configure:1.21
--- debian/alsa-driver/configure:1.20 Tue Feb 3 19:36:40 2004
+++ debian/alsa-driver/configure Mon Feb 9 06:10:32 2004
@@ -271,7 +271,7 @@
ac_unique_file="acore/sound.patch"
ac_default_prefix=/usr
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AR AS CPP EGREP SRCDIR CROSS_COMPILE CONFIG_SND_KERNELDIR kaversion kversion kpatchlevel ksublevel kextraversion NEW_KBUILD CONFIG_SND_MVERSION CONFIG_PCI CONFIG_SGI moddir modsubdir moddir_tree processor LD CONFIG_X86 CONFIG_ALPHA CONFIG_L3 CONFIG_ARM CONFIG_PPC CONFIG_ISA CONFIG_PARISC CONFIG_SND_BIT32_EMUL msmp CONFIG_ISAPNP_KERNEL CONFIG_PNP_KERNEL CONFIG_ISAPNP CONFIG_PNP CONFIG_SND_VERSION CONFIG_SND_DATE CONFIG_SND_SEQUENCER CONFIG_SND_OSSEMUL CONFIG_SND_RTCTIMER CONFIG_RTC CONFIG_USB CONFIG_PCMCIA CONFIG_X86_PC9800 CONFIG_SND_DUMMY CONFIG_SND_VIRMIDI CONFIG_SND_SERIAL_U16550 CONFIG_SND_MTPAV CONFIG_SND_MPU401 CONFIG_SND_ALS100 CONFIG_SND_AZT2320 CONFIG_SND_CMI8330 CONFIG_SND_DT019X CONFIG_SND_ES18XX CONFIG_SND_OPL3SA2 CONFIG_SND_SGALAXY CONFIG_SND_SSCAPE CONFIG_SND_AD1816A CONFIG_SND_AD1848 CONFIG_SND_CS4231 CONFIG_SND_CS4232 CONFIG_SND_CS4236 CONFIG_SND_PC98_CS4232 CONFIG_SND_ES1688 CONFIG_SND_GUSCLASSIC CONFIG_SND_GUSMAX CONFIG_SND_GUSEXTREME CONFIG_SND_INTERWAVE CONFIG_SND_INTERWAVE_STB CONFIG_SND_OPTI92X_AD1848 CONFIG_SND_OPTI92X_CS4231 CONFIG_SND_OPTI93X CONFIG_SND_SB8 CONFIG_SND_SB16 CONFIG_SND_SBAWE CONFIG_SND_ES968 CONFIG_SND_WAVEFRONT CONFIG_SND_ALS4000 CONFIG_SND_AZT3328 CONFIG_SND_CMIPCI CONFIG_SND_CS4281 CONFIG_SND_ENS1370 CONFIG_SND_ENS1371 CONFIG_SND_ES1938 CONFIG_SND_ES1968 CONFIG_SND_FM801 CONFIG_SND_INTEL8X0 CONFIG_SND_MAESTRO3 CONFIG_SND_RME32 CONFIG_SND_RME96 CONFIG_SND_SONICVIBES CONFIG_SND_VIA82XX CONFIG_SND_ALI5451 CONFIG_SND_CS46XX CONFIG_SND_EMU10K1 CONFIG_SND_ICE1712 CONFIG_SND_ICE1724 CONFIG_SND_KORG1212 CONFIG_SND_NM256 CONFIG_SND_RME9652 CONFIG_SND_HDSP CONFIG_SND_TRIDENT CONFIG_SND_VX222 CONFIG_SND_YMFPCI CONFIG_SND_POWERMAC CONFIG_SND_SA11XX_UDA1341 CONFIG_SND_USB_AUDIO CONFIG_SND_HARMONY CONFIG_SND_VXPOCKET CONFIG_SND_VXP440 CONFIG_SND_SERIALMIDI CONFIG_SND_BT87X CONFIG_SND_INTEL8X0M CONFIG_SND_PDPLUS CONFIG_SND_MIXART CONFIG_SND_MSND_PINNACLE CONFIG_SND_PDAUDIOCF CONFIG_SND_USB_USX2Y CONFIG_SND_AU8810 CONFIG_SND_AU8820 CONFIG_SND_AU8830 c_opts m_opts GENKSYMS EXTRA_INCLUDES LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AR AS CPP EGREP SRCDIR CROSS_COMPILE CONFIG_SND_KERNELDIR kaversion kversion kpatchlevel ksublevel kextraversion NEW_KBUILD CONFIG_SND_MVERSION CONFIG_PCI CONFIG_SGI moddir modsubdir moddir_tree processor LD CONFIG_X86 CONFIG_ALPHA CONFIG_L3 CONFIG_ARM CONFIG_PPC CONFIG_ISA CONFIG_PARISC CONFIG_SND_BIT32_EMUL msmp CONFIG_VIDEO_DEV CONFIG_ISAPNP_KERNEL CONFIG_PNP_KERNEL CONFIG_ISAPNP CONFIG_PNP CONFIG_SND_VERSION CONFIG_SND_DATE CONFIG_SND_SEQUENCER CONFIG_SND_OSSEMUL CONFIG_SND_RTCTIMER CONFIG_RTC CONFIG_USB CONFIG_PCMCIA CONFIG_X86_PC9800 CONFIG_SND_DUMMY CONFIG_SND_VIRMIDI CONFIG_SND_SERIAL_U16550 CONFIG_SND_MTPAV CONFIG_SND_MPU401 CONFIG_SND_ALS100 CONFIG_SND_AZT2320 CONFIG_SND_CMI8330 CONFIG_SND_DT019X CONFIG_SND_ES18XX CONFIG_SND_OPL3SA2 CONFIG_SND_SGALAXY CONFIG_SND_SSCAPE CONFIG_SND_AD1816A CONFIG_SND_AD1848 CONFIG_SND_CS4231 CONFIG_SND_CS4232 CONFIG_SND_CS4236 CONFIG_SND_PC98_CS4232 CONFIG_SND_ES1688 CONFIG_SND_GUSCLASSIC CONFIG_SND_GUSMAX CONFIG_SND_GUSEXTREME CONFIG_SND_INTERWAVE CONFIG_SND_INTERWAVE_STB CONFIG_SND_OPTI92X_AD1848 CONFIG_SND_OPTI92X_CS4231 CONFIG_SND_OPTI93X CONFIG_SND_SB8 CONFIG_SND_SB16 CONFIG_SND_SBAWE CONFIG_SND_ES968 CONFIG_SND_WAVEFRONT CONFIG_SND_ALS4000 CONFIG_SND_AZT3328 CONFIG_SND_BT87X CONFIG_SND_CMIPCI CONFIG_SND_CS4281 CONFIG_SND_ENS1370 CONFIG_SND_ENS1371 CONFIG_SND_ES1938 CONFIG_SND_ES1968 CONFIG_SND_FM801 CONFIG_SND_INTEL8X0 CONFIG_SND_MAESTRO3 CONFIG_SND_RME32 CONFIG_SND_RME96 CONFIG_SND_SONICVIBES CONFIG_SND_VIA82XX CONFIG_SND_ALI5451 CONFIG_SND_CS46XX CONFIG_SND_EMU10K1 CONFIG_SND_ICE1712 CONFIG_SND_ICE1724 CONFIG_SND_KORG1212 CONFIG_SND_NM256 CONFIG_SND_RME9652 CONFIG_SND_HDSP CONFIG_SND_TRIDENT CONFIG_SND_VX222 CONFIG_SND_YMFPCI CONFIG_SND_POWERMAC CONFIG_SND_SA11XX_UDA1341 CONFIG_SND_USB_AUDIO CONFIG_SND_HARMONY CONFIG_SND_VXPOCKET CONFIG_SND_VXP440 CONFIG_SND_SERIALMIDI CONFIG_SND_INTEL8X0M CONFIG_SND_HDSPM CONFIG_SND_PDPLUS CONFIG_SND_MIXART CONFIG_SND_MSND_PINNACLE CONFIG_SND_PDAUDIOCF CONFIG_SND_USB_USX2Y CONFIG_SND_AU8810 CONFIG_SND_AU8820 CONFIG_SND_AU8830 c_opts m_opts GENKSYMS EXTRA_INCLUDES KERNEL_INC LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -830,15 +830,15 @@
gusclassic, gusmax, gusextreme, interwave,
interwave-stb, opti92x-ad1848, opti92x-cs4231,
opti93x, sb8, sb16, sbawe, es968, wavefront,
- als4000, azt3328, cmipci, cs4281, ens1370,
+ als4000, azt3328, bt87x, cmipci, cs4281, ens1370,
ens1371, es1938, es1968, fm801, intel8x0,
maestro3, rme32, rme96, sonicvibes, via82xx,
ali5451, cs46xx, emu10k1, ice1712, ice1724,
korg1212, nm256, rme9652, hdsp, trident, vx222,
ymfpci, powermac, sa11xx-uda1341, usb-audio,
- harmony, vxpocket, vxp440, serialmidi, bt87x,
- intel8x0m, pdplus, mixart, msnd-pinnacle,
- pdaudiocf, usb-usx2y, au8810, au8820, au8830
+ harmony, vxpocket, vxp440, serialmidi, intel8x0m,
+ hdspm, pdplus, mixart, msnd-pinnacle, pdaudiocf,
+ usb-usx2y, au8810, au8820, au8830
Some influential environment variables:
CC C compiler command
@@ -1255,7 +1255,7 @@
-CONFIG_SND_VERSION="1.0.2"
+CONFIG_SND_VERSION="1.0.2c"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -3043,8 +3043,9 @@
EOF
exit 1
fi
+KERNEL_INC="-I$CONFIG_SND_KERNELDIR/include"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
if test "${kaversion+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3145,7 +3146,7 @@
echo "$as_me:$LINENO: checking for GCC version" >&5
echo $ECHO_N "checking for GCC version... $ECHO_C" >&6
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
if test "${kernel_gcc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3345,17 +3346,21 @@
+
+
+
+
if test "$kversion.$kpatchlevel" = "2.6"; then
NEW_KBUILD=y
fi
- boolvar=CONFIG_SND
+ boolvar="CONFIG_SND"
echo "$as_me:$LINENO: checking for built-in ALSA" >&5
echo $ECHO_N "checking for built-in ALSA... $ECHO_C" >&6
ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+ CFLAGS="$CFLAGS $KERNEL_INC"
boolchk=""
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: \"unknown\"" >&5
@@ -3412,11 +3417,12 @@
{ (exit 1); exit 1; }; }
fi
- boolvar=CONFIG_SND_MODULE
+ boolvar="CONFIG_SND_MODULE"
+ boolvar1="CONFIG_SND_MODULE_MODULE"
echo "$as_me:$LINENO: checking for existing ALSA module" >&5
echo $ECHO_N "checking for existing ALSA module... $ECHO_C" >&6
ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+ CFLAGS="$CFLAGS $KERNEL_INC"
boolchk=""
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: \"unknown\"" >&5
@@ -3432,7 +3438,7 @@
#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
int main( void ) {
-#ifndef $boolvar
+#if !defined($boolvar) && !defined($boolvar1)
exit(1);
#else
exit(0);
@@ -3496,11 +3502,12 @@
echo "$as_me:$LINENO: result: \"auto\"" >&5
echo "${ECHO_T}\"auto\"" >&6
- boolvar=RED_HAT_LINUX_KERNEL
+ boolvar="RED_HAT_LINUX_KERNEL"
+ boolvar1="RED_HAT_LINUX_KERNEL_MODULE"
echo "$as_me:$LINENO: checking for Red Hat kernel" >&5
echo $ECHO_N "checking for Red Hat kernel... $ECHO_C" >&6
ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+ CFLAGS="$CFLAGS $KERNEL_INC"
boolchk=""
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: \"unknown\"" >&5
@@ -3516,7 +3523,7 @@
#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
int main( void ) {
-#ifndef $boolvar
+#if !defined($boolvar) && !defined($boolvar1)
exit(1);
#else
exit(0);
@@ -4071,12 +4078,39 @@
fi
+if test "$kversion.$kpatchlevel" = "2.6"; then
+ cat >>confdefs.h <<\_ACEOF
+#define CONFIG_HAVE_DUMP_STACK 1
+_ACEOF
+
+else
+
+ echo "$as_me:$LINENO: checking for exported symbol dump_stack" >&5
+echo $ECHO_N "checking for exported symbol dump_stack... $ECHO_C" >&6
+ ac_save_CFLAGS="$CFLAGS"
+ boolchk=""
+ if grep EXPORT_SYMBOL "$CONFIG_SND_KERNELDIR/kernel/ksyms.c" | grep "dump_stack" > /dev/null; then
+ echo "$as_me:$LINENO: result: \"yes\"" >&5
+echo "${ECHO_T}\"yes\"" >&6;boolchk="y"
+ cat >>confdefs.h <<\_ACEOF
+#define CONFIG_HAVE_DUMP_STACK 1
+_ACEOF
- boolvar=CONFIG_MODVERSIONS
+ else
+ echo "$as_me:$LINENO: result: \"no\"" >&5
+echo "${ECHO_T}\"no\"" >&6;boolchk="",
+ fi
+ eval $boolvar="$boolchk"
+
+fi
+
+
+ boolvar="CONFIG_MODVERSIONS"
+ boolvar1="CONFIG_MODVERSIONS_MODULE"
echo "$as_me:$LINENO: checking for kernel module symbol versions" >&5
echo $ECHO_N "checking for kernel module symbol versions... $ECHO_C" >&6
ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+ CFLAGS="$CFLAGS $KERNEL_INC"
boolchk=""
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: \"unknown\"" >&5
@@ -4092,7 +4126,7 @@
#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
int main( void ) {
-#ifndef $boolvar
+#if !defined($boolvar) && !defined($boolvar1)
exit(1);
#else
exit(0);
@@ -4132,11 +4166,12 @@
GENKSYMS="/sbin/genksyms -k $kversion.$kpatchlevel.$ksublevel"
- boolvar=CONFIG_PCI
+ boolvar="CONFIG_PCI"
+ boolvar1="CONFIG_PCI_MODULE"
echo "$as_me:$LINENO: checking for PCI support in kernel" >&5
echo $ECHO_N "checking for PCI support in kernel... $ECHO_C" >&6
ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+ CFLAGS="$CFLAGS $KERNEL_INC"
boolchk=""
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: \"unknown\"" >&5
@@ -4152,7 +4187,7 @@
#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
int main( void ) {
-#ifndef $boolvar
+#if !defined($boolvar) && !defined($boolvar1)
exit(1);
#else
exit(0);
@@ -4335,11 +4370,12 @@
if test $kpatchlevel -ge 3; then
- boolvar=CONFIG_ISA
+ boolvar="CONFIG_ISA"
+ boolvar1="CONFIG_ISA_MODULE"
echo "$as_me:$LINENO: checking for ISA support in kernel" >&5
echo $ECHO_N "checking for ISA support in kernel... $ECHO_C" >&6
ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+ CFLAGS="$CFLAGS $KERNEL_INC"
boolchk=""
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: \"unknown\"" >&5
@@ -4355,7 +4391,7 @@
#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
int main( void ) {
-#ifndef $boolvar
+#if !defined($boolvar) && !defined($boolvar1)
exit(1);
#else
exit(0);
@@ -4405,7 +4441,7 @@
processor=""
rm -f processor.id
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: \"unknown\"" >&5
echo "${ECHO_T}\"unknown\"" >&6;processor=""
@@ -4786,7 +4822,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
rm -f machine.id
- c_opts="$c_opts -I\$(CONFIG_SND_KERNELDIR)/include/asm-i386/mach-$machine"
+ KERNEL_INC="$KERNEL_INC -I$CONFIG_SND_KERNELDIR/include/asm-i386/mach-$machine"
fi
;;
esac
@@ -4814,11 +4850,12 @@
- boolvar=CONFIG_SMP
+ boolvar="CONFIG_SMP"
+ boolvar1="CONFIG_SMP_MODULE"
echo "$as_me:$LINENO: checking for SMP" >&5
echo $ECHO_N "checking for SMP... $ECHO_C" >&6
ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+ CFLAGS="$CFLAGS $KERNEL_INC"
boolchk=""
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: \"unknown\"" >&5
@@ -4834,7 +4871,7 @@
#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
int main( void ) {
-#ifndef $boolvar
+#if !defined($boolvar) && !defined($boolvar1)
exit(1);
#else
exit(0);
@@ -4878,6 +4915,65 @@
fi
+
+ boolvar="CONFIG_VIDEO_DEV"
+ boolvar1="CONFIG_VIDEO_DEV_MODULE"
+ echo "$as_me:$LINENO: checking for Video device support in kernel" >&5
+echo $ECHO_N "checking for Video device support in kernel... $ECHO_C" >&6
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $KERNEL_INC"
+ boolchk=""
+ if test "$cross_compiling" = yes; then
+ echo "$as_me:$LINENO: result: \"unknown\"" >&5
+echo "${ECHO_T}\"unknown\"" >&6;boolchk=""
+
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
+int main( void ) {
+#if !defined($boolvar) && !defined($boolvar1)
+ exit(1);
+#else
+ exit(0);
+#endif
+}
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ echo "$as_me:$LINENO: result: \"yes\"" >&5
+echo "${ECHO_T}\"yes\"" >&6;boolchk="y"
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+echo "$as_me:$LINENO: result: \"no\"" >&5
+echo "${ECHO_T}\"no\"" >&6;boolchk=""
+fi
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+ CFLAGS="$ac_save_CFLAGS"
+ eval $boolvar="$boolchk"
+
+
+
echo "$as_me:$LINENO: checking for ISA PnP driver in kernel" >&5
echo $ECHO_N "checking for ISA PnP driver in kernel... $ECHO_C" >&6
CONFIG_ISAPNP_KERNEL=
@@ -4914,11 +5010,12 @@
if test "$CONFIG_ISAPNP_KERNEL" = y; then
- boolvar=CONFIG_ISAPNP
+ boolvar="CONFIG_ISAPNP"
+ boolvar1="CONFIG_ISAPNP_MODULE"
echo "$as_me:$LINENO: checking for Kernel ISA-PnP support" >&5
echo $ECHO_N "checking for Kernel ISA-PnP support... $ECHO_C" >&6
ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+ CFLAGS="$CFLAGS $KERNEL_INC"
boolchk=""
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: \"unknown\"" >&5
@@ -4934,7 +5031,7 @@
#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
int main( void ) {
-#ifndef $boolvar
+#if !defined($boolvar) && !defined($boolvar1)
exit(1);
#else
exit(0);
@@ -4971,11 +5068,12 @@
if test "$CONFIG_ISAPNP" != "y"; then
- boolvar=CONFIG_ISAPNP_MODULE
+ boolvar="CONFIG_ISAPNP_MODULE"
+ boolvar1="CONFIG_ISAPNP_MODULE_MODULE"
echo "$as_me:$LINENO: checking for Kernel ISA-PnP module support" >&5
echo $ECHO_N "checking for Kernel ISA-PnP module support... $ECHO_C" >&6
ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+ CFLAGS="$CFLAGS $KERNEL_INC"
boolchk=""
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: \"unknown\"" >&5
@@ -4991,7 +5089,7 @@
#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
int main( void ) {
-#ifndef $boolvar
+#if !defined($boolvar) && !defined($boolvar1)
exit(1);
#else
exit(0);
@@ -5083,7 +5181,7 @@
echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6
strlcpy="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="-Wall -Werror $CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="-Wall -Werror $CFLAGS $KERNEL_INC"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5142,7 +5240,7 @@
echo $ECHO_N "checking for snprintf... $ECHO_C" >&6
snprintf="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="-Wall -Werror $CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="-Wall -Werror $CFLAGS $KERNEL_INC"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5200,7 +5298,7 @@
echo $ECHO_N "checking for vmalloc_to_page... $ECHO_C" >&6
vmalloc_to_page="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5259,7 +5357,7 @@
echo $ECHO_N "checking for old kmod... $ECHO_C" >&6
old_kmod="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Wall -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS -Wall $KERNEL_INC"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5316,7 +5414,7 @@
echo $ECHO_N "checking for PDE... $ECHO_C" >&6
pde_defined="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Wall -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS -Wall $KERNEL_INC"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5375,7 +5473,7 @@
echo $ECHO_N "checking for pci_set_consistent_dma_mask... $ECHO_C" >&6
pci_consistent_defined="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Wall -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS -Wall $KERNEL_INC"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5433,7 +5531,7 @@
echo $ECHO_N "checking for tty->count is the atomic type... $ECHO_C" >&6
tty_count_atomic="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Wall -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS -Wall $KERNEL_INC"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5487,13 +5585,73 @@
fi
+if test "$CONFIG_VIDEO_DEV" = "y"; then
+echo "$as_me:$LINENO: checking for video_get_drvdata" >&5
+echo $ECHO_N "checking for video_get_drvdata... $ECHO_C" >&6
+video_get_drvdata="0"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $KERNEL_INC"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#define __KERNEL__
+#include "$CONFIG_SND_KERNELDIR/include/linux/config.h"
+#include "$CONFIG_SND_KERNELDIR/include/linux/videodev.h"
+
+int
+main ()
+{
+
+ void (*func)(struct video_device *);
+ func = video_get_drvdata;
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ echo "$as_me:$LINENO: result: \"yes\"" >&5
+echo "${ECHO_T}\"yes\"" >&6;video_get_drvdata="1"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+echo "$as_me:$LINENO: result: \"no\"" >&5
+echo "${ECHO_T}\"no\"" >&6;video_get_drvdata="0"
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+CFLAGS=$ac_save_CFLAGS
+CONFIG_HAVE_VIDEO_GET_DRVDATA=$video_get_drvdata
+if test "$CONFIG_HAVE_VIDEO_GET_DRVDATA" = "1"; then
+ cat >>confdefs.h <<\_ACEOF
+#define CONFIG_HAVE_VIDEO_GET_DRVDATA 1
+_ACEOF
+
+fi
+fi
+
if test $kpatchlevel -le 2; then
echo "$as_me:$LINENO: checking for old kill_fasync" >&5
echo $ECHO_N "checking for old kill_fasync... $ECHO_C" >&6
oldkfasync="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5555,7 +5713,7 @@
echo $ECHO_N "checking for dma_addr_t... $ECHO_C" >&6
dma_addr_t="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5612,7 +5770,7 @@
echo $ECHO_N "checking for MUTEX macros... $ECHO_C" >&6
have_mutex_macros="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5788,7 +5946,7 @@
echo $ECHO_N "checking for RTC callback support in kernel... $ECHO_C" >&6
rtcsup="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: \"unknown\"" >&5
echo "${ECHO_T}\"unknown\"" >&6;rtcsup=""
@@ -5856,11 +6014,12 @@
- boolvar=CONFIG_USB
+ boolvar="CONFIG_USB"
+ boolvar1="CONFIG_USB_MODULE"
echo "$as_me:$LINENO: checking for USB support" >&5
echo $ECHO_N "checking for USB support... $ECHO_C" >&6
ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+ CFLAGS="$CFLAGS $KERNEL_INC"
boolchk=""
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: \"unknown\"" >&5
@@ -5876,7 +6035,7 @@
#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
int main( void ) {
-#ifndef $boolvar
+#if !defined($boolvar) && !defined($boolvar1)
exit(1);
#else
exit(0);
@@ -5913,11 +6072,12 @@
if test "$CONFIG_USB" != "y"; then
- boolvar=CONFIG_USB_MODULE
+ boolvar="CONFIG_USB_MODULE"
+ boolvar1="CONFIG_USB_MODULE_MODULE"
echo "$as_me:$LINENO: checking for USB module support" >&5
echo $ECHO_N "checking for USB module support... $ECHO_C" >&6
ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+ CFLAGS="$CFLAGS $KERNEL_INC"
boolchk=""
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: \"unknown\"" >&5
@@ -5933,7 +6093,7 @@
#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
int main( void ) {
-#ifndef $boolvar
+#if !defined($boolvar) && !defined($boolvar1)
exit(1);
#else
exit(0);
@@ -5992,11 +6152,12 @@
if test "$pcmcia" = "kernel"; then
echo "checking for kernel PCMCIA"
- boolvar=CONFIG_PCMCIA
+ boolvar="CONFIG_PCMCIA"
+ boolvar1="CONFIG_PCMCIA_MODULE"
echo "$as_me:$LINENO: checking for PCMCIA support" >&5
echo $ECHO_N "checking for PCMCIA support... $ECHO_C" >&6
ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+ CFLAGS="$CFLAGS $KERNEL_INC"
boolchk=""
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: \"unknown\"" >&5
@@ -6012,7 +6173,7 @@
#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
int main( void ) {
-#ifndef $boolvar
+#if !defined($boolvar) && !defined($boolvar1)
exit(1);
#else
exit(0);
@@ -6049,11 +6210,12 @@
if test "$CONFIG_PCMCIA" != "y"; then
- boolvar=CONFIG_PCMCIA_MODULE
+ boolvar="CONFIG_PCMCIA_MODULE"
+ boolvar1="CONFIG_PCMCIA_MODULE_MODULE"
echo "$as_me:$LINENO: checking for PCMCIA module support" >&5
echo $ECHO_N "checking for PCMCIA module support... $ECHO_C" >&6
ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+ CFLAGS="$CFLAGS $KERNEL_INC"
boolchk=""
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: \"unknown\"" >&5
@@ -6069,7 +6231,7 @@
#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
int main( void ) {
-#ifndef $boolvar
+#if !defined($boolvar) && !defined($boolvar1)
exit(1);
#else
exit(0);
@@ -6126,11 +6288,12 @@
- boolvar=CONFIG_X86_PC9800
+ boolvar="CONFIG_X86_PC9800"
+ boolvar1="CONFIG_X86_PC9800_MODULE"
echo "$as_me:$LINENO: checking for PC9800 support in kernel" >&5
echo $ECHO_N "checking for PC9800 support in kernel... $ECHO_C" >&6
ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+ CFLAGS="$CFLAGS $KERNEL_INC"
boolchk=""
if test "$cross_compiling" = yes; then
echo "$as_me:$LINENO: result: \"unknown\"" >&5
@@ -6146,7 +6309,7 @@
#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
int main( void ) {
-#ifndef $boolvar
+#if !defined($boolvar) && !defined($boolvar1)
exit(1);
#else
exit(0);
@@ -6219,6 +6382,7 @@
CONFIG_SND_WAVEFRONT=""
CONFIG_SND_ALS4000=""
CONFIG_SND_AZT3328=""
+ CONFIG_SND_BT87X=""
CONFIG_SND_CMIPCI=""
CONFIG_SND_CS4281=""
CONFIG_SND_ENS1370=""
@@ -6251,8 +6415,8 @@
CONFIG_SND_VXPOCKET=""
CONFIG_SND_VXP440=""
CONFIG_SND_SERIALMIDI=""
- CONFIG_SND_BT87X=""
CONFIG_SND_INTEL8X0M=""
+ CONFIG_SND_HDSPM=""
CONFIG_SND_PDPLUS=""
CONFIG_SND_MIXART=""
CONFIG_SND_MSND_PINNACLE=""
@@ -6511,6 +6675,13 @@
fi
if test "$CONFIG_PCI" = "y"; then
+ CONFIG_SND_BT87X="m"
+ cat >>confdefs.h <<\_ACEOF
+#define CONFIG_SND_BT87X_MODULE 1
+_ACEOF
+
+ fi
+ if test "$CONFIG_PCI" = "y"; then
CONFIG_SND_CMIPCI="m"
cat >>confdefs.h <<\_ACEOF
#define CONFIG_SND_CMIPCI_MODULE 1
@@ -6733,16 +6904,16 @@
_ACEOF
if test "$CONFIG_PCI" = "y"; then
- CONFIG_SND_BT87X="m"
+ CONFIG_SND_INTEL8X0M="m"
cat >>confdefs.h <<\_ACEOF
-#define CONFIG_SND_BT87X_MODULE 1
+#define CONFIG_SND_INTEL8X0M_MODULE 1
_ACEOF
fi
if test "$CONFIG_PCI" = "y"; then
- CONFIG_SND_INTEL8X0M="m"
+ CONFIG_SND_HDSPM="m"
cat >>confdefs.h <<\_ACEOF
-#define CONFIG_SND_INTEL8X0M_MODULE 1
+#define CONFIG_SND_HDSPM_MODULE 1
_ACEOF
fi
@@ -7055,6 +7226,13 @@
_ACEOF
;;
+ bt87x)
+ CONFIG_SND_BT87X="m"
+ cat >>confdefs.h <<\_ACEOF
+#define CONFIG_SND_BT87X_MODULE 1
+_ACEOF
+
+ ;;
cmipci)
CONFIG_SND_CMIPCI="m"
cat >>confdefs.h <<\_ACEOF
@@ -7279,17 +7457,17 @@
_ACEOF
;;
- bt87x)
- CONFIG_SND_BT87X="m"
+ intel8x0m)
+ CONFIG_SND_INTEL8X0M="m"
cat >>confdefs.h <<\_ACEOF
-#define CONFIG_SND_BT87X_MODULE 1
+#define CONFIG_SND_INTEL8X0M_MODULE 1
_ACEOF
;;
- intel8x0m)
- CONFIG_SND_INTEL8X0M="m"
+ hdspm)
+ CONFIG_SND_HDSPM="m"
cat >>confdefs.h <<\_ACEOF
-#define CONFIG_SND_INTEL8X0M_MODULE 1
+#define CONFIG_SND_HDSPM_MODULE 1
_ACEOF
;;
@@ -7437,6 +7615,7 @@
+
c_opts="$c_opts -DLINUX"
m_opts=""
if test -r /etc/asound/make_opts; then
@@ -7447,6 +7626,7 @@
+
ac_config_files="$ac_config_files version Makefile.conf snddevices utils/alsa-driver.spec utils/buildrpm toplevel.config utils/alsasound utils/alsasound.posix"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -8109,6 +8289,7 @@
s,@CONFIG_PARISC@,$CONFIG_PARISC,;t t
s,@CONFIG_SND_BIT32_EMUL@,$CONFIG_SND_BIT32_EMUL,;t t
s,@msmp@,$msmp,;t t
+s,@CONFIG_VIDEO_DEV@,$CONFIG_VIDEO_DEV,;t t
s,@CONFIG_ISAPNP_KERNEL@,$CONFIG_ISAPNP_KERNEL,;t t
s,@CONFIG_PNP_KERNEL@,$CONFIG_PNP_KERNEL,;t t
s,@CONFIG_ISAPNP@,$CONFIG_ISAPNP,;t t
@@ -8157,6 +8338,7 @@
s,@CONFIG_SND_WAVEFRONT@,$CONFIG_SND_WAVEFRONT,;t t
s,@CONFIG_SND_ALS4000@,$CONFIG_SND_ALS4000,;t t
s,@CONFIG_SND_AZT3328@,$CONFIG_SND_AZT3328,;t t
+s,@CONFIG_SND_BT87X@,$CONFIG_SND_BT87X,;t t
s,@CONFIG_SND_CMIPCI@,$CONFIG_SND_CMIPCI,;t t
s,@CONFIG_SND_CS4281@,$CONFIG_SND_CS4281,;t t
s,@CONFIG_SND_ENS1370@,$CONFIG_SND_ENS1370,;t t
@@ -8189,8 +8371,8 @@
s,@CONFIG_SND_VXPOCKET@,$CONFIG_SND_VXPOCKET,;t t
s,@CONFIG_SND_VXP440@,$CONFIG_SND_VXP440,;t t
s,@CONFIG_SND_SERIALMIDI@,$CONFIG_SND_SERIALMIDI,;t t
-s,@CONFIG_SND_BT87X@,$CONFIG_SND_BT87X,;t t
s,@CONFIG_SND_INTEL8X0M@,$CONFIG_SND_INTEL8X0M,;t t
+s,@CONFIG_SND_HDSPM@,$CONFIG_SND_HDSPM,;t t
s,@CONFIG_SND_PDPLUS@,$CONFIG_SND_PDPLUS,;t t
s,@CONFIG_SND_MIXART@,$CONFIG_SND_MIXART,;t t
s,@CONFIG_SND_MSND_PINNACLE@,$CONFIG_SND_MSND_PINNACLE,;t t
@@ -8203,6 +8385,7 @@
s,@m_opts@,$m_opts,;t t
s,@GENKSYMS@,$GENKSYMS,;t t
s,@EXTRA_INCLUDES@,$EXTRA_INCLUDES,;t t
+s,@KERNEL_INC@,$KERNEL_INC,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
@@ -8669,6 +8852,7 @@
if test "$CONFIG_SND_MODULE" = y; then
echo "Hacking autoconf.h..."
rm -f include/linux/autoconf.h
+ mkdir -p include/linux
grep -v CONFIG_SND_ $CONFIG_SND_KERNELDIR/include/linux/autoconf.h > include/linux/autoconf.h
cat include/autoconf-extra.h >> include/linux/autoconf.h
cat include/config1.h >> include/linux/autoconf.h
Index: debian/alsa-driver/configure.in
diff -u debian/alsa-driver/configure.in:1.20 debian/alsa-driver/configure.in:1.21
--- debian/alsa-driver/configure.in:1.20 Tue Feb 3 19:36:40 2004
+++ debian/alsa-driver/configure.in Mon Feb 9 06:10:32 2004
@@ -4,7 +4,7 @@
AC_INIT(acore/sound.patch)
AC_PREFIX_DEFAULT(/usr)
-CONFIG_SND_VERSION="1.0.2"
+CONFIG_SND_VERSION="1.0.2c"
dnl Checks for programs.
AC_PROG_CC
@@ -86,8 +86,9 @@
EOF
exit 1
fi
+KERNEL_INC="-I$CONFIG_SND_KERNELDIR/include"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
AC_CACHE_VAL(kaversion,
[AC_TRY_RUN([
#include <stdio.h>
@@ -153,7 +154,7 @@
dnl Check for GCC version...
AC_MSG_CHECKING(for GCC version)
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
AC_CACHE_VAL(kernel_gcc,
[AC_TRY_RUN([
#include <stdio.h>
@@ -337,11 +338,11 @@
])
dnl Check kernel configurations
-AC_DEFUN([CHECK_KERNEL_CONFIG], [
- boolvar=$1
+AC_DEFUN([CHECK_KERNEL_CONFIG_BUILTIN], [
+ boolvar="$1"
AC_MSG_CHECKING(for $2)
ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+ CFLAGS="$CFLAGS $KERNEL_INC"
boolchk=""
AC_TRY_RUN([
#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
@@ -361,13 +362,53 @@
eval $boolvar="$boolchk"
])
+dnl Check kernel configurations
+AC_DEFUN([CHECK_KERNEL_CONFIG], [
+ boolvar="$1"
+ boolvar1="$1_MODULE"
+ AC_MSG_CHECKING(for $2)
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $KERNEL_INC"
+ boolchk=""
+ AC_TRY_RUN([
+#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
+int main( void ) {
+#if !defined($boolvar) && !defined($boolvar1)
+ exit(1);
+#else
+ exit(0);
+#endif
+}
+],
+ AC_MSG_RESULT("yes");boolchk="y",
+ AC_MSG_RESULT("no");boolchk="",
+ AC_MSG_RESULT("unknown");boolchk=""
+ )
+ CFLAGS="$ac_save_CFLAGS"
+ eval $boolvar="$boolchk"
+])
+
+dnl Check if symbol is exported
+AC_DEFUN([CHECK_EXPORTED], [
+ AC_MSG_CHECKING(for exported symbol $2)
+ ac_save_CFLAGS="$CFLAGS"
+ boolchk=""
+ if grep EXPORT_SYMBOL "$CONFIG_SND_KERNELDIR/kernel/ksyms.c" | grep "$2" > /dev/null; then
+ AC_MSG_RESULT("yes");boolchk="y"
+ AC_DEFINE($1)
+ else
+ AC_MSG_RESULT("no");boolchk="",
+ fi
+ eval $boolvar="$boolchk"
+])
+
if test "$kversion.$kpatchlevel" = "2.6"; then
NEW_KBUILD=y
AC_SUBST(NEW_KBUILD)
fi
dnl Check builtin ALSA on 2.6 kernel
-CHECK_KERNEL_CONFIG(CONFIG_SND, [built-in ALSA])
+CHECK_KERNEL_CONFIG_BUILTIN(CONFIG_SND, [built-in ALSA])
if test "$CONFIG_SND" = "y"; then
AC_MSG_ERROR(You have built-in ALSA in your kernel.)
fi
@@ -428,6 +469,13 @@
CHECK_KERNEL_HEADER(linux/pmu.h, [#include <asm/pmu.h>
])
+dnl Check for dump_stack
+if test "$kversion.$kpatchlevel" = "2.6"; then
+ AC_DEFINE(CONFIG_HAVE_DUMP_STACK)
+else
+ CHECK_EXPORTED(CONFIG_HAVE_DUMP_STACK, dump_stack)
+fi
+
dnl Check for modversions...
CHECK_KERNEL_CONFIG(CONFIG_MODVERSIONS, [kernel module symbol versions])
CONFIG_SND_MVERSION=$CONFIG_MODVERSIONS
@@ -545,7 +593,7 @@
processor=""
rm -f processor.id
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
AC_TRY_RUN([
#include <stdio.h>
#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
@@ -860,7 +908,7 @@
machine=`cat machine.id`;AC_MSG_RESULT($machine))
CFLAGS="$ac_save_CFLAGS"
rm -f machine.id
- c_opts="$c_opts -I\$(CONFIG_SND_KERNELDIR)/include/asm-i386/mach-$machine"
+ KERNEL_INC="$KERNEL_INC -I$CONFIG_SND_KERNELDIR/include/asm-i386/mach-$machine"
fi
;;
esac
@@ -893,6 +941,10 @@
fi
AC_SUBST(msmp)
+dnl Check for video device support...
+CHECK_KERNEL_CONFIG(CONFIG_VIDEO_DEV, [Video device support in kernel])
+AC_SUBST(CONFIG_VIDEO_DEV)
+
dnl Check for ISA PnP driver in kernel...
AC_MSG_CHECKING(for ISA PnP driver in kernel)
CONFIG_ISAPNP_KERNEL=
@@ -967,7 +1019,7 @@
AC_MSG_CHECKING(for strlcpy)
strlcpy="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="-Wall -Werror $CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="-Wall -Werror $CFLAGS $KERNEL_INC"
AC_TRY_COMPILE([
#define __KERNEL__
#include "$CONFIG_SND_KERNELDIR/include/linux/config.h"
@@ -992,7 +1044,7 @@
AC_MSG_CHECKING(for snprintf)
snprintf="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="-Wall -Werror $CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="-Wall -Werror $CFLAGS $KERNEL_INC"
AC_TRY_COMPILE([
#define __KERNEL__
#include "$CONFIG_SND_KERNELDIR/include/linux/config.h"
@@ -1016,7 +1068,7 @@
AC_MSG_CHECKING(for vmalloc_to_page)
vmalloc_to_page="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
AC_TRY_COMPILE([
#define __KERNEL__
#include "$CONFIG_SND_KERNELDIR/include/linux/config.h"
@@ -1041,7 +1093,7 @@
AC_MSG_CHECKING(for old kmod)
old_kmod="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Wall -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS -Wall $KERNEL_INC"
AC_TRY_COMPILE([
#define __KERNEL__
#include "$CONFIG_SND_KERNELDIR/include/linux/config.h"
@@ -1064,7 +1116,7 @@
AC_MSG_CHECKING(for PDE)
pde_defined="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Wall -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS -Wall $KERNEL_INC"
AC_TRY_COMPILE([
#define __KERNEL__
#include "$CONFIG_SND_KERNELDIR/include/linux/config.h"
@@ -1089,7 +1141,7 @@
AC_MSG_CHECKING(for pci_set_consistent_dma_mask)
pci_consistent_defined="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Wall -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS -Wall $KERNEL_INC"
AC_TRY_COMPILE([
#define __KERNEL__
#include "$CONFIG_SND_KERNELDIR/include/linux/config.h"
@@ -1112,7 +1164,7 @@
AC_MSG_CHECKING(for tty->count is the atomic type)
tty_count_atomic="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Wall -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS -Wall $KERNEL_INC"
AC_TRY_COMPILE([
#define __KERNEL__
#include "$CONFIG_SND_KERNELDIR/include/linux/config.h"
@@ -1131,6 +1183,32 @@
AC_DEFINE(CONFIG_HAVE_TTY_COUNT_ATOMIC)
fi
+dnl Check for video_get_drvdata()
+if test "$CONFIG_VIDEO_DEV" = "y"; then
+AC_MSG_CHECKING(for video_get_drvdata)
+video_get_drvdata="0"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $KERNEL_INC"
+AC_TRY_COMPILE([
+#define __KERNEL__
+#include "$CONFIG_SND_KERNELDIR/include/linux/config.h"
+#include "$CONFIG_SND_KERNELDIR/include/linux/videodev.h"
+],[
+ void (*func)(struct video_device *);
+ func = video_get_drvdata;
+],
+ AC_MSG_RESULT("yes");video_get_drvdata="1",
+ AC_MSG_RESULT("no");video_get_drvdata="0",
+ AC_MSG_RESULT("unknown");video_get_drvdata="0"
+)
+CFLAGS=$ac_save_CFLAGS
+CONFIG_HAVE_VIDEO_GET_DRVDATA=$video_get_drvdata
+dnl AC_SUBST(CONFIG_HAVE_VIDEO_GET_DRVDATA)
+if test "$CONFIG_HAVE_VIDEO_GET_DRVDATA" = "1"; then
+ AC_DEFINE(CONFIG_HAVE_VIDEO_GET_DRVDATA)
+fi
+fi
+
dnl check only on 2.2 kernel..
if test $kpatchlevel -le 2; then
@@ -1138,7 +1216,7 @@
AC_MSG_CHECKING(for old kill_fasync)
oldkfasync="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
AC_TRY_COMPILE([
#define __KERNEL__
#include "$CONFIG_SND_KERNELDIR/include/linux/config.h"
@@ -1166,7 +1244,7 @@
AC_MSG_CHECKING(for dma_addr_t)
dma_addr_t="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
AC_TRY_COMPILE([
#define __KERNEL__
#include "$CONFIG_SND_KERNELDIR/include/linux/config.h"
@@ -1189,7 +1267,7 @@
AC_MSG_CHECKING(for MUTEX macros)
have_mutex_macros="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
AC_TRY_COMPILE([
#define __KERNEL__
#include "$CONFIG_SND_KERNELDIR/include/linux/config.h"
@@ -1293,7 +1371,7 @@
AC_MSG_CHECKING(for RTC callback support in kernel)
rtcsup="0"
ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+CFLAGS="$CFLAGS $KERNEL_INC"
AC_TRY_RUN([
#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
#if defined(__alpha__) || (!defined(CONFIG_RTC) && !defined(CONFIG_RTC_MODULE))
@@ -1381,6 +1459,7 @@
AC_SUBST(m_opts)
AC_SUBST(GENKSYMS)
AC_SUBST(EXTRA_INCLUDES)
+AC_SUBST(KERNEL_INC)
dnl Output files...
AC_OUTPUT(version Makefile.conf snddevices \
@@ -1394,6 +1473,7 @@
if test "$CONFIG_SND_MODULE" = y; then
echo "Hacking autoconf.h..."
rm -f include/linux/autoconf.h
+ mkdir -p include/linux
grep -v CONFIG_SND_ $CONFIG_SND_KERNELDIR/include/linux/autoconf.h > include/linux/autoconf.h
cat include/autoconf-extra.h >> include/linux/autoconf.h
cat include/config1.h >> include/linux/autoconf.h
Index: debian/alsa-driver/debian/changelog
diff -u debian/alsa-driver/debian/changelog:1.196 debian/alsa-driver/debian/changelog:1.197
--- debian/alsa-driver/debian/changelog:1.196 Tue Feb 3 19:36:42 2004
+++ debian/alsa-driver/debian/changelog Mon Feb 9 06:10:33 2004
@@ -1,4 +1,4 @@
-alsa-driver (1.0.2-1) unstable; urgency=low
+alsa-driver (1.0.2c-1) unstable; urgency=low
* New upstream release
* Unreleased.
Index: debian/alsa-driver/include/config.h.in
diff -u debian/alsa-driver/include/config.h.in:1.9 debian/alsa-driver/include/config.h.in:1.10
--- debian/alsa-driver/include/config.h.in:1.9 Tue Feb 3 19:36:44 2004
+++ debian/alsa-driver/include/config.h.in Mon Feb 9 06:10:34 2004
@@ -35,6 +35,8 @@
#undef CONFIG_HAVE_VMALLOC_TO_PAGE
#undef CONFIG_HAVE_PDE
#undef CONFIG_HAVE_TTY_COUNT_ATOMIC
+#undef CONFIG_HAVE_VIDEO_GET_DRVDATA
+#undef CONFIG_HAVE_DUMP_STACK
/* 2.2 kernels */
#undef CONFIG_OLD_KILL_FASYNC
Index: debian/alsa-driver/include/config1.h.in
diff -u debian/alsa-driver/include/config1.h.in:1.9 debian/alsa-driver/include/config1.h.in:1.10
--- debian/alsa-driver/include/config1.h.in:1.9 Tue Feb 3 19:36:44 2004
+++ debian/alsa-driver/include/config1.h.in Mon Feb 9 06:10:34 2004
@@ -37,6 +37,7 @@
#undef CONFIG_SND_WAVEFRONT_MODULE
#undef CONFIG_SND_ALS4000_MODULE
#undef CONFIG_SND_AZT3328_MODULE
+#undef CONFIG_SND_BT87X_MODULE
#undef CONFIG_SND_CMIPCI_MODULE
#undef CONFIG_SND_CS4281_MODULE
#undef CONFIG_SND_ENS1370_MODULE
@@ -69,8 +70,8 @@
#undef CONFIG_SND_VXPOCKET_MODULE
#undef CONFIG_SND_VXP440_MODULE
#undef CONFIG_SND_SERIALMIDI_MODULE
-#undef CONFIG_SND_BT87X_MODULE
#undef CONFIG_SND_INTEL8X0M_MODULE
+#undef CONFIG_SND_HDSPM_MODULE
#undef CONFIG_SND_PDPLUS_MODULE
#undef CONFIG_SND_MIXART_MODULE
#undef CONFIG_SND_MSND_PINNACLE_MODULE