* lib/gnulib.mk, m4/stdbool.m4, m4/stddef_h.m4, m4/stdint.m4: Merge from gnulib.

diff --cc lib/gnulib.mk
index bb5bdcf852e0a4330ae64abb9a82e31c69d9c321,bb5bdcf852e0a4330ae64abb9a82e31c69d9c321..d2fd6698030fc30c941422c82f981fca6d9763e1
--- 1/lib/gnulib.mk
--- 2/lib/gnulib.mk
+++ b/lib/gnulib.mk
@@@ -127,7 -127,7 +127,7 @@@ BUILT_SOURCES += $(GETOPT_H
  
  # We need the following in order to create <getopt.h> when the system
  # doesn't have one that works with the given compiler.
--getopt.h: getopt.in.h $(ARG_NONNULL_H)
++getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
        $(AM_V_GEN)rm -f $@-t $@ && \
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \
@@@ -208,12 -208,12 +208,17 @@@ BUILT_SOURCES += $(STDBOOL_H
  
  # We need the following in order to create <stdbool.h> when the system
  # doesn't have one that works.
--stdbool.h: stdbool.in.h
++if GL_GENERATE_STDBOOL_H
++stdbool.h: stdbool.in.h $(top_builddir)/config.status
        $(AM_V_GEN)rm -f $@-t $@ && \
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
        } > $@-t && \
        mv $@-t $@
++else
++stdbool.h: $(top_builddir)/config.status
++      rm -f $@
++endif
  MOSTLYCLEANFILES += stdbool.h stdbool.h-t
  
  EXTRA_DIST += stdbool.in.h
@@@ -226,7 -226,7 +231,8 @@@ BUILT_SOURCES += $(STDDEF_H
  
  # We need the following in order to create <stddef.h> when the system
  # doesn't have one that works with the given compiler.
--stddef.h: stddef.in.h
++if GL_GENERATE_STDDEF_H
++stddef.h: stddef.in.h $(top_builddir)/config.status
        $(AM_V_GEN)rm -f $@-t $@ && \
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
          sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@@ -238,6 -238,6 +244,10 @@@
              < $(srcdir)/stddef.in.h; \
        } > $@-t && \
        mv $@-t $@
++else
++stddef.h: $(top_builddir)/config.status
++      rm -f $@
++endif
  MOSTLYCLEANFILES += stddef.h stddef.h-t
  
  EXTRA_DIST += stddef.in.h
@@@ -250,7 -250,7 +260,8 @@@ BUILT_SOURCES += $(STDINT_H
  
  # We need the following in order to create <stdint.h> when the system
  # doesn't have one that works with the given compiler.
--stdint.h: stdint.in.h
++if GL_GENERATE_STDINT_H
++stdint.h: stdint.in.h $(top_builddir)/config.status
        $(AM_V_GEN)rm -f $@-t $@ && \
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
@@@ -282,6 -282,6 +293,10 @@@
              < $(srcdir)/stdint.in.h; \
        } > $@-t && \
        mv $@-t $@
++else
++stdint.h: $(top_builddir)/config.status
++      rm -f $@
++endif
  MOSTLYCLEANFILES += stdint.h stdint.h-t
  
  EXTRA_DIST += stdint.in.h
@@@ -294,7 -294,7 +309,7 @@@ BUILT_SOURCES += stdio.
  
  # We need the following in order to create <stdio.h> when the system
  # doesn't have one that works with the given compiler.
--stdio.h: stdio.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
++stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)rm -f $@-t $@ && \
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
          sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@@ -405,7 -405,7 +420,7 @@@ BUILT_SOURCES += stdlib.
  
  # We need the following in order to create <stdlib.h> when the system
  # doesn't have one that works with the given compiler.
--stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
++stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)rm -f $@-t $@ && \
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
          sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@@ -512,7 -512,7 +527,7 @@@ BUILT_SOURCES += sys/stat.
  
  # We need the following in order to create <sys/stat.h> when the system
  # has one that is incomplete.
--sys/stat.h: sys_stat.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
++sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_at)$(MKDIR_P) sys
        $(AM_V_GEN)rm -f $@-t $@ && \
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
@@@ -571,7 -571,7 +586,7 @@@ BUILT_SOURCES += time.
  
  # We need the following in order to create <time.h> when the system
  # doesn't have one that works with the given compiler.
--time.h: time.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
++time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)rm -f $@-t $@ && \
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
          sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@@ -621,7 -621,7 +636,7 @@@ BUILT_SOURCES += unistd.
  
  # We need the following in order to create an empty placeholder for
  # <unistd.h> when the system doesn't have one.
--unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
++unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
        $(AM_V_GEN)rm -f $@-t $@ && \
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \

diff --cc m4/stdbool.m4
index 838cf0f4679a2a9a4dca119c1760d2040caf3cf0,838cf0f4679a2a9a4dca119c1760d2040caf3cf0..1ebf3e6808c51e09a7aeea687c1671bb091c9d91
--- 1/m4/stdbool.m4
--- 2/m4/stdbool.m4
+++ b/m4/stdbool.m4
@@@ -5,7 -5,7 +5,7 @@@ dnl This file is free software; the Fre
  dnl gives unlimited permission to copy and/or distribute it,
  dnl with or without modifications, as long as this notice is preserved.
  
--#serial 4
++#serial 5
  
  # Prepare for substituting <stdbool.h> if it is not supported.
  
@@@ -21,6 -21,6 +21,7 @@@ AC_DEFUN([AM_STDBOOL_H]
      STDBOOL_H='stdbool.h'
    fi
    AC_SUBST([STDBOOL_H])
++  AM_CONDITIONAL([GL_GENERATE_STDBOOL_H], [test -n "$STDBOOL_H"])
  
    if test "$ac_cv_type__Bool" = yes; then
      HAVE__BOOL=1

diff --cc m4/stddef_h.m4
index 1942b6aa0df534dbd08a25f81773a576167b7aea,1942b6aa0df534dbd08a25f81773a576167b7aea..1ae2344318e3f3db73ae4806ceb734a66b6d7e5c
--- 1/m4/stddef_h.m4
--- 2/m4/stddef_h.m4
+++ b/m4/stddef_h.m4
@@@ -1,5 -1,5 +1,5 @@@
  dnl A placeholder for POSIX 2008 <stddef.h>, for platforms that have issues.
--# stddef_h.m4 serial 3
++# stddef_h.m4 serial 4
  dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
@@@ -9,6 -9,6 +9,7 @@@ AC_DEFUN([gl_STDDEF_H]
  [
    AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
    AC_REQUIRE([gt_TYPE_WCHAR_T])
++  STDDEF_H=
    if test $gt_cv_c_wchar_t = no; then
      HAVE_WCHAR_T=0
      STDDEF_H=stddef.h
@@@ -24,6 -24,6 +25,8 @@@
      REPLACE_NULL=1
      STDDEF_H=stddef.h
    fi
++  AC_SUBST([STDDEF_H])
++  AM_CONDITIONAL([GL_GENERATE_STDDEF_H], [test -n "$STDDEF_H"])
    if test -n "$STDDEF_H"; then
      gl_NEXT_HEADERS([stddef.h])
    fi
@@@ -41,5 -41,5 +44,4 @@@ AC_DEFUN([gl_STDDEF_H_DEFAULTS]
    dnl Assume proper GNU behavior unless another module says otherwise.
    REPLACE_NULL=0;                AC_SUBST([REPLACE_NULL])
    HAVE_WCHAR_T=1;                AC_SUBST([HAVE_WCHAR_T])
--  STDDEF_H='';                   AC_SUBST([STDDEF_H])
  ])

diff --cc m4/stdint.m4
index e7d0d0765a2b3cf28cfc4b339e70609ef9414538,e7d0d0765a2b3cf28cfc4b339e70609ef9414538..dff37fe1bf9fdee7ff36c67d0e82c5489223e625
--- 1/m4/stdint.m4
--- 2/m4/stdint.m4
+++ b/m4/stdint.m4
@@@ -1,4 -1,4 +1,4 @@@
--# stdint.m4 serial 39
++# stdint.m4 serial 40
  dnl Copyright (C) 2001-2011 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
@@@ -305,6 -305,6 +305,7 @@@ static const char *macro_values[] 
      STDINT_H=stdint.h
    fi
    AC_SUBST([STDINT_H])
++  AM_CONDITIONAL([GL_GENERATE_STDINT_H], [test -n "$STDINT_H"])
  ])
  
  dnl gl_STDINT_BITSIZEOF(TYPES, INCLUDES)