Index: configure
--- configure.orig	2009-04-03 14:28:28 +0200
+++ configure	2009-04-04 09:25:40 +0200
@@ -4944,10 +4944,7 @@
 if $ac_preproc_ok; then
   :
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+  :
 fi
 
 ac_ext=c
Index: gl/error.c
--- gl/error.c.orig	2009-04-03 14:13:43 +0200
+++ gl/error.c	2009-04-04 09:25:40 +0200
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if !_LIBC && ENABLE_NLS
+#if !_LIBC && defined(ENABLE_NLS)
 # include "gettext.h"
 # define _(msgid) gettext (msgid)
 #endif
Index: gl/gettext.h
--- gl/gettext.h.orig	2009-04-03 14:13:43 +0200
+++ gl/gettext.h	2009-04-04 09:25:40 +0200
@@ -19,7 +19,7 @@
 #define _LIBGETTEXT_H 1
 
 /* NLS can be disabled through the configure --disable-nls option.  */
-#if ENABLE_NLS
+#ifdef ENABLE_NLS
 
 /* Get declarations of GNU message catalog functions.  */
 # include <libintl.h>
Index: lib/gl/gettext.h
--- lib/gl/gettext.h.orig	2009-04-03 14:13:43 +0200
+++ lib/gl/gettext.h	2009-04-04 09:54:12 +0200
@@ -19,7 +19,7 @@
 #define _LIBGETTEXT_H 1
 
 /* NLS can be disabled through the configure --disable-nls option.  */
-#if ENABLE_NLS
+#ifdef ENABLE_NLS
 
 /* Get declarations of GNU message catalog functions.  */
 # include <libintl.h>
Index: lib/gl/stdint.in.h
--- lib/gl/stdint.in.h.orig	2009-04-03 14:13:43 +0200
+++ lib/gl/stdint.in.h	2009-04-04 10:28:44 +0200
@@ -82,7 +82,7 @@
 # include <sys/inttypes.h>
 #endif
 
-#if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__
+#if (@HAVE_SYS_BITYPES_H@ + 0) && ! defined __BIT_TYPES_DEFINED__
   /* Linux libc4 >= 4.6.7 and libc5 have a <sys/bitypes.h> that defines
      int{8,16,32,64}_t and __BIT_TYPES_DEFINED__.  In libc5 >= 5.2.2 it is
      included by <sys/types.h>.  */
@@ -469,7 +469,7 @@
 #  define SIZE_MAX  _STDINT_MAX (0, 32, 0ul)
 # endif
 #else
-# define SIZE_MAX  _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@)
+# define SIZE_MAX  _STDINT_MAX (0, sizeof(size_t)*8, 0@SIZE_T_SUFFIX@)
 #endif
 
 /* wchar_t limits */
Index: lib/stringprep.c
--- lib/stringprep.c.orig	2009-04-03 14:13:43 +0200
+++ lib/stringprep.c	2009-04-04 10:00:25 +0200
@@ -25,6 +25,14 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
+
+#undef size_t
+#if 0
+#ifndef SIZE_MAX
+#define SIZE_MAX ((((size_t)1)<<(sizeof(size_t)*8))-1)
+#endif
+#endif
 
 #include "stringprep.h"