[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-driver/debian/patches (1 file)
David B Harris
dbharris-guest@quantz.debian.org
Mon, 09 Feb 2004 06:23:50 +0100
Date: Monday, February 9, 2004 @ 06:23:50
Author: dbharris-guest
Path: /cvsroot/pkg-alsa/debian/alsa-driver/debian/patches
Modified: 10_disable_gcc_version_check.dpatch
Update 10_disable_gcc_version_check to apply against the current tree
-------------------------------------+
10_disable_gcc_version_check.dpatch | 1257 ++--------------------------------
1 files changed, 86 insertions(+), 1171 deletions(-)
Index: debian/alsa-driver/debian/patches/10_disable_gcc_version_check.dpatch
diff -u debian/alsa-driver/debian/patches/10_disable_gcc_version_check.dpatch:1.12 debian/alsa-driver/debian/patches/10_disable_gcc_version_check.dpatch:1.13
--- debian/alsa-driver/debian/patches/10_disable_gcc_version_check.dpatch:1.12 Mon Jan 12 12:37:02 2004
+++ debian/alsa-driver/debian/patches/10_disable_gcc_version_check.dpatch Mon Feb 9 06:23:50 2004
@@ -1,553 +1,40 @@
#!/bin/sh -e
-## 10_disable_gcc_version_check.dpatch by Steve Kowalik
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't compare the kernel GCC with the GCC we are building with in the
-## DP: configure script, as we already handle it ourselves.
+
+# 11_makefile_conf_shell_bash.dpatch by Steve Kowalik and Herbert Xu
+
+# DP: Fix 2 glaring bashisms in Rules.make.
+
+. debian/patches/patch-opts
if [ $# -ne 1 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
case "$1" in
-patch) patch $patch_opts -p1 < $0;;
-unpatch) patch $patch_opts -p1 -R < $0;;
*)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argum
+ent"
exit 1;;
esac
exit 0
@DPATCH@
---- alsa-driver/configure~ 2004-01-09 20:24:51.000000000 +1100
-+++ alsa-driver/configure 2004-01-09 20:26:58.000000000 +1100
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.57a.
-+# Generated by GNU Autoconf 2.59.
- #
- # Copyright (C) 2003 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
-@@ -19,9 +19,10 @@
- elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
- fi
-+DUALCASE=1; export DUALCASE # for MKS sh
-
- # Support unset when possible.
--if (as_foo=foo; unset as_foo) >/dev/null 2>&1; then
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
- else
- as_unset=false
-@@ -217,16 +218,17 @@
- if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
- else
-+ test -d ./-p && rmdir ./-p
- as_mkdir_p=false
- fi
-
- as_executable_p="test -f"
-
- # Sed expression to map a string onto a valid CPP name.
--as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
- # Sed expression to map a string onto a valid variable name.
--as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
- # IFS
-@@ -885,12 +887,45 @@
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
- esac
--# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
--# absolute.
--ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
--ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
--ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
--ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+ case "$ac_dir" in
-+ .) ac_abs_builddir=`pwd`;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+ case ${ac_top_builddir}. in
-+ .) ac_abs_top_builddir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+ case $ac_srcdir in
-+ .) ac_abs_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+ case $ac_top_srcdir in
-+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+ esac;;
-+esac
-
- cd $ac_dir
- # Check for guested configure; otherwise get Cygnus style configure.
-@@ -907,7 +942,7 @@
- else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi
-- cd $ac_popdir
-+ cd "$ac_popdir"
- done
- fi
-
-@@ -927,7 +962,7 @@
- running configure, to aid debugging if configure makes a mistake.
-
- It was created by $as_me, which was
--generated by GNU Autoconf 2.57a. Invocation command line was
-+generated by GNU Autoconf 2.59. Invocation command line was
-
- $ $0 $@
-
-@@ -1103,7 +1138,7 @@
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
- } >&5
-- rm -f core core.* *.core &&
-+ rm -f core *.core &&
- rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
- exit $exit_status
- ' 0
-@@ -1818,10 +1853,19 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (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); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-@@ -1835,7 +1879,7 @@
-
- ac_compiler_gnu=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
- fi
-@@ -1867,10 +1911,19 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (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); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-@@ -1884,7 +1937,7 @@
-
- ac_cv_prog_cc_g=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-@@ -1938,6 +1991,16 @@
- va_end (v);
- return s;
- }
-+
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
-+ function prototypes and stuff, but not '\xHH' hex character constants.
-+ These don't provoke an error unfortunately, instead are silently treated
-+ as 'x'. The following induces an error, until -std1 is added to get
-+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
-+ array size at least. It's necessary to write '\x00'==0 to get something
-+ that's true only with -std1. */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
- int test (int i, double x);
- struct s1 {int (*f) (int a);};
- struct s2 {int (*f) (double a);};
-@@ -1964,10 +2027,19 @@
- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (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); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-@@ -1981,7 +2053,7 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- fi
--rm -f conftest.$ac_objext
-+rm -f conftest.err conftest.$ac_objext
- done
- rm -f conftest.$ac_ext conftest.$ac_objext
- CC=$ac_save_CC
-@@ -2009,10 +2081,19 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (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); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-@@ -2045,10 +2126,19 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (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); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-@@ -2062,7 +2152,7 @@
-
- continue
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -2080,10 +2170,19 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (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); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-@@ -2096,7 +2195,7 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- rm -f conftest*
- if test -n "$ac_declaration"; then
-@@ -2110,7 +2209,7 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2358,6 +2457,7 @@
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-@@ -2395,6 +2495,7 @@
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-@@ -2463,6 +2564,7 @@
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-@@ -2500,6 +2602,7 @@
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
-+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-@@ -2580,10 +2683,19 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (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); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-@@ -2597,7 +2709,7 @@
-
- ac_cv_header_stdc=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
- if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -2696,7 +2808,7 @@
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
- fi
-@@ -2781,10 +2893,19 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (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); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-@@ -2798,7 +2919,7 @@
-
- ac_cv_c_const=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6
-@@ -2832,10 +2953,19 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (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); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-@@ -2848,23 +2978,27 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
-
- fi
- echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
- echo "${ECHO_T}$ac_cv_c_inline" >&6
-+
-+
- case $ac_cv_c_inline in
- inline | yes) ;;
-- no)
--cat >>confdefs.h <<\_ACEOF
--#define inline
--_ACEOF
-- ;;
-- *) cat >>confdefs.h <<_ACEOF
--#define inline $ac_cv_c_inline
-+ *)
-+ case $ac_cv_c_inline in
-+ no) ac_val=;;
-+ *) ac_val=$ac_cv_c_inline;;
-+ esac
-+ cat >>confdefs.h <<_ACEOF
-+#ifndef __cplusplus
-+#define inline $ac_val
-+#endif
- _ACEOF
-- ;;
-+ ;;
- esac
-
- echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-@@ -2893,10 +3027,19 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (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); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-@@ -2910,7 +3053,7 @@
-
- ac_cv_header_time=no
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
- echo "${ECHO_T}$ac_cv_header_time" >&6
-@@ -3117,7 +3260,7 @@
- ( exit $ac_status )
- kaversion=""
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
-
-@@ -3142,202 +3285,7 @@
+
+diff -urNad /home/dbharris/source/debian/build/alsa-driver-1.0.2c/configure alsa-driver-1.0.2c/configure
+--- /home/dbharris/source/debian/build/alsa-driver-1.0.2c/configure 2004-02-09 00:14:28.000000000 -0500
++++ alsa-driver-1.0.2c/configure 2004-02-09 00:19:43.000000000 -0500
+@@ -3286,82 +3286,6 @@
echo "$as_me:$LINENO: result: $kaversion" >&5
echo "${ECHO_T}$kaversion" >&6
-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
@@ -560,7 +47,7 @@
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
+-
-#include <stdio.h>
-#include <ctype.h>
-#include "$CONFIG_SND_KERNELDIR/include/linux/compile.h"
@@ -614,797 +101,99 @@
-( exit $ac_status )
-kernel_compiler=""
-fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-
-CFLAGS="$ac_save_CFLAGS"
-my_compiler=`$CROSS_COMPILE$CC --version | head -n 1`
+
+
+
+@@ -6588,73 +6512,6 @@
+
+
+
+-echo "$as_me:$LINENO: checking if tty_struct.count is an atomic_t" >&5
+-echo $ECHO_N "checking if tty_struct.count is an atomic_t... $ECHO_C" >&6
+-tty_count_is_atomic="0"
+-ac_save_CFLAGS="$CFLAGS"
+-CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+-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 <linux/tty.h>
-
+-int
+-main ()
+-{
-
+-struct tty_struct foobar;
+-foobar.count.counter=0;
+-exit(0);
-
-- typevar=kernel_compiler_type
-- versionvar=kernel_compiler_version
-- ac_compiler_type=""
-- ac_compiler_version=""
-- for i in $kernel_compiler; do
-- case $i in
-- gcc-[0-9]*|*-gcc-[0-9]*)
-- if test -z "$ac_compiler_type"; then
-- ac_compiler_type=gcc
-- fi
-- if test -z "$ac_compiler_version"; then
-- ac_compiler_version=`echo $i | sed -e 's/^.*gcc-\(0-9.\+\).*$/\1/'`
-- fi
-- ;;
-- *gcc*)
-- if test -z "$ac_compiler_type"; then
-- ac_compiler_type=gcc
-- fi
-- ;;
-- egcs-*)
-- ac_compiler_type=egcs
-- if test -z "$ac_compiler_version"; then
-- ac_compiler_version=`echo $i | sed -e 's/egcs-\(.\+\)$/\1/'`
-- fi
-- ;;
-- *cc*)
-- if test -z "$ac_compiler_type"; then
-- ac_compiler_type=cc
-- fi
-- ;;
-- [0-9].[0-9]*)
-- if test -z "$ac_compiler_version"; then
-- ac_compiler_version="$i"
-- fi
-- ;;
-- esac
-- done
-- eval $typevar="$ac_compiler_type"
-- eval $versionvar="$ac_compiler_version"
--
--
-- typevar=my_compiler_type
-- versionvar=my_compiler_version
-- ac_compiler_type=""
-- ac_compiler_version=""
-- for i in $my_compiler; do
-- case $i in
-- gcc-[0-9]*|*-gcc-[0-9]*)
-- if test -z "$ac_compiler_type"; then
-- ac_compiler_type=gcc
-- fi
-- if test -z "$ac_compiler_version"; then
-- ac_compiler_version=`echo $i | sed -e 's/^.*gcc-\(0-9.\+\).*$/\1/'`
-- fi
-- ;;
-- *gcc*)
-- if test -z "$ac_compiler_type"; then
-- ac_compiler_type=gcc
-- fi
-- ;;
-- egcs-*)
-- ac_compiler_type=egcs
-- if test -z "$ac_compiler_version"; then
-- ac_compiler_version=`echo $i | sed -e 's/egcs-\(.\+\)$/\1/'`
-- fi
-- ;;
-- *cc*)
-- if test -z "$ac_compiler_type"; then
-- ac_compiler_type=cc
-- fi
-- ;;
-- [0-9].[0-9]*)
-- if test -z "$ac_compiler_version"; then
-- ac_compiler_version="$i"
-- fi
-- ;;
-- esac
-- done
-- eval $typevar="$ac_compiler_type"
-- eval $versionvar="$ac_compiler_version"
--
--if test -z "$my_compiler_type"; then
-- my_compiler_type="gcc"
--fi
--echo "$as_me:$LINENO: result: Kernel compiler: $kernel_compiler Used compiler: $my_compiler" >&5
--echo "${ECHO_T}Kernel compiler: $kernel_compiler Used compiler: $my_compiler" >&6;
--if test -z "$kernel_compiler"; then
-- echo
-- echo "*** NO PREDEFINED KERNEL COMPILER IS DETECTED"
-- echo "*** Assuming the same compiler is used with the current system compiler."
-- echo
-- echo "*** Please make sure that the same compiler version was used for building kernel."
-- echo
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (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); }; } &&
+- { 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;tty_count_is_atomic="1"
-else
--if test "$my_compiler_type" != "$kernel_compiler_type"; then
-- echo "Fatal error: Compiler type does not match"
-- echo "Decoded kernel compiler: type=$kernel_compiler_type version=$kernel_compiler_version"
-- echo "Decoded used compiler: type=$my_compiler_type version=$my_compiler_version"
-- echo "Please, send ./configure output to <alsa-devel@alsa-project.org>"
-- exit 1
--fi
--if test "$my_compiler_type" = "gcc" ; then
-- kernel_major=`echo $kernel_compiler_version | cut -d '.' -f 1`
-- my_major=`echo $kernel_compiler_version | cut -d '.' -f 1`
-- if test $kernel_major -eq 2 -a $my_major -eq 3 ; then
-- echo "Fatal error: Kernel is compiled with GCC 2.x and you are trying to use GCC 3.x."
-- echo " These two version of GCC are incompatible for binary code."
-- exit 1
-- fi
-- if test $kernel_major -eq 3 -a $my_major -eq 2 ; then
-- echo "Fatal error: Kernel is compiled with GCC 3.x and you are trying to use GCC 2.x."
-- echo " These two version of GCC are incompatible for binary code."
-- exit 1
-- fi
+- 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;tty_count_is_atomic="0"
-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-CFLAGS=$ac_save_CFLAGS
+-CONFIG_TTY_COUNT_ATOMIC=$tty_count_is_atomic
+-if test "$CONFIG_TTY_COUNT_ATOMIC" = "1"; then
+- cat >>confdefs.h <<\_ACEOF
+-#define CONFIG_TTY_COUNT_ATOMIC 1
+-_ACEOF
+-
-fi
-
-
-
-@@ -3401,7 +3349,7 @@
- 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
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- CFLAGS="$ac_save_CFLAGS"
- eval $boolvar="$boolchk"
-@@ -3462,7 +3410,7 @@
- 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
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- CFLAGS="$ac_save_CFLAGS"
- eval $boolvar="$boolchk"
-@@ -3546,7 +3494,7 @@
- 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
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- CFLAGS="$ac_save_CFLAGS"
- eval $boolvar="$boolchk"
-@@ -4122,7 +4070,7 @@
- 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
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- CFLAGS="$ac_save_CFLAGS"
- eval $boolvar="$boolchk"
-@@ -4182,7 +4130,7 @@
- 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
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- CFLAGS="$ac_save_CFLAGS"
- eval $boolvar="$boolchk"
-@@ -4385,7 +4333,7 @@
- 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
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- CFLAGS="$ac_save_CFLAGS"
- eval $boolvar="$boolchk"
-@@ -4519,7 +4467,7 @@
- echo "$as_me:$LINENO: result: \"unknown\"" >&5
- echo "${ECHO_T}\"unknown\"" >&6;processor=""
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- CFLAGS="$ac_save_CFLAGS"
- rm -f processor.id
-@@ -4782,7 +4730,7 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- CFLAGS="$ac_save_CFLAGS"
- rm -f machine.id
-@@ -4864,7 +4812,7 @@
- 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
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- CFLAGS="$ac_save_CFLAGS"
- eval $boolvar="$boolchk"
-@@ -4964,7 +4912,7 @@
- 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
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- CFLAGS="$ac_save_CFLAGS"
- eval $boolvar="$boolchk"
-@@ -5021,7 +4969,7 @@
- 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
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- CFLAGS="$ac_save_CFLAGS"
- eval $boolvar="$boolchk"
-@@ -5107,10 +5055,19 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (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); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-@@ -5126,7 +5083,7 @@
- echo "$as_me:$LINENO: result: \"no\"" >&5
- echo "${ECHO_T}\"no\"" >&6;strlcpy="0"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ac_save_CFLAGS
- CONFIG_HAVE_STRLCPY=$strlcpy
- if test "$CONFIG_HAVE_STRLCPY" = "1"; then
-@@ -5165,10 +5122,19 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (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); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-@@ -5184,7 +5150,7 @@
- echo "$as_me:$LINENO: result: \"no\"" >&5
- echo "${ECHO_T}\"no\"" >&6;snprintf="0"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ac_save_CFLAGS
- CONFIG_HAVE_SNPRINTF=$snprintf
- if test "$CONFIG_HAVE_SNPRINTF" = "1"; then
-@@ -5224,10 +5190,19 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (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); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-@@ -5243,7 +5218,7 @@
- echo "$as_me:$LINENO: result: \"no\"" >&5
- echo "${ECHO_T}\"no\"" >&6;vmalloc_to_page="0"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ac_save_CFLAGS
- CONFIG_HAVE_VMALLOC_TO_PAGE=$vmalloc_to_page
- if test "$CONFIG_HAVE_VMALLOC_TO_PAGE" = "1"; then
-@@ -5281,10 +5256,19 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (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); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-@@ -5300,7 +5284,7 @@
- echo "$as_me:$LINENO: result: \"yes\"" >&5
- echo "${ECHO_T}\"yes\"" >&6;old_kmod="1"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ac_save_CFLAGS
- CONFIG_HAVE_OLD_REQUEST_MODULE=$old_kmod
- if test "$CONFIG_HAVE_OLD_REQUEST_MODULE" = "1"; then
-@@ -5340,10 +5324,19 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (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); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-@@ -5359,7 +5352,7 @@
- echo "$as_me:$LINENO: result: \"no\"" >&5
- echo "${ECHO_T}\"no\"" >&6;pde_defined="0"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ac_save_CFLAGS
- CONFIG_HAVE_PDE=$pde_defined
- if test "$CONFIG_HAVE_PDE" = "1"; then
-@@ -5398,10 +5391,19 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (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); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-@@ -5417,7 +5419,7 @@
- echo "$as_me:$LINENO: result: \"no\"" >&5
- echo "${ECHO_T}\"no\"" >&6;pci_consistent_defined="0"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ac_save_CFLAGS
- CONFIG_HAVE_PCI_CONSISTENT_DMA_MASK=$pci_consistent_defined
- if test "$CONFIG_HAVE_PCI_CONSISTENT_DMA_MASK" = "1"; then
-@@ -5456,10 +5458,19 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (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); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-@@ -5475,7 +5486,7 @@
- echo "$as_me:$LINENO: result: \"no\"" >&5
- echo "${ECHO_T}\"no\"" >&6;tty_count_atomic="0"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ac_save_CFLAGS
- CONFIG_HAVE_TTY_COUNT_ATOMIC=$tty_count_atomic
- if test "$CONFIG_HAVE_TTY_COUNT_ATOMIC" = "1"; then
-@@ -5520,10 +5531,19 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (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); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-@@ -5539,7 +5559,7 @@
- echo "$as_me:$LINENO: result: \"no\"" >&5
- echo "${ECHO_T}\"no\"" >&6;oldkfasync="0"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ac_save_CFLAGS
- CONFIG_OLD_KILL_FASYNC=$oldkfasync
- if test "$CONFIG_OLD_KILL_FASYNC" = "1"; then
-@@ -5577,10 +5597,19 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (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); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-@@ -5596,7 +5625,7 @@
- echo "$as_me:$LINENO: result: \"no\"" >&5
- echo "${ECHO_T}\"no\"" >&6;dma_addr_t="0"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ac_save_CFLAGS
- CONFIG_HAVE_DMA_ADDR_T=$dma_addr_t
- if test "$CONFIG_HAVE_DMA_ADDR_T" = "1"; then
-@@ -5637,10 +5666,19 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+ (eval $ac_compile) 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (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); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-@@ -5656,7 +5694,7 @@
- echo "$as_me:$LINENO: result: \"no\"" >&5
- echo "${ECHO_T}\"no\"" >&6;have_mutex_macros="0"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ac_save_CFLAGS
- CONFIG_HAVE_MUTEX_MACROS=$have_mutex_macros
- if test "$CONFIG_HAVE_MUTEX_MACROS" = "1"; then
-@@ -5841,7 +5879,7 @@
- echo "$as_me:$LINENO: result: \"no\"" >&5
- echo "${ECHO_T}\"no\"" >&6;rtcsup=""
- fi
--rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- CFLAGS="$ac_save_CFLAGS"
- CONFIG_SND_RTCTIMER=$rtcsup
-@@ -5904,7 +5942,7 @@
- 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
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- CFLAGS="$ac_save_CFLAGS"
- eval $boolvar="$boolchk"
-@@ -5961,7 +5999,7 @@
- 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
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- CFLAGS="$ac_save_CFLAGS"
- eval $boolvar="$boolchk"
-@@ -6040,7 +6078,7 @@
- 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
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- CFLAGS="$ac_save_CFLAGS"
- eval $boolvar="$boolchk"
-@@ -6097,7 +6135,7 @@
- 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
-+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- CFLAGS="$ac_save_CFLAGS"
- eval $boolvar="$boolchk"
-@@ -6174,13 +6212,80 @@
- 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
-+rm -f 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 if tty_struct.count is an atomic_t" >&5
-+echo $ECHO_N "checking if tty_struct.count is an atomic_t... $ECHO_C" >&6
-+tty_count_is_atomic="0"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
-+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 <linux/tty.h>
-+
-+int
-+main ()
-+{
-+
-+struct tty_struct foobar;
-+foobar.count.counter=0;
-+exit(0);
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (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); }; } &&
-+ { 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;tty_count_is_atomic="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;tty_count_is_atomic="0"
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+CFLAGS=$ac_save_CFLAGS
-+CONFIG_TTY_COUNT_ATOMIC=$tty_count_is_atomic
-+if test "$CONFIG_TTY_COUNT_ATOMIC" = "1"; then
-+ cat >>confdefs.h <<\_ACEOF
-+#define CONFIG_TTY_COUNT_ATOMIC 1
-+_ACEOF
-+
-+fi
-+
+-
CONFIG_SND_DUMMY=""
CONFIG_SND_VIRMIDI=""
-@@ -7555,9 +7660,10 @@
- elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
- fi
-+DUALCASE=1; export DUALCASE # for MKS sh
-
- # Support unset when possible.
--if (as_foo=foo; unset as_foo) >/dev/null 2>&1; then
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
- else
- as_unset=false
-@@ -7755,16 +7861,17 @@
- if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
- else
-+ test -d ./-p && rmdir ./-p
- as_mkdir_p=false
- fi
-
- as_executable_p="test -f"
-
- # Sed expression to map a string onto a valid CPP name.
--as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
- # Sed expression to map a string onto a valid variable name.
--as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
- # IFS
-@@ -7791,7 +7898,7 @@
- cat >&5 <<_CSEOF
-
- This file was extended by $as_me, which was
--generated by GNU Autoconf 2.57a. Invocation command line was
-+generated by GNU Autoconf 2.59. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -7851,7 +7958,7 @@
- cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
- config.status
--configured by $0, generated by GNU Autoconf 2.57a,
-+configured by $0, generated by GNU Autoconf 2.59,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
- Copyright (C) 2003 Free Software Foundation, Inc.
-@@ -8306,12 +8413,45 @@
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
- esac
--# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
--# absolute.
--ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
--ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
--ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
--ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-+
-+# Do not use `cd foo && pwd` to compute absolute paths, because
-+# the directories may not exist.
-+case `pwd` in
-+.) ac_abs_builddir="$ac_dir";;
-+*)
-+ case "$ac_dir" in
-+ .) ac_abs_builddir=`pwd`;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_builddir=${ac_top_builddir}.;;
-+*)
-+ case ${ac_top_builddir}. in
-+ .) ac_abs_top_builddir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_srcdir=$ac_srcdir;;
-+*)
-+ case $ac_srcdir in
-+ .) ac_abs_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+ esac;;
-+esac
-+case $ac_abs_builddir in
-+.) ac_abs_top_srcdir=$ac_top_srcdir;;
-+*)
-+ case $ac_top_srcdir in
-+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+ esac;;
-+esac
-
-
- case $INSTALL in
-@@ -8319,11 +8459,6 @@
- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
- esac
-
-- if test x"$ac_file" != x-; then
-- { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
-- rm -f "$ac_file"
-- fi
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
-@@ -8362,6 +8497,12 @@
- fi;;
- esac
- done` || { (exit 1); exit 1; }
-+
-+ if test x"$ac_file" != x-; then
-+ { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+ rm -f "$ac_file"
-+ fi
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
---- alsa-driver/configure.in~ 2004-01-09 20:24:51.000000000 +1100
-+++ alsa-driver/configure.in 2004-01-09 20:26:53.000000000 +1100
-@@ -151,47 +151,47 @@
+diff -urNad /home/dbharris/source/debian/build/alsa-driver-1.0.2c/configure.in alsa-driver-1.0.2c/configure.in
+--- /home/dbharris/source/debian/build/alsa-driver-1.0.2c/configure.in 2004-02-09 00:14:50.000000000 -0500
++++ alsa-driver-1.0.2c/configure.in 2004-02-09 00:19:40.000000000 -0500
+@@ -152,47 +152,47 @@
AC_MSG_RESULT($kaversion)
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>
@@ -1445,7 +234,7 @@
-my_compiler=`$CROSS_COMPILE$CC --version | head -n 1`
+dnl AC_MSG_CHECKING(for GCC version)
+dnl ac_save_CFLAGS="$CFLAGS"
-+dnl CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
++dnl CFLAGS="$CFLAGS $KERNEL_INC"
+dnl AC_CACHE_VAL(kernel_gcc,
+dnl [AC_TRY_RUN([
+dnl #include <stdio.h>
@@ -1487,166 +276,3 @@
dnl
dnl Test section, uncomment any of these double lines to verify the bellow code:
dnl
-@@ -211,84 +211,84 @@
- dnl my_compiler="2.95.3"
- dnl
-
--AC_DEFUN(CHECK_COMPILER, [
-- typevar=$2
-- versionvar=$3
-- ac_compiler_type=""
-- ac_compiler_version=""
-- for i in $1; do
-- case $i in
-- gcc-[[0-9]]*|*-gcc-[[0-9]]*)
-- if test -z "$ac_compiler_type"; then
-- ac_compiler_type=gcc
-- fi
-- if test -z "$ac_compiler_version"; then
-- ac_compiler_version=`echo $i | sed -e 's/^.*gcc-\([0-9.]\+\).*$/\1/'`
-- fi
-- ;;
-- *gcc*)
-- if test -z "$ac_compiler_type"; then
-- ac_compiler_type=gcc
-- fi
-- ;;
-- egcs-*)
-- ac_compiler_type=egcs
-- if test -z "$ac_compiler_version"; then
-- ac_compiler_version=`echo $i | sed -e 's/egcs-\(.\+\)$/\1/'`
-- fi
-- ;;
-- *cc*)
-- if test -z "$ac_compiler_type"; then
-- ac_compiler_type=cc
-- fi
-- ;;
-- [[0-9]].[[0-9]]*)
-- if test -z "$ac_compiler_version"; then
-- ac_compiler_version="$i"
-- fi
-- ;;
-- esac
-- done
-- eval $typevar="$ac_compiler_type"
-- eval $versionvar="$ac_compiler_version"
--])
--
--CHECK_COMPILER($kernel_compiler, kernel_compiler_type, kernel_compiler_version)
--CHECK_COMPILER($my_compiler, my_compiler_type, my_compiler_version)
--if test -z "$my_compiler_type"; then
-- my_compiler_type="gcc"
--fi
--AC_MSG_RESULT(Kernel compiler: $kernel_compiler Used compiler: $my_compiler);
--if test -z "$kernel_compiler"; then
-- echo
-- echo "*** NO PREDEFINED KERNEL COMPILER IS DETECTED"
-- echo "*** Assuming the same compiler is used with the current system compiler."
-- echo
-- echo "*** Please make sure that the same compiler version was used for building kernel."
-- echo
--else
--if test "$my_compiler_type" != "$kernel_compiler_type"; then
-- echo "Fatal error: Compiler type does not match"
-- echo "Decoded kernel compiler: type=$kernel_compiler_type version=$kernel_compiler_version"
-- echo "Decoded used compiler: type=$my_compiler_type version=$my_compiler_version"
-- echo "Please, send ./configure output to <alsa-devel@alsa-project.org>"
-- exit 1
--fi
--if test "$my_compiler_type" = "gcc" ; then
-- kernel_major=`echo $kernel_compiler_version | cut -d '.' -f 1`
-- my_major=`echo $kernel_compiler_version | cut -d '.' -f 1`
-- if test $kernel_major -eq 2 -a $my_major -eq 3 ; then
-- echo "Fatal error: Kernel is compiled with GCC 2.x and you are trying to use GCC 3.x."
-- echo " These two version of GCC are incompatible for binary code."
-- exit 1
-- fi
-- if test $kernel_major -eq 3 -a $my_major -eq 2 ; then
-- echo "Fatal error: Kernel is compiled with GCC 3.x and you are trying to use GCC 2.x."
-- echo " These two version of GCC are incompatible for binary code."
-- exit 1
-- fi
--fi
--fi
-+dnl AC_DEFUN(CHECK_COMPILER, [
-+dnl typevar=$2
-+dnl versionvar=$3
-+dnl ac_compiler_type=""
-+dnl ac_compiler_version=""
-+dnl for i in $1; do
-+dnl case $i in
-+dnl gcc-[[0-9]]*|*-gcc-[[0-9]]*)
-+dnl if test -z "$ac_compiler_type"; then
-+dnl ac_compiler_type=gcc
-+dnl fi
-+dnl if test -z "$ac_compiler_version"; then
-+dnl ac_compiler_version=`echo $i | sed -e 's/^.*gcc-\([0-9.]\+\).*$/\1/'`
-+dnl fi
-+dnl ;;
-+dnl *gcc*)
-+dnl if test -z "$ac_compiler_type"; then
-+dnl ac_compiler_type=gcc
-+dnl fi
-+dnl ;;
-+dnl egcs-*)
-+dnl ac_compiler_type=egcs
-+dnl if test -z "$ac_compiler_version"; then
-+dnl ac_compiler_version=`echo $i | sed -e 's/egcs-\(.\+\)$/\1/'`
-+dnl fi
-+dnl ;;
-+dnl *cc*)
-+dnl if test -z "$ac_compiler_type"; then
-+dnl ac_compiler_type=cc
-+dnl fi
-+dnl ;;
-+dnl [[0-9]].[[0-9]]*)
-+dnl if test -z "$ac_compiler_version"; then
-+dnl ac_compiler_version="$i"
-+dnl fi
-+dnl ;;
-+dnl esac
-+dnl done
-+dnl eval $typevar="$ac_compiler_type"
-+dnl eval $versionvar="$ac_compiler_version"
-+dnl ])
-+dnl
-+dnl CHECK_COMPILER($kernel_compiler, kernel_compiler_type, kernel_compiler_version)
-+dnl CHECK_COMPILER($my_compiler, my_compiler_type, my_compiler_version)
-+dnl if test -z "$my_compiler_type"; then
-+dnl my_compiler_type="gcc"
-+dnl fi
-+dnl AC_MSG_RESULT(Kernel compiler: $kernel_compiler Used compiler: $my_compiler);
-+dnl if test -z "$kernel_compiler"; then
-+dnl echo
-+dnl echo "*** NO PREDEFINED KERNEL COMPILER IS DETECTED"
-+dnl echo "*** Assuming the same compiler is used with the current system compiler."
-+dnl echo
-+dnl echo "*** Please make sure that the same compiler version was used for building kernel."
-+dnl echo
-+dnl else
-+dnl if test "$my_compiler_type" != "$kernel_compiler_type"; then
-+dnl echo "Fatal error: Compiler type does not match"
-+dnl echo "Decoded kernel compiler: type=$kernel_compiler_type version=$kernel_compiler_version"
-+dnl echo "Decoded used compiler: type=$my_compiler_type version=$my_compiler_version"
-+dnl echo "Please, send ./configure output to <alsa-devel@alsa-project.org>"
-+dnl exit 1
-+dnl fi
-+dnl if test "$my_compiler_type" = "gcc" ; then
-+dnl kernel_major=`echo $kernel_compiler_version | cut -d '.' -f 1`
-+dnl my_major=`echo $kernel_compiler_version | cut -d '.' -f 1`
-+dnl if test $kernel_major -eq 2 -a $my_major -eq 3 ; then
-+dnl echo "Fatal error: Kernel is compiled with GCC 2.x and you are trying to use GCC 3.x."
-+dnl echo " These two version of GCC are incompatible for binary code."
-+dnl exit 1
-+dnl fi
-+dnl if test $kernel_major -eq 3 -a $my_major -eq 2 ; then
-+dnl echo "Fatal error: Kernel is compiled with GCC 3.x and you are trying to use GCC 2.x."
-+dnl echo " These two version of GCC are incompatible for binary code."
-+dnl exit 1
-+dnl fi
-+dnl fi
-+dnl fi
- dnl compiler version check
-
- AC_DEFUN(CHECK_KERNEL_HEADER, [