[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-driver/debian (3 files)
David B Harris
dbharris-guest@quantz.debian.org
Mon, 23 Feb 2004 00:20:13 +0100
Date: Monday, February 23, 2004 @ 00:20:13
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
Re-disable the GCC version-check warning message, as we already check for
this in debian/rules. I believe it got lost in the 1.0.2c-1 upload. It's
just a cosmetic thing, as the logic to actually do the version-check
was still disabled. (Closes: #234225)
----------------------------------------------+
changelog | 5
patches/10_disable_gcc_version_check1.dpatch | 89 +++++++++-
patches/10_disable_gcc_version_check2.dpatch | 218 +++++++++++++++++++------
3 files changed, 261 insertions(+), 51 deletions(-)
Index: debian/alsa-driver/debian/changelog
diff -u debian/alsa-driver/debian/changelog:1.206 debian/alsa-driver/debian/changelog:1.207
--- debian/alsa-driver/debian/changelog:1.206 Mon Feb 16 14:19:11 2004
+++ debian/alsa-driver/debian/changelog Mon Feb 23 00:20:13 2004
@@ -3,6 +3,11 @@
* Jordi Mallach:
- debian/control, debian/alsa-source.control: sync descriptions with
alsa-lib's.
+ * David B Harris:
+ - Re-disable the GCC version-check warning message, as we already check
+ for this in debian/rules. I believe it got lost in the 1.0.2c-1 upload.
+ It's just a cosmetic thing, as the logic to actually do the
+ version-check was still disabled. (Closes: #234225)
* Unreleased.
-- Jordi Mallach <jordi@debian.org> Mon, 16 Feb 2004 14:18:05 +0100
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.1 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.1 Sun Feb 15 00:23:35 2004
+++ debian/alsa-driver/debian/patches/10_disable_gcc_version_check1.dpatch Mon Feb 23 00:20:13 2004
@@ -25,10 +25,9 @@
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-09 00:14:50.000000000 -0500
-+++ alsa-driver-1.0.2c/configure.in 2004-02-09 00:19:40.000000000 -0500
+--- /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 @@
AC_MSG_RESULT($kaversion)
@@ -118,3 +117,168 @@
dnl
dnl Test section, uncomment any of these double lines to verify the bellow code:
dnl
+@@ -211,85 +211,85 @@
+ dnl kernel_compiler="gcc 2.95.3 20010315 (release)"
+ 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
++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], [
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.1 debian/alsa-driver/debian/patches/10_disable_gcc_version_check2.dpatch:1.2
--- debian/alsa-driver/debian/patches/10_disable_gcc_version_check2.dpatch:1.1 Sun Feb 15 00:29:21 2004
+++ debian/alsa-driver/debian/patches/10_disable_gcc_version_check2.dpatch Mon Feb 23 00:20:13 2004
@@ -26,8 +26,8 @@
@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-04 04:36:44.000000000 -0500
-+++ alsa-driver-1.0.2c/configure 2004-02-14 18:26:17.000000000 -0500
+--- /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
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -542,7 +542,7 @@
fi
fi
-@@ -3143,82 +3286,6 @@
+@@ -3143,202 +3286,6 @@
echo "$as_me:$LINENO: result: $kaversion" >&5
echo "${ECHO_T}$kaversion" >&6
@@ -622,10 +622,130 @@
-
-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
-@@ -3406,7 +3473,7 @@
+@@ -3406,7 +3353,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -634,7 +754,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -3468,7 +3535,7 @@
+@@ -3468,7 +3415,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -643,7 +763,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -3553,7 +3620,7 @@
+@@ -3553,7 +3500,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -652,7 +772,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -4156,7 +4223,7 @@
+@@ -4156,7 +4103,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -661,7 +781,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -4217,7 +4284,7 @@
+@@ -4217,7 +4164,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -670,7 +790,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -4421,7 +4488,7 @@
+@@ -4421,7 +4368,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -679,7 +799,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -4555,7 +4622,7 @@
+@@ -4555,7 +4502,7 @@
echo "$as_me:$LINENO: result: \"unknown\"" >&5
echo "${ECHO_T}\"unknown\"" >&6;processor=""
fi
@@ -688,7 +808,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
rm -f processor.id
-@@ -4818,7 +4885,7 @@
+@@ -4818,7 +4765,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
@@ -697,7 +817,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
rm -f machine.id
-@@ -4901,7 +4968,7 @@
+@@ -4901,7 +4848,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -706,7 +826,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -4967,7 +5034,7 @@
+@@ -4967,7 +4914,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -715,7 +835,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -5061,7 +5128,7 @@
+@@ -5061,7 +5008,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -724,7 +844,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -5119,7 +5186,7 @@
+@@ -5119,7 +5066,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -733,7 +853,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -5207,10 +5274,19 @@
+@@ -5207,10 +5154,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -754,7 +874,7 @@
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
-@@ -5226,7 +5302,7 @@
+@@ -5226,7 +5182,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;strlcpy="0"
fi
@@ -763,7 +883,7 @@
CFLAGS=$ac_save_CFLAGS
CONFIG_HAVE_STRLCPY=$strlcpy
if test "$CONFIG_HAVE_STRLCPY" = "1"; then
-@@ -5265,10 +5341,19 @@
+@@ -5265,10 +5221,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -784,7 +904,7 @@
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
-@@ -5284,7 +5369,7 @@
+@@ -5284,7 +5249,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;snprintf="0"
fi
@@ -793,7 +913,7 @@
CFLAGS=$ac_save_CFLAGS
CONFIG_HAVE_SNPRINTF=$snprintf
if test "$CONFIG_HAVE_SNPRINTF" = "1"; then
-@@ -5324,10 +5409,19 @@
+@@ -5324,10 +5289,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -814,7 +934,7 @@
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
-@@ -5343,7 +5437,7 @@
+@@ -5343,7 +5317,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;vmalloc_to_page="0"
fi
@@ -823,7 +943,7 @@
CFLAGS=$ac_save_CFLAGS
CONFIG_HAVE_VMALLOC_TO_PAGE=$vmalloc_to_page
if test "$CONFIG_HAVE_VMALLOC_TO_PAGE" = "1"; then
-@@ -5381,10 +5475,19 @@
+@@ -5381,10 +5355,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -844,7 +964,7 @@
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
-@@ -5400,7 +5503,7 @@
+@@ -5400,7 +5383,7 @@
echo "$as_me:$LINENO: result: \"yes\"" >&5
echo "${ECHO_T}\"yes\"" >&6;old_kmod="1"
fi
@@ -853,7 +973,7 @@
CFLAGS=$ac_save_CFLAGS
CONFIG_HAVE_OLD_REQUEST_MODULE=$old_kmod
if test "$CONFIG_HAVE_OLD_REQUEST_MODULE" = "1"; then
-@@ -5440,10 +5543,19 @@
+@@ -5440,10 +5423,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -874,7 +994,7 @@
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
-@@ -5459,7 +5571,7 @@
+@@ -5459,7 +5451,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;pde_defined="0"
fi
@@ -883,7 +1003,7 @@
CFLAGS=$ac_save_CFLAGS
CONFIG_HAVE_PDE=$pde_defined
if test "$CONFIG_HAVE_PDE" = "1"; then
-@@ -5498,10 +5610,19 @@
+@@ -5498,10 +5490,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -904,7 +1024,7 @@
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
-@@ -5517,7 +5638,7 @@
+@@ -5517,7 +5518,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;pci_consistent_defined="0"
fi
@@ -913,7 +1033,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 +5677,19 @@
+@@ -5556,10 +5557,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -934,7 +1054,7 @@
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
-@@ -5575,7 +5705,7 @@
+@@ -5575,7 +5585,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;tty_count_atomic="0"
fi
@@ -943,7 +1063,7 @@
CFLAGS=$ac_save_CFLAGS
CONFIG_HAVE_TTY_COUNT_ATOMIC=$tty_count_atomic
if test "$CONFIG_HAVE_TTY_COUNT_ATOMIC" = "1"; then
-@@ -5615,10 +5745,19 @@
+@@ -5615,10 +5625,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -964,7 +1084,7 @@
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
-@@ -5634,7 +5773,7 @@
+@@ -5634,7 +5653,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;video_get_drvdata="0"
fi
@@ -973,7 +1093,7 @@
CFLAGS=$ac_save_CFLAGS
CONFIG_HAVE_VIDEO_GET_DRVDATA=$video_get_drvdata
if test "$CONFIG_HAVE_VIDEO_GET_DRVDATA" = "1"; then
-@@ -5680,10 +5819,19 @@
+@@ -5680,10 +5699,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -994,7 +1114,7 @@
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
-@@ -5699,7 +5847,7 @@
+@@ -5699,7 +5727,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;oldkfasync="0"
fi
@@ -1003,7 +1123,7 @@
CFLAGS=$ac_save_CFLAGS
CONFIG_OLD_KILL_FASYNC=$oldkfasync
if test "$CONFIG_OLD_KILL_FASYNC" = "1"; then
-@@ -5737,10 +5885,19 @@
+@@ -5737,10 +5765,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -1024,7 +1144,7 @@
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
-@@ -5756,7 +5913,7 @@
+@@ -5756,7 +5793,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;dma_addr_t="0"
fi
@@ -1033,7 +1153,7 @@
CFLAGS=$ac_save_CFLAGS
CONFIG_HAVE_DMA_ADDR_T=$dma_addr_t
if test "$CONFIG_HAVE_DMA_ADDR_T" = "1"; then
-@@ -5797,10 +5954,19 @@
+@@ -5797,10 +5834,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -1054,7 +1174,7 @@
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
-@@ -5816,7 +5982,7 @@
+@@ -5816,7 +5862,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;have_mutex_macros="0"
fi
@@ -1063,7 +1183,7 @@
CFLAGS=$ac_save_CFLAGS
CONFIG_HAVE_MUTEX_MACROS=$have_mutex_macros
if test "$CONFIG_HAVE_MUTEX_MACROS" = "1"; then
-@@ -6001,7 +6167,7 @@
+@@ -6001,7 +6047,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;rtcsup=""
fi
@@ -1072,7 +1192,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
CONFIG_SND_RTCTIMER=$rtcsup
-@@ -6065,7 +6231,7 @@
+@@ -6065,7 +6111,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -1081,7 +1201,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -6123,7 +6289,7 @@
+@@ -6123,7 +6169,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -1090,7 +1210,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -6203,7 +6369,7 @@
+@@ -6203,7 +6249,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -1099,7 +1219,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -6261,7 +6427,7 @@
+@@ -6261,7 +6307,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -1108,7 +1228,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -6339,7 +6505,7 @@
+@@ -6339,7 +6385,7 @@
echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6;boolchk=""
fi
@@ -1117,7 +1237,7 @@
fi
CFLAGS="$ac_save_CFLAGS"
eval $boolvar="$boolchk"
-@@ -7753,9 +7919,10 @@
+@@ -7753,9 +7799,10 @@
elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
set -o posix
fi
@@ -1129,7 +1249,7 @@
as_unset=unset
else
as_unset=false
-@@ -7953,16 +8120,17 @@
+@@ -7953,16 +8000,17 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
else
@@ -1149,7 +1269,7 @@
# IFS
-@@ -7989,7 +8157,7 @@
+@@ -7989,7 +8037,7 @@
cat >&5 <<_CSEOF
This file was extended by $as_me, which was
@@ -1158,7 +1278,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -8049,7 +8217,7 @@
+@@ -8049,7 +8097,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
config.status
@@ -1167,7 +1287,7 @@
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2003 Free Software Foundation, Inc.
-@@ -8508,12 +8676,45 @@
+@@ -8508,12 +8556,45 @@
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=$ac_top_builddir$srcdir ;;
esac
@@ -1219,7 +1339,7 @@
case $INSTALL in
-@@ -8521,11 +8722,6 @@
+@@ -8521,11 +8602,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -1231,7 +1351,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 +8760,12 @@
+@@ -8564,6 +8640,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }