Index: configure
--- configure.orig	2009-07-12 09:19:15 +0200
+++ configure	2010-01-07 18:10:28 +0100
@@ -2821,7 +2821,7 @@
 # Check whether --enable-expert-mode was given.
 if test "${enable_expert_mode+set}" = set; then
   enableval=$enable_expert_mode;
-  ac_enable_expert_mode=yes
+  ac_enable_expert_mode=$enableval
 
 else
 
@@ -4502,13 +4502,7 @@
 if $ac_preproc_ok; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+  :
 fi
 
 ac_ext=c
@@ -6170,13 +6164,7 @@
 if $ac_preproc_ok; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+  :
 fi
 
 ac_ext=c
@@ -6901,13 +6889,7 @@
 if $ac_preproc_ok; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+  :
 fi
 
 ac_ext=c
Index: gnu.h.in
--- gnu.h.in.orig	2009-06-18 21:56:25 +0200
+++ gnu.h.in	2010-01-07 18:10:08 +0100
@@ -59,15 +59,6 @@
 @TYPEDEF_UINT32_T@
 @TYPEDEF_UINT64_T@
 
-#if defined(__GNUC__)
-# if !defined(__GNUC_PREREQ__)
-#  define __GNUC_PREREQ__(maj, min) (__GNUC__ > (maj) || __GNUC__ == (maj) && __GNUC_MINOR__ >= (min))
-# endif
-#else
-# define __GNUC__ 0
-# define __GNUC_PREREQ__(maj, min) 0
-#endif
-
 /* WARNING: overriding this value is dangerous; some assembler routines
  * make assumptions about the size set by the configure script
  */