[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-driver/debian (3 files)
David B Harris
dbharris-guest@quantz.debian.org
Mon, 01 Mar 2004 01:20:14 +0100
Date: Monday, March 1, 2004 @ 01:20:14
Author: dbharris-guest
Path: /cvsroot/pkg-alsa/debian/alsa-driver/debian
Modified: changelog patches/10_disable_gcc_version_check1.dpatch
patches/10_disable_gcc_version_check2.dpatch
Sync with new upstream release
----------------------------------------------+
changelog | 2
patches/10_disable_gcc_version_check1.dpatch | 13 -
patches/10_disable_gcc_version_check2.dpatch | 322 +++++++++++++++++++++----
3 files changed, 280 insertions(+), 57 deletions(-)
Index: debian/alsa-driver/debian/changelog
diff -u debian/alsa-driver/debian/changelog:1.223 debian/alsa-driver/debian/changelog:1.224
--- debian/alsa-driver/debian/changelog:1.223 Mon Mar 1 01:13:51 2004
+++ debian/alsa-driver/debian/changelog Mon Mar 1 01:20:13 2004
@@ -39,6 +39,8 @@
+ debian/alsa-source.README.Debian: Update
- debian/alsa-common.templates: Remove extraneous "," which would cause
'harmony (PCI: Harmony/Vivace sound chip)' to show up as two options.
+ - debian/patches/10_disable_gcc_version_check{1,2}.dpatch: Sync with new
+ upstream release
* Unreleased.
-- David B. Harris <dbharris@debian.org> Sat, 28 Feb 2004 12:49:38 -0500
Index: debian/alsa-driver/debian/patches/10_disable_gcc_version_check1.dpatch
diff -u debian/alsa-driver/debian/patches/10_disable_gcc_version_check1.dpatch:1.2 debian/alsa-driver/debian/patches/10_disable_gcc_version_check1.dpatch:1.3
--- debian/alsa-driver/debian/patches/10_disable_gcc_version_check1.dpatch:1.2 Mon Feb 23 00:20:13 2004
+++ debian/alsa-driver/debian/patches/10_disable_gcc_version_check1.dpatch Mon Mar 1 01:20:14 2004
@@ -25,16 +25,17 @@
exit 0
@DPATCH@
-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-22 18:10:45.000000000 -0500
-+++ alsa-driver-1.0.2c/configure.in 2004-02-22 18:11:21.000000000 -0500
-@@ -152,47 +152,47 @@
+diff -urNad /home/dbharris/source/debian/alsa-driver/configure.in alsa-driver/configure.in
+--- /home/dbharris/source/debian/alsa-driver/configure.in 2004-02-29 19:13:00.000000000 -0500
++++ alsa-driver/configure.in 2004-02-29 19:17:29.000000000 -0500
+@@ -152,48 +152,48 @@
+ AC_SUBST(kextraversion)
AC_MSG_RESULT($kaversion)
- dnl Check for GCC version...
+-dnl Check for GCC version...
-AC_MSG_CHECKING(for GCC version)
-ac_save_CFLAGS="$CFLAGS"
--CFLAGS="$CFLAGS $KERNEL_INC"
+-CFLAGS="$CFLAGS $KERNEL_INC $HACK_KERNEL_INC"
-AC_CACHE_VAL(kernel_gcc,
-[AC_TRY_RUN([
-#include <stdio.h>
@@ -73,9 +74,10 @@
-kernel_compiler="")])
-CFLAGS="$ac_save_CFLAGS"
-my_compiler=`$CROSS_COMPILE$CC --version | head -n 1`
++dnl dnl Check for GCC version...
+dnl AC_MSG_CHECKING(for GCC version)
+dnl ac_save_CFLAGS="$CFLAGS"
-+dnl CFLAGS="$CFLAGS $KERNEL_INC"
++dnl CFLAGS="$CFLAGS $KERNEL_INC $HACK_KERNEL_INC"
+dnl AC_CACHE_VAL(kernel_gcc,
+dnl [AC_TRY_RUN([
+dnl #include <stdio.h>
@@ -117,7 +119,7 @@
dnl
dnl Test section, uncomment any of these double lines to verify the bellow code:
dnl
-@@ -211,85 +211,85 @@
+@@ -212,85 +212,85 @@
dnl kernel_compiler="gcc 2.95.3 20010315 (release)"
dnl my_compiler="2.95.3"
dnl
Index: debian/alsa-driver/debian/patches/10_disable_gcc_version_check2.dpatch
diff -u debian/alsa-driver/debian/patches/10_disable_gcc_version_check2.dpatch:1.3 debian/alsa-driver/debian/patches/10_disable_gcc_version_check2.dpatch:1.4
--- debian/alsa-driver/debian/patches/10_disable_gcc_version_check2.dpatch:1.3 Thu Feb 26 04:37:04 2004
+++ debian/alsa-driver/debian/patches/10_disable_gcc_version_check2.dpatch Mon Mar 1 01:20:14 2004
@@ -25,9 +25,9 @@
exit 0
@DPATCH@
-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-22 18:10:44.000000000 -0500
-+++ alsa-driver-1.0.2c/configure 2004-02-22 18:11:49.000000000 -0500
+diff -urNad /home/dbharris/source/debian/alsa-driver/configure alsa-driver/configure
+--- /home/dbharris/source/debian/alsa-driver/configure 2004-02-29 19:18:14.000000000 -0500
++++ alsa-driver/configure 2004-02-29 19:18:25.000000000 -0500
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -533,7 +533,7 @@
fi
echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
echo "${ECHO_T}$ac_cv_header_time" >&6
-@@ -3118,7 +3261,7 @@
+@@ -3119,7 +3262,7 @@
( exit $ac_status )
kaversion=""
fi
@@ -542,14 +542,214 @@
fi
fi
-@@ -3143,202 +3286,6 @@
+@@ -3140,402 +3283,10 @@
+
+
+
+-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 $KERNEL_INC"
+-if test "${kernel_gcc+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test "$cross_compiling" = yes; then
+- kernel_compiler=""
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-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"
+-int main()
+-{
+- FILE *f;
+- char compiler[128];
+- char *ptr, *dptr;
+-#ifdef LINUX_COMPILER
+- f=fopen("./conftestdata","w");
+- if (f) {
+- for (ptr = LINUX_COMPILER, dptr = compiler; *ptr != '\0' && *ptr != ' ' && *ptr != '\t'; ptr++, dptr++)
+- *dptr = *ptr;
+- if (*ptr != '\0' && (*ptr == ' ' || *ptr == '\t'))
+- ptr++;
+- if (!strncmp(ptr, "version", 7))
+- ptr += 7;
+- if (*ptr != '\0' && (*ptr == ' ' || *ptr == '\t'))
+- ptr++;
+- *dptr++ = ' ';
+- for (; *ptr != '\0' && *ptr != '\n'; ptr++, dptr++)
+- *dptr = *ptr;
+- *dptr = '\t';
+- *dptr = '\0';
+- fprintf(f,"%s\n",compiler);
+- fclose(f);
+- }
+- exit(0);
+-#else
+- exit(1);
+-#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
+- kernel_compiler=`cat conftestdata`
+-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 )
+-kernel_compiler=""
+-fi
+-rm -f core 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`
+-
+-
+-
+-
+- 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
+-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
+
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 $KERNEL_INC"
+-CFLAGS="$CFLAGS $KERNEL_INC $HACK_KERNEL_INC"
-if test "${kernel_gcc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
@@ -745,7 +945,7 @@
-@@ -3406,7 +3353,7 @@
+@@ -3603,7 +3354,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -754,7 +954,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -3468,7 +3415,7 @@
+@@ -3665,7 +3416,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -763,7 +963,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -3553,7 +3500,7 @@
+@@ -3750,7 +3501,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -772,7 +972,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -4156,7 +4103,7 @@
+@@ -4353,7 +4104,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -781,7 +981,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -4217,7 +4164,7 @@
+@@ -4414,7 +4165,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -790,7 +990,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -4421,7 +4368,7 @@
+@@ -4618,7 +4369,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -799,7 +999,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -4555,7 +4502,7 @@
+@@ -4752,7 +4503,7 @@
echo "$as_me:$LINENO: result: \"unknown\"" >&5
echo "${ECHO_T}\"unknown\"" >&6;processor=""
fi
@@ -808,7 +1008,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
rm -f processor.id
-@@ -4818,7 +4765,7 @@
+@@ -5024,7 +4775,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -817,7 +1017,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
rm -f machine.id
-@@ -4901,7 +4848,7 @@
+@@ -5107,7 +4858,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -826,7 +1026,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -4967,7 +4914,7 @@
+@@ -5173,7 +4924,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -835,7 +1035,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -5061,7 +5008,7 @@
+@@ -5267,7 +5018,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -844,7 +1044,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -5119,7 +5066,7 @@
+@@ -5325,7 +5076,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -853,7 +1053,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -5207,10 +5154,19 @@
+@@ -5413,10 +5164,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -874,7 +1074,7 @@
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
-@@ -5226,7 +5182,7 @@
+@@ -5432,7 +5192,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;strlcpy="0"
fi
@@ -883,7 +1083,7 @@
CFLAGS=$ac_save_CFLAGS
CONFIG_HAVE_STRLCPY=$strlcpy
if test "$CONFIG_HAVE_STRLCPY" = "1"; then
-@@ -5265,10 +5221,19 @@
+@@ -5471,10 +5231,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -904,7 +1104,7 @@
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
-@@ -5284,7 +5249,7 @@
+@@ -5490,7 +5259,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;snprintf="0"
fi
@@ -913,7 +1113,37 @@
CFLAGS=$ac_save_CFLAGS
CONFIG_HAVE_SNPRINTF=$snprintf
if test "$CONFIG_HAVE_SNPRINTF" = "1"; then
-@@ -5324,10 +5289,19 @@
+@@ -5529,10 +5298,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
+@@ -5548,7 +5326,7 @@
+ echo "$as_me:$LINENO: result: \"no\"" >&5
+ echo "${ECHO_T}\"no\"" >&6;scnprintf="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_SCNPRINTF=$scnprintf
+ if test "$CONFIG_HAVE_SCNPRINTF" = "1"; then
+@@ -5588,10 +5366,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -934,7 +1164,7 @@
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
-@@ -5343,7 +5317,7 @@
+@@ -5607,7 +5394,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;vmalloc_to_page="0"
fi
@@ -943,7 +1173,7 @@
CFLAGS=$ac_save_CFLAGS
CONFIG_HAVE_VMALLOC_TO_PAGE=$vmalloc_to_page
if test "$CONFIG_HAVE_VMALLOC_TO_PAGE" = "1"; then
-@@ -5381,10 +5355,19 @@
+@@ -5645,10 +5432,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -964,7 +1194,7 @@
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
-@@ -5400,7 +5383,7 @@
+@@ -5664,7 +5460,7 @@
echo "$as_me:$LINENO: result: \"yes\"" >&5
echo "${ECHO_T}\"yes\"" >&6;old_kmod="1"
fi
@@ -973,7 +1203,7 @@
CFLAGS=$ac_save_CFLAGS
CONFIG_HAVE_OLD_REQUEST_MODULE=$old_kmod
if test "$CONFIG_HAVE_OLD_REQUEST_MODULE" = "1"; then
-@@ -5440,10 +5423,19 @@
+@@ -5704,10 +5500,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -994,7 +1224,7 @@
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
-@@ -5459,7 +5451,7 @@
+@@ -5723,7 +5528,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;pde_defined="0"
fi
@@ -1003,7 +1233,7 @@
CFLAGS=$ac_save_CFLAGS
CONFIG_HAVE_PDE=$pde_defined
if test "$CONFIG_HAVE_PDE" = "1"; then
-@@ -5498,10 +5490,19 @@
+@@ -5762,10 +5567,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -1024,7 +1254,7 @@
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
-@@ -5517,7 +5518,7 @@
+@@ -5781,7 +5595,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;pci_consistent_defined="0"
fi
@@ -1033,7 +1263,7 @@
CFLAGS=$ac_save_CFLAGS
CONFIG_HAVE_PCI_CONSISTENT_DMA_MASK=$pci_consistent_defined
if test "$CONFIG_HAVE_PCI_CONSISTENT_DMA_MASK" = "1"; then
-@@ -5556,10 +5557,19 @@
+@@ -5820,10 +5634,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -1054,7 +1284,7 @@
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
-@@ -5575,7 +5585,7 @@
+@@ -5839,7 +5662,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;tty_count_atomic="0"
fi
@@ -1063,7 +1293,7 @@
CFLAGS=$ac_save_CFLAGS
CONFIG_HAVE_TTY_COUNT_ATOMIC=$tty_count_atomic
if test "$CONFIG_HAVE_TTY_COUNT_ATOMIC" = "1"; then
-@@ -5615,10 +5625,19 @@
+@@ -5879,10 +5702,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -1084,7 +1314,7 @@
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
-@@ -5634,7 +5653,7 @@
+@@ -5898,7 +5730,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;video_get_drvdata="0"
fi
@@ -1093,7 +1323,7 @@
CFLAGS=$ac_save_CFLAGS
CONFIG_HAVE_VIDEO_GET_DRVDATA=$video_get_drvdata
if test "$CONFIG_HAVE_VIDEO_GET_DRVDATA" = "1"; then
-@@ -5680,10 +5699,19 @@
+@@ -5944,10 +5776,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -1114,7 +1344,7 @@
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
-@@ -5699,7 +5727,7 @@
+@@ -5963,7 +5804,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;oldkfasync="0"
fi
@@ -1123,7 +1353,7 @@
CFLAGS=$ac_save_CFLAGS
CONFIG_OLD_KILL_FASYNC=$oldkfasync
if test "$CONFIG_OLD_KILL_FASYNC" = "1"; then
-@@ -5737,10 +5765,19 @@
+@@ -6001,10 +5842,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -1144,7 +1374,7 @@
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
-@@ -5756,7 +5793,7 @@
+@@ -6020,7 +5870,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;dma_addr_t="0"
fi
@@ -1153,7 +1383,7 @@
CFLAGS=$ac_save_CFLAGS
CONFIG_HAVE_DMA_ADDR_T=$dma_addr_t
if test "$CONFIG_HAVE_DMA_ADDR_T" = "1"; then
-@@ -5797,10 +5834,19 @@
+@@ -6061,10 +5911,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -1174,7 +1404,7 @@
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
-@@ -5816,7 +5862,7 @@
+@@ -6080,7 +5939,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;have_mutex_macros="0"
fi
@@ -1183,7 +1413,7 @@
CFLAGS=$ac_save_CFLAGS
CONFIG_HAVE_MUTEX_MACROS=$have_mutex_macros
if test "$CONFIG_HAVE_MUTEX_MACROS" = "1"; then
-@@ -6001,7 +6047,7 @@
+@@ -6265,7 +6124,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;rtcsup=""
fi
@@ -1192,7 +1422,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
CONFIG_SND_RTCTIMER=$rtcsup
-@@ -6065,7 +6111,7 @@
+@@ -6329,7 +6188,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -1201,7 +1431,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -6123,7 +6169,7 @@
+@@ -6387,7 +6246,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -1210,7 +1440,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -6203,7 +6249,7 @@
+@@ -6467,7 +6326,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -1219,7 +1449,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -6261,7 +6307,7 @@
+@@ -6525,7 +6384,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -1228,7 +1458,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -6339,7 +6385,7 @@
+@@ -6603,7 +6462,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -1237,7 +1467,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -7753,9 +7799,10 @@
+@@ -8033,9 +7892,10 @@
elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
set -o posix
fi
@@ -1249,7 +1479,7 @@
as_unset=unset
else
as_unset=false
-@@ -7953,16 +8000,17 @@
+@@ -8233,16 +8093,17 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
else
@@ -1269,7 +1499,7 @@
# IFS
-@@ -7989,7 +8037,7 @@
+@@ -8269,7 +8130,7 @@
cat >&5 <<_CSEOF
This file was extended by $as_me, which was
@@ -1278,7 +1508,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -8049,7 +8097,7 @@
+@@ -8329,7 +8190,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
config.status
@@ -1287,7 +1517,7 @@
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2003 Free Software Foundation, Inc.
-@@ -8508,12 +8556,45 @@
+@@ -8789,12 +8650,45 @@
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=$ac_top_builddir$srcdir ;;
esac
@@ -1339,7 +1569,7 @@
case $INSTALL in
-@@ -8521,11 +8602,6 @@
+@@ -8802,11 +8696,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -1351,7 +1581,7 @@
# 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. */
-@@ -8564,6 +8640,12 @@
+@@ -8845,6 +8734,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }