Index: configure
--- configure.orig	2018-03-31 16:45:21.000000000 +0200
+++ configure	2018-03-31 19:03:15.927118000 +0200
@@ -5449,10 +5449,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: contrib/doxygen/Doxyfile
Index: gl/error.c
--- gl/error.c.orig	2018-02-03 19:03:00.000000000 +0100
+++ gl/error.c	2018-03-31 19:03:15.927287000 +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: lib/stringprep.c
--- lib/stringprep.c.orig	2017-07-12 21:40:56.000000000 +0200
+++ lib/stringprep.c	2018-03-31 19:03:15.928574000 +0200
@@ -33,6 +33,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"