michael@564: Index: configure
michael@564: --- configure.orig	2012-05-23 10:36:44.000000000 +0200
michael@564: +++ configure	2012-05-29 09:37:30.000000000 +0200
michael@564: @@ -4984,10 +4984,7 @@
michael@564:  if $ac_preproc_ok; then :
michael@564:  
michael@564:  else
michael@564: -  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
michael@564: -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
michael@564: -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
michael@564: -See \`config.log' for more details" "$LINENO" 5; }
michael@564: +    :
michael@564:  fi
michael@564:  
michael@564:  ac_ext=c
michael@564: Index: contrib/doxygen/Doxyfile
michael@564: Index: gl/error.c
michael@564: --- gl/error.c.orig	2012-04-27 10:18:42.000000000 +0200
michael@564: +++ gl/error.c	2012-05-29 09:37:03.000000000 +0200
michael@564: @@ -28,7 +28,7 @@
michael@564:  #include <stdlib.h>
michael@564:  #include <string.h>
michael@564:  
michael@564: -#if !_LIBC && ENABLE_NLS
michael@564: +#if !_LIBC && defined(ENABLE_NLS)
michael@564:  # include "gettext.h"
michael@564:  # define _(msgid) gettext (msgid)
michael@564:  #endif
michael@564: Index: gl/gettext.h
michael@564: --- gl/gettext.h.orig	2012-04-27 10:18:42.000000000 +0200
michael@564: +++ gl/gettext.h	2012-05-29 09:37:03.000000000 +0200
michael@564: @@ -19,7 +19,7 @@
michael@564:  #define _LIBGETTEXT_H 1
michael@564:  
michael@564:  /* NLS can be disabled through the configure --disable-nls option.  */
michael@564: -#if ENABLE_NLS
michael@564: +#ifdef ENABLE_NLS
michael@564:  
michael@564:  /* Get declarations of GNU message catalog functions.  */
michael@564:  # include <libintl.h>
michael@564: Index: lib/gl/gettext.h
michael@564: --- lib/gl/gettext.h.orig	2012-04-27 10:18:42.000000000 +0200
michael@564: +++ lib/gl/gettext.h	2012-05-29 09:37:03.000000000 +0200
michael@564: @@ -19,7 +19,7 @@
michael@564:  #define _LIBGETTEXT_H 1
michael@564:  
michael@564:  /* NLS can be disabled through the configure --disable-nls option.  */
michael@564: -#if ENABLE_NLS
michael@564: +#ifdef ENABLE_NLS
michael@564:  
michael@564:  /* Get declarations of GNU message catalog functions.  */
michael@564:  # include <libintl.h>
michael@564: Index: lib/gl/stdint.in.h
michael@564: --- lib/gl/stdint.in.h.orig	2012-05-22 19:55:38.000000000 +0200
michael@564: +++ lib/gl/stdint.in.h	2012-05-29 09:37:03.000000000 +0200
michael@564: @@ -105,7 +105,7 @@
michael@564:  # include <sys/inttypes.h>
michael@564:  #endif
michael@564:  
michael@564: -#if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__
michael@564: +#if (@HAVE_SYS_BITYPES_H@ + 0) && ! defined __BIT_TYPES_DEFINED__
michael@564:    /* Linux libc4 >= 4.6.7 and libc5 have a <sys/bitypes.h> that defines
michael@564:       int{8,16,32,64}_t and __BIT_TYPES_DEFINED__.  In libc5 >= 5.2.2 it is
michael@564:       included by <sys/types.h>.  */
michael@564: @@ -535,7 +535,7 @@
michael@564:  #  define SIZE_MAX  _STDINT_MAX (0, 32, 0ul)
michael@564:  # endif
michael@564:  #else
michael@564: -# define SIZE_MAX  _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@)
michael@564: +# define SIZE_MAX  _STDINT_MAX (0, sizeof(size_t)*8, 0@SIZE_T_SUFFIX@)
michael@564:  #endif
michael@564:  
michael@564:  /* wchar_t limits */
michael@564: Index: lib/stringprep.c
michael@564: --- lib/stringprep.c.orig	2012-04-27 12:48:08.000000000 +0200
michael@564: +++ lib/stringprep.c	2012-05-29 09:37:03.000000000 +0200
michael@564: @@ -33,6 +33,14 @@
michael@564:  
michael@564:  #include <stdlib.h>
michael@564:  #include <string.h>
michael@564: +#include <limits.h>
michael@564: +
michael@564: +#undef size_t
michael@564: +#if 0
michael@564: +#ifndef SIZE_MAX
michael@564: +#define SIZE_MAX ((((size_t)1)<<(sizeof(size_t)*8))-1)
michael@564: +#endif
michael@564: +#endif
michael@564:  
michael@564:  #include "stringprep.h"
michael@564: