[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-driver/debian/patches (1 file)

David B Harris dbharris-guest@haydn.debian.org
Tue, 13 Apr 2004 14:04:24 -0600


    Date: Tuesday, April 13, 2004 @ 14:04:24
  Author: dbharris-guest
    Path: /cvsroot/pkg-alsa/debian/alsa-driver/debian/patches

Modified: 10_disable_gcc_version_check2.dpatch

Hrmph, 10_disable_gcc_version_check2 got lost in the shuffle.


--------------------------------------+
 10_disable_gcc_version_check2.dpatch |  475 +--------------------------------
 1 files changed, 18 insertions(+), 457 deletions(-)


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.7 debian/alsa-driver/debian/patches/10_disable_gcc_version_check2.dpatch:1.8
--- debian/alsa-driver/debian/patches/10_disable_gcc_version_check2.dpatch:1.7	Tue Apr 13 13:59:29 2004
+++ debian/alsa-driver/debian/patches/10_disable_gcc_version_check2.dpatch	Tue Apr 13 14:04:23 2004
@@ -25,7 +25,7 @@
 @DPATCH@
 diff -urNad /home/dbharris/source/debian/build/alsa-driver-1.0.4/autom4te.cache/output.0 alsa-driver-1.0.4/autom4te.cache/output.0
 --- /home/dbharris/source/debian/build/alsa-driver-1.0.4/autom4te.cache/output.0	1969-12-31 19:00:00.000000000 -0500
-+++ alsa-driver-1.0.4/autom4te.cache/output.0	2004-04-13 15:44:22.000000000 -0400
++++ alsa-driver-1.0.4/autom4te.cache/output.0	2004-04-13 16:03:04.000000000 -0400
 @@ -0,0 +1,11556 @@
 +@%:@! /bin/sh
 +@%:@ Guess values for system-dependent variables and create Makefiles.
@@ -11585,7 +11585,7 @@
 +fi
 diff -urNad /home/dbharris/source/debian/build/alsa-driver-1.0.4/autom4te.cache/requests alsa-driver-1.0.4/autom4te.cache/requests
 --- /home/dbharris/source/debian/build/alsa-driver-1.0.4/autom4te.cache/requests	1969-12-31 19:00:00.000000000 -0500
-+++ alsa-driver-1.0.4/autom4te.cache/requests	2004-04-13 15:44:22.000000000 -0400
++++ alsa-driver-1.0.4/autom4te.cache/requests	2004-04-13 16:03:07.000000000 -0400
 @@ -0,0 +1,116 @@
 +# This file was generated by Autom4te Sat Mar 13 12:27:59 PST 2004.
 +# It contains the lists of macros which have been traced.
@@ -11606,19 +11606,19 @@
 +                      {
 +                        'm4_pattern_forbid' => 1,
 +                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-+                        'AC_TYPE_OFF_T' => 1,
 +                        'AC_C_VOLATILE' => 1,
++                        'AC_TYPE_OFF_T' => 1,
 +                        'AC_FUNC_CLOSEDIR_VOID' => 1,
 +                        'AC_REPLACE_FNMATCH' => 1,
 +                        'AC_PROG_LIBTOOL' => 1,
 +                        'AC_FUNC_STAT' => 1,
-+                        'AC_HEADER_TIME' => 1,
 +                        'AC_FUNC_WAIT3' => 1,
-+                        'AM_AUTOMAKE_VERSION' => 1,
-+                        'AC_STRUCT_TM' => 1,
++                        'AC_HEADER_TIME' => 1,
 +                        'AC_FUNC_LSTAT' => 1,
-+                        'AC_TYPE_MODE_T' => 1,
++                        'AC_STRUCT_TM' => 1,
++                        'AM_AUTOMAKE_VERSION' => 1,
 +                        'AC_FUNC_GETMNTENT' => 1,
++                        'AC_TYPE_MODE_T' => 1,
 +                        'AC_FUNC_STRTOD' => 1,
 +                        'AC_CHECK_HEADERS' => 1,
 +                        'AC_FUNC_STRNLEN' => 1,
@@ -11637,17 +11637,17 @@
 +                        'AC_STRUCT_ST_BLOCKS' => 1,
 +                        'AC_TYPE_SIGNAL' => 1,
 +                        'AC_TYPE_UID_T' => 1,
-+                        'AC_CONFIG_AUX_DIR' => 1,
 +                        'AC_PROG_MAKE_SET' => 1,
-+                        'sinclude' => 1,
++                        'AC_CONFIG_AUX_DIR' => 1,
 +                        'm4_pattern_allow' => 1,
++                        'sinclude' => 1,
 +                        'AC_DEFINE_TRACE_LITERAL' => 1,
 +                        'AC_FUNC_STRERROR_R' => 1,
 +                        'AC_PROG_CC' => 1,
-+                        'AC_FUNC_FORK' => 1,
 +                        'AC_DECL_SYS_SIGLIST' => 1,
-+                        'AC_FUNC_VPRINTF' => 1,
++                        'AC_FUNC_FORK' => 1,
 +                        'AC_FUNC_STRCOLL' => 1,
++                        'AC_FUNC_VPRINTF' => 1,
 +                        'AC_PROG_YACC' => 1,
 +                        'AC_INIT' => 1,
 +                        'AC_STRUCT_TIMEZONE' => 1,
@@ -11669,33 +11669,33 @@
 +                        'AM_MAINTAINER_MODE' => 1,
 +                        'AC_FUNC_UTIME_NULL' => 1,
 +                        'AC_FUNC_SELECT_ARGTYPES' => 1,
-+                        'AC_FUNC_STRFTIME' => 1,
 +                        'AC_HEADER_STAT' => 1,
-+                        'AC_C_INLINE' => 1,
++                        'AC_FUNC_STRFTIME' => 1,
 +                        'AC_PROG_CPP' => 1,
-+                        'AC_TYPE_PID_T' => 1,
-+                        'AC_C_CONST' => 1,
++                        'AC_C_INLINE' => 1,
 +                        'AC_PROG_LEX' => 1,
++                        'AC_C_CONST' => 1,
++                        'AC_TYPE_PID_T' => 1,
 +                        'AC_CONFIG_FILES' => 1,
 +                        'include' => 1,
 +                        'AC_FUNC_SETVBUF_REVERSED' => 1,
 +                        'AC_PROG_INSTALL' => 1,
 +                        'AM_GNU_GETTEXT' => 1,
-+                        'AC_FUNC_OBSTACK' => 1,
 +                        'AC_CHECK_LIB' => 1,
++                        'AC_FUNC_OBSTACK' => 1,
 +                        'AC_FUNC_MALLOC' => 1,
 +                        'AC_FUNC_GETGROUPS' => 1,
 +                        'AC_FUNC_GETLOADAVG' => 1,
 +                        'AH_OUTPUT' => 1,
 +                        'AC_FUNC_FSEEKO' => 1,
 +                        'AM_PROG_CC_C_O' => 1,
-+                        'AM_CONDITIONAL' => 1,
-+                        'AC_CANONICAL_SYSTEM' => 1,
 +                        'AC_FUNC_MKTIME' => 1,
++                        'AC_CANONICAL_SYSTEM' => 1,
++                        'AM_CONDITIONAL' => 1,
 +                        'AC_CONFIG_HEADERS' => 1,
 +                        'AC_HEADER_SYS_WAIT' => 1,
-+                        'AC_FUNC_MEMCMP' => 1,
 +                        'AC_PROG_LN_S' => 1,
++                        'AC_FUNC_MEMCMP' => 1,
 +                        'm4_include' => 1,
 +                        'AC_HEADER_DIRENT' => 1,
 +                        'AC_CHECK_FUNCS' => 1
@@ -11705,7 +11705,7 @@
 +
 diff -urNad /home/dbharris/source/debian/build/alsa-driver-1.0.4/autom4te.cache/traces.0 alsa-driver-1.0.4/autom4te.cache/traces.0
 --- /home/dbharris/source/debian/build/alsa-driver-1.0.4/autom4te.cache/traces.0	1969-12-31 19:00:00.000000000 -0500
-+++ alsa-driver-1.0.4/autom4te.cache/traces.0	2004-04-13 15:44:22.000000000 -0400
++++ alsa-driver-1.0.4/autom4te.cache/traces.0	2004-04-13 16:03:04.000000000 -0400
 @@ -0,0 +1,1043 @@
 +m4trace:configure.in:6: -1- AC_INIT([acore/sound.patch])
 +m4trace:configure.in:6: -1- m4_pattern_forbid([^_?A[CHUM]_])
@@ -12751,8 +12751,8 @@
 +m4trace:configure.in:1524: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
 +m4trace:configure.in:1524: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
 diff -urNad /home/dbharris/source/debian/build/alsa-driver-1.0.4/configure alsa-driver-1.0.4/configure
---- /home/dbharris/source/debian/build/alsa-driver-1.0.4/configure	2004-04-13 15:43:16.000000000 -0400
-+++ alsa-driver-1.0.4/configure	2004-04-13 15:44:22.000000000 -0400
+--- /home/dbharris/source/debian/build/alsa-driver-1.0.4/configure	2004-04-13 16:02:22.000000000 -0400
++++ alsa-driver-1.0.4/configure	2004-04-13 16:03:04.000000000 -0400
 @@ -1,6 +1,6 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -13267,413 +13267,7 @@
  fi
  fi
  
-@@ -3273,405 +3416,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 $HACK_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 $HACK_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 <string.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';
--   if (!strcmp(compiler, " "))
--	compiler[0] = '\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
- 
- 
- 
-@@ -3739,7 +3487,7 @@
+@@ -3690,7 +3833,7 @@
  echo "$as_me:$LINENO: result: \"no\"" >&5
  echo "${ECHO_T}\"no\"" >&6;boolchk=""
  fi
@@ -13682,7 +13276,7 @@
  fi
    CFLAGS="$ac_save_CFLAGS"
    eval $boolvar="$boolchk"
-@@ -3801,7 +3549,7 @@
+@@ -4321,7 +4464,7 @@
  echo "$as_me:$LINENO: result: \"no\"" >&5
  echo "${ECHO_T}\"no\"" >&6;boolchk=""
  fi
@@ -13691,7 +13285,7 @@
  fi
    CFLAGS="$ac_save_CFLAGS"
    eval $boolvar="$boolchk"
-@@ -3886,7 +3634,7 @@
+@@ -4382,7 +4525,7 @@
  echo "$as_me:$LINENO: result: \"no\"" >&5
  echo "${ECHO_T}\"no\"" >&6;boolchk=""
  fi
@@ -13700,7 +13294,7 @@
  fi
    CFLAGS="$ac_save_CFLAGS"
    eval $boolvar="$boolchk"
-@@ -4517,7 +4265,7 @@
+@@ -5121,7 +5264,7 @@
  echo "$as_me:$LINENO: result: \"no\"" >&5
  echo "${ECHO_T}\"no\"" >&6;boolchk=""
  fi
@@ -13709,7 +13303,7 @@
  fi
    CFLAGS="$ac_save_CFLAGS"
    eval $boolvar="$boolchk"
-@@ -4578,7 +4326,7 @@
+@@ -5188,7 +5331,7 @@
  echo "$as_me:$LINENO: result: \"no\"" >&5
  echo "${ECHO_T}\"no\"" >&6;boolchk=""
  fi
@@ -13718,7 +13312,7 @@
  fi
    CFLAGS="$ac_save_CFLAGS"
    eval $boolvar="$boolchk"
-@@ -4637,7 +4385,7 @@
+@@ -5283,7 +5426,7 @@
  echo "$as_me:$LINENO: result: \"no\"" >&5
  echo "${ECHO_T}\"no\"" >&6;boolchk=""
  fi
@@ -13727,34 +13321,7 @@
  fi
    CFLAGS="$ac_save_CFLAGS"
    eval $boolvar="$boolchk"
-@@ -4828,7 +4576,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"
-@@ -4962,7 +4710,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
-@@ -5234,7 +4982,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
-@@ -5317,7 +5065,7 @@
+@@ -5341,7 +5484,7 @@
  echo "$as_me:$LINENO: result: \"no\"" >&5
  echo "${ECHO_T}\"no\"" >&6;boolchk=""
  fi
@@ -13763,394 +13330,7 @@
  fi
    CFLAGS="$ac_save_CFLAGS"
    eval $boolvar="$boolchk"
-@@ -5384,7 +5132,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"
-@@ -5479,7 +5227,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"
-@@ -5537,7 +5285,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"
-@@ -5625,10 +5373,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
-@@ -5644,7 +5401,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
-@@ -5683,10 +5440,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
-@@ -5702,7 +5468,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
-@@ -5741,10 +5507,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
-@@ -5760,7 +5535,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
-@@ -5800,10 +5575,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
-@@ -5819,7 +5603,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
-@@ -5857,10 +5641,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
-@@ -5876,7 +5669,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
-@@ -5916,10 +5709,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
-@@ -5935,7 +5737,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
-@@ -5974,10 +5776,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
-@@ -5993,7 +5804,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
-@@ -6032,10 +5843,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
-@@ -6051,7 +5871,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
-@@ -6091,10 +5911,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
-@@ -6110,7 +5939,7 @@
- echo "$as_me:$LINENO: result: \"no\"" >&5
- echo "${ECHO_T}\"no\"" >&6;video_get_drvdata="0"
- fi
--rm -f conftest.$ac_objext conftest.$ac_ext
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$ac_save_CFLAGS
- CONFIG_HAVE_VIDEO_GET_DRVDATA=$video_get_drvdata
- if test "$CONFIG_HAVE_VIDEO_GET_DRVDATA" = "1"; then
-@@ -6156,10 +5985,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
-@@ -6175,7 +6013,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
-@@ -6213,10 +6051,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
-@@ -6232,7 +6079,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
-@@ -6273,10 +6120,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
-@@ -6292,7 +6148,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
-@@ -6476,7 +6332,7 @@
+@@ -6280,7 +6423,7 @@
  echo "$as_me:$LINENO: result: \"no\"" >&5
  echo "${ECHO_T}\"no\"" >&6;rtcsup=""
  fi
@@ -14159,34 +13339,7 @@
  fi
  CFLAGS="$ac_save_CFLAGS"
  CONFIG_SND_RTCTIMER=$rtcsup
-@@ -6540,7 +6396,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"
-@@ -6598,7 +6454,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"
-@@ -6678,7 +6534,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"
-@@ -6736,7 +6592,7 @@
+@@ -6540,7 +6683,7 @@
  echo "$as_me:$LINENO: result: \"no\"" >&5
  echo "${ECHO_T}\"no\"" >&6;boolchk=""
  fi
@@ -14195,7 +13348,7 @@
  fi
    CFLAGS="$ac_save_CFLAGS"
    eval $boolvar="$boolchk"
-@@ -6814,7 +6670,7 @@
+@@ -6618,7 +6761,7 @@
  echo "$as_me:$LINENO: result: \"no\"" >&5
  echo "${ECHO_T}\"no\"" >&6;boolchk=""
  fi
@@ -14204,7 +13357,7 @@
  fi
    CFLAGS="$ac_save_CFLAGS"
    eval $boolvar="$boolchk"
-@@ -10522,9 +10378,10 @@
+@@ -10326,9 +10469,10 @@
  elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
    set -o posix
  fi
@@ -14216,7 +13369,7 @@
    as_unset=unset
  else
    as_unset=false
-@@ -10722,16 +10579,17 @@
+@@ -10526,16 +10670,17 @@
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
  else
@@ -14236,7 +13389,7 @@
  
  
  # IFS
-@@ -10758,7 +10616,7 @@
+@@ -10562,7 +10707,7 @@
  cat >&5 <<_CSEOF
  
  This file was extended by $as_me, which was
@@ -14245,7 +13398,7 @@
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -10818,7 +10676,7 @@
+@@ -10622,7 +10767,7 @@
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
  config.status
@@ -14254,7 +13407,7 @@
    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  
  Copyright (C) 2003 Free Software Foundation, Inc.
-@@ -11311,12 +11169,45 @@
+@@ -11115,12 +11260,45 @@
      ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
      ac_top_srcdir=$ac_top_builddir$srcdir ;;
  esac
@@ -14306,7 +13459,7 @@
  
  
    case $INSTALL in
-@@ -11324,11 +11215,6 @@
+@@ -11128,11 +11306,6 @@
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -14318,7 +13471,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.  */
-@@ -11367,6 +11253,12 @@
+@@ -11171,6 +11344,12 @@
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }