Add Gnulib portability modules; update Gnulib files.

* m4/gnulib-cache.m4 (gl_MODULES): Add `flock' (provides flock(2) declaration and implementation), `fpieee' (fixes floating point behavior on Alpha and SH), `stdlib' (provides an unsetenv(3) declaration, among others), `putenv' (provides a putenv(3) declaration and implementation with the semantics we need).
2025-04-30 03:40:34 +02:00 · 2009-05-21 01:00:41 +02:00 · 2009-05-21 01:00:41 +02:00 · f240aacb41
commit f240aacb41
parent fc76c08d87
44 changed files with 3048 additions and 284 deletions
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@ -9,7 +9,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl --libtool --macro-prefix=gl --no-vc-files alloca-opt autobuild count-one-bits extensions full-read full-write strcase strftime
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl --libtool --macro-prefix=gl --no-vc-files alloca-opt autobuild count-one-bits extensions flock fpieee full-read full-write putenv stdlib strcase strftime
 AUTOMAKE_OPTIONS = 1.5 gnits
@ -27,6 +27,7 @@ DISTCLEANFILES =
 MAINTAINERCLEANFILES =
 AM_CPPFLAGS =
 AM_CFLAGS =
 noinst_LTLIBRARIES += libgnu.la
@ -73,7 +74,7 @@ EXTRA_DIST += alloca.in.h
 # The Automake-defined pkg* macros are appended, in the order
 # listed in the Automake 1.10a+ documentation.
 configmake.h: Makefile
-	rm -f $@-t $@
+	rm -f $@-t
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  echo '#define PREFIX "$(prefix)"'; \
 	  echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
@ -103,7 +104,12 @@ configmake.h: Makefile
 	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
 	  echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
 	} | sed '/""/d' > $@-t
-	mv $@-t $@
+	if test -f $@ && cmp $@-t $@ > /dev/null; then \
 	  rm -f $@-t; \
 	else \
 	  rm -f $@; mv $@-t $@; \
 	fi
 BUILT_SOURCES += configmake.h
 CLEANFILES += configmake.h configmake.h-t
@ -116,6 +122,15 @@ EXTRA_DIST += count-one-bits.h
 ## end   gnulib module count-one-bits
 ## begin gnulib module flock
 EXTRA_DIST += flock.c
 EXTRA_libgnu_la_SOURCES += flock.c
 ## end   gnulib module flock
 ## begin gnulib module full-read
 libgnu_la_SOURCES += full-read.h full-read.c
@ -151,21 +166,37 @@ all-local: charset.alias ref-add.sed ref-del.sed
 charset_alias = $(DESTDIR)$(libdir)/charset.alias
 charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
-install-exec-local: all-local
+install-exec-local: install-exec-localcharset
-	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
+install-exec-localcharset: all-local
 	if test $(GLIBC21) = no; then \
 	  case '$(host_os)' in \
 	    darwin[56]*) \
 	      need_charset_alias=true ;; \
 	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
 	      need_charset_alias=false ;; \
 	    *) \
 	      need_charset_alias=true ;; \
 	  esac ; \
 	else \
 	  need_charset_alias=false ; \
 	fi ; \
 	if $$need_charset_alias; then \
 	  $(mkinstalldirs) $(DESTDIR)$(libdir) ; \
 	fi ; \
 	if test -f $(charset_alias); then \
 	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
 	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
 	  rm -f $(charset_tmp) ; \
 	else \
-	  if test $(GLIBC21) = no; then \
+	  if $$need_charset_alias; then \
 	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
 	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
 	    rm -f $(charset_tmp) ; \
 	  fi ; \
 	fi
-uninstall-local: all-local
+uninstall-local: uninstall-localcharset
 uninstall-localcharset: all-local
 	if test -f $(charset_alias); then \
 	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
 	  if grep '^# Packages using this file: $$' $(charset_tmp) \
@ -194,6 +225,15 @@ EXTRA_DIST += config.charset ref-add.sin ref-del.sin
 ## end   gnulib module localcharset
 ## begin gnulib module malloc-posix
 EXTRA_DIST += malloc.c
 EXTRA_libgnu_la_SOURCES += malloc.c
 ## end   gnulib module malloc-posix
 ## begin gnulib module mbrlen
@ -221,6 +261,15 @@ EXTRA_libgnu_la_SOURCES += mbsinit.c
 ## end   gnulib module mbsinit
 ## begin gnulib module putenv
 EXTRA_DIST += putenv.c
 EXTRA_libgnu_la_SOURCES += putenv.c
 ## end   gnulib module putenv
 ## begin gnulib module safe-read
@ -257,6 +306,107 @@ EXTRA_DIST += stdbool.in.h
 ## end   gnulib module stdbool
 ## begin gnulib module stdint
 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
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
 	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
 	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
 	      -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
 	      -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
 	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
 	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
 	      -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
 	      -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \
 	      -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \
 	      -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \
 	      -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \
 	      -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \
 	      -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \
 	      -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \
 	      -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \
 	      -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \
 	      -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \
 	      -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
 	      -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
 	      -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
 	      < $(srcdir)/stdint.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += stdint.h stdint.h-t
 EXTRA_DIST += stdint.in.h
 ## end   gnulib module stdint
 ## begin gnulib module stdlib
 BUILT_SOURCES += stdlib.h
 # 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
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
 	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
 	      -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
 	      -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \
 	      -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \
 	      -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \
 	      -e 's|@''GNULIB_ATOLL''@|$(GNULIB_ATOLL)|g' \
 	      -e 's|@''GNULIB_GETLOADAVG''@|$(GNULIB_GETLOADAVG)|g' \
 	      -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \
 	      -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
 	      -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
 	      -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \
 	      -e 's|@''GNULIB_RANDOM_R''@|$(GNULIB_RANDOM_R)|g' \
 	      -e 's|@''GNULIB_RPMATCH''@|$(GNULIB_RPMATCH)|g' \
 	      -e 's|@''GNULIB_SETENV''@|$(GNULIB_SETENV)|g' \
 	      -e 's|@''GNULIB_STRTOD''@|$(GNULIB_STRTOD)|g' \
 	      -e 's|@''GNULIB_STRTOLL''@|$(GNULIB_STRTOLL)|g' \
 	      -e 's|@''GNULIB_STRTOULL''@|$(GNULIB_STRTOULL)|g' \
 	      -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
 	      -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
 	      -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
 	      -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
 	      -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
 	      -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
 	      -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \
 	      -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
 	      -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
 	      -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \
 	      -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \
 	      -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
 	      -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \
 	      -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
 	      -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
 	      -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
 	      -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
 	      -e 's|@''VOID_UNSETENV''@|$(VOID_UNSETENV)|g' \
 	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
 	      < $(srcdir)/stdlib.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += stdlib.h stdlib.h-t
 EXTRA_DIST += stdlib.in.h
 ## end   gnulib module stdlib
 ## begin gnulib module strcase
@ -306,6 +456,32 @@ EXTRA_DIST += strings.in.h
 ## end   gnulib module strings
 ## begin gnulib module sys_file
 BUILT_SOURCES += $(SYS_FILE_H)
 # We need the following in order to create <sys/file.h> when the system
 # has one that is incomplete.
 sys/file.h: sys_file.in.h
 	@MKDIR_P@ sys
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's/@''HAVE_SYS_FILE_H''@/$(HAVE_SYS_FILE_H)/g' \
 	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''NEXT_SYS_FILE_H''@|$(NEXT_SYS_FILE_H)|g' \
 	      -e 's/@''HAVE_FLOCK''@/$(HAVE_FLOCK)/g' \
 	      -e 's/@''GNULIB_FLOCK''@/$(GNULIB_FLOCK)/g' \
 	      < $(srcdir)/sys_file.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += sys/file.h sys/file.h-t
 MOSTLYCLEANDIRS += sys
 EXTRA_DIST += sys_file.in.h
 ## end   gnulib module sys_file
 ## begin gnulib module time
 BUILT_SOURCES += time.h
@ -371,6 +547,7 @@ unistd.h: unistd.in.h
 	      -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \
 	      -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \
 	      -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \
 	      -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \
 	      -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \
 	      -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \
 	      -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \
@ -385,6 +562,7 @@ unistd.h: unistd.in.h
 	      -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \
 	      -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
 	      -e 's|@''HAVE_GETUSERSHELL''@|$(HAVE_GETUSERSHELL)|g' \
 	      -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \
 	      -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
 	      -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
 	      -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
@ -462,6 +640,7 @@ wchar.h: wchar.in.h
 	      -e 's|@''REPLACE_MBSNRTOWCS''@|$(REPLACE_MBSNRTOWCS)|g' \
 	      -e 's|@''REPLACE_WCRTOMB''@|$(REPLACE_WCRTOMB)|g' \
 	      -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \
 	      -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \
 	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
 	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
 	    < $(srcdir)/wchar.in.h; \
--- a/lib/config.charset
+++ b/lib/config.charset
@ -1,7 +1,7 @@
 #! /bin/sh
 # Output a system dependent table of character encoding aliases.
 #
-#   Copyright (C) 2000-2004, 2006-2008 Free Software Foundation, Inc.
+#   Copyright (C) 2000-2004, 2006-2009 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU Lesser General Public License as published by
@ -63,12 +63,13 @@
 #   CP922                       aix
 #   CP932                       aix woe32 dos
 #   CP943                       aix
-#   CP949                       osf woe32 dos
+#   CP949                       osf darwin woe32 dos
 #   CP950                       woe32 dos
 #   CP1046                      aix
 #   CP1124                      aix
 #   CP1125                      dos
 #   CP1129                      aix
 #   CP1131                      darwin
 #   CP1250                      woe32
 #   CP1251                      glibc solaris netbsd openbsd darwin woe32
 #   CP1252                      aix woe32
@ -82,15 +83,17 @@
 #   EUC-KR                  Y   glibc aix hpux irix osf solaris freebsd netbsd darwin
 #   EUC-TW                      glibc aix hpux irix osf solaris netbsd
 #   BIG5                    Y   glibc aix hpux osf solaris freebsd netbsd darwin
-#   BIG5-HKSCS                  glibc solaris
+#   BIG5-HKSCS                  glibc solaris darwin
-#   GBK                         glibc aix osf solaris woe32 dos
+#   GBK                         glibc aix osf solaris darwin woe32 dos
-#   GB18030                     glibc solaris netbsd
+#   GB18030                     glibc solaris netbsd darwin
 #   SHIFT_JIS               Y   hpux osf solaris freebsd netbsd darwin
 #   JOHAB                       glibc solaris woe32
 #   TIS-620                     glibc aix hpux osf solaris
 #   VISCII                  Y   glibc
 #   TCVN5712-1                  glibc
 #   ARMSCII-8                   glibc darwin
 #   GEORGIAN-PS                 glibc
 #   PT154                       glibc
 #   HP-ROMAN8                   hpux
 #   HP-ARABIC8                  hpux
 #   HP-GREEK8                   hpux
@ -449,7 +452,8 @@ case "$os" in
 	echo "ko_KR.EUC EUC-KR"
 	;;
    darwin*)
-	# Darwin 7.5 has nl_langinfo(CODESET), but it is useless:
+	# Darwin 7.5 has nl_langinfo(CODESET), but sometimes its value is
 	# useless:
 	# - It returns the empty string when LANG is set to a locale of the
 	#   form ll_CC, although ll_CC/LC_CTYPE is a symlink to an UTF-8
 	#   LC_CTYPE file.
@ -476,6 +480,36 @@ case "$os" in
 	# minimize the use of decomposed Unicode. Unfortunately, through the
 	# Darwin file system, decomposed UTF-8 strings are leaked into user
 	# space nevertheless.
 	# Then there are also the locales with encodings other than US-ASCII
 	# and UTF-8. These locales can be occasionally useful to users (e.g.
 	# when grepping through ISO-8859-1 encoded text files), when all their
 	# file names are in US-ASCII.
 	echo "ISO8859-1 ISO-8859-1"
 	echo "ISO8859-2 ISO-8859-2"
 	echo "ISO8859-4 ISO-8859-4"
 	echo "ISO8859-5 ISO-8859-5"
 	echo "ISO8859-7 ISO-8859-7"
 	echo "ISO8859-9 ISO-8859-9"
 	echo "ISO8859-13 ISO-8859-13"
 	echo "ISO8859-15 ISO-8859-15"
 	echo "KOI8-R KOI8-R"
 	echo "KOI8-U KOI8-U"
 	echo "CP866 CP866"
 	echo "CP949 CP949"
 	echo "CP1131 CP1131"
 	echo "CP1251 CP1251"
 	echo "eucCN GB2312"
 	echo "GB2312 GB2312"
 	echo "eucJP EUC-JP"
 	echo "eucKR EUC-KR"
 	echo "Big5 BIG5"
 	echo "Big5HKSCS BIG5-HKSCS"
 	echo "GBK GBK"
 	echo "GB18030 GB18030"
 	echo "SJIS SHIFT_JIS"
 	echo "ARMSCII-8 ARMSCII-8"
 	echo "PT154 PT154"
 	#echo "ISCII-DEV ?"
 	echo "* UTF-8"
 	;;
    beos* | haiku*)
--- a/lib/flock.c
+++ b/lib/flock.c
@ -0,0 +1,222 @@
 /* Emulate flock on platforms that lack it, primarily Windows and MinGW.
   This is derived from sqlite3 sources.
   http://www.sqlite.org/cvstrac/rlog?f=sqlite/src/os_win.c
   http://www.sqlite.org/copyright.html
   Written by Richard W.M. Jones <rjones.at.redhat.com>
   Copyright (C) 2008 Free Software Foundation, Inc.
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
   License as published by the Free Software Foundation; either
   version 2.1 of the License, or (at your option) any later version.
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   Lesser General Public License for more details.
   You should have received a copy of the GNU Lesser General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 #include <sys/file.h>
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 /* _get_osfhandle */
 #include <io.h>
 /* LockFileEx */
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <errno.h>
 /* Determine the current size of a file.  Because the other braindead
 * APIs we'll call need lower/upper 32 bit pairs, keep the file size
 * like that too.
 */
 static BOOL
 file_size (HANDLE h, DWORD * lower, DWORD * upper)
 {
  *lower = GetFileSize (h, upper);
  return 1;
 }
 /* LOCKFILE_FAIL_IMMEDIATELY is undefined on some Windows systems. */
 #ifndef LOCKFILE_FAIL_IMMEDIATELY
 # define LOCKFILE_FAIL_IMMEDIATELY 1
 #endif
 /* Acquire a lock. */
 static BOOL
 do_lock (HANDLE h, int non_blocking, int exclusive)
 {
  BOOL res;
  DWORD size_lower, size_upper;
  OVERLAPPED ovlp;
  int flags = 0;
  /* We're going to lock the whole file, so get the file size. */
  res = file_size (h, &size_lower, &size_upper);
  if (!res)
    return 0;
  /* Start offset is 0, and also zero the remaining members of this struct. */
  memset (&ovlp, 0, sizeof ovlp);
  if (non_blocking)
    flags |= LOCKFILE_FAIL_IMMEDIATELY;
  if (exclusive)
    flags |= LOCKFILE_EXCLUSIVE_LOCK;
  return LockFileEx (h, flags, 0, size_lower, size_upper, &ovlp);
 }
 /* Unlock reader or exclusive lock. */
 static BOOL
 do_unlock (HANDLE h)
 {
  int res;
  DWORD size_lower, size_upper;
  res = file_size (h, &size_lower, &size_upper);
  if (!res)
    return 0;
  return UnlockFile (h, 0, 0, size_lower, size_upper);
 }
 /* Now our BSD-like flock operation. */
 int
 flock (int fd, int operation)
 {
  HANDLE h = (HANDLE) _get_osfhandle (fd);
  DWORD res;
  int non_blocking;
  if (h == INVALID_HANDLE_VALUE)
    {
      errno = EBADF;
      return -1;
    }
  non_blocking = operation & LOCK_NB;
  operation &= ~LOCK_NB;
  switch (operation)
    {
    case LOCK_SH:
      res = do_lock (h, non_blocking, 0);
      break;
    case LOCK_EX:
      res = do_lock (h, non_blocking, 1);
      break;
    case LOCK_UN:
      res = do_unlock (h);
      break;
    default:
      errno = EINVAL;
      return -1;
    }
  /* Map Windows errors into Unix errnos.  As usual MSDN fails to
   * document the permissible error codes.
   */
  if (!res)
    {
      DWORD err = GetLastError ();
      switch (err)
 	{
 	  /* This means someone else is holding a lock. */
 	case ERROR_LOCK_VIOLATION:
 	  errno = EAGAIN;
 	  break;
 	  /* Out of memory. */
 	case ERROR_NOT_ENOUGH_MEMORY:
 	  errno = ENOMEM;
 	  break;
 	case ERROR_BAD_COMMAND:
 	  errno = EINVAL;
 	  break;
 	  /* Unlikely to be other errors, but at least don't lose the
 	   * error code.
 	   */
 	default:
 	  errno = err;
 	}
      return -1;
    }
  return 0;
 }
 #else /* !Windows */
 #ifdef HAVE_STRUCT_FLOCK_L_TYPE
 /* We know how to implement flock in terms of fcntl. */
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <errno.h>
 #include <string.h>
 int
 flock (int fd, int operation)
 {
  int cmd, r;
  struct flock fl;
  if (operation & LOCK_NB)
    cmd = F_SETLK;
  else
    cmd = F_SETLKW;
  operation &= ~LOCK_NB;
  memset (&fl, 0, sizeof fl);
  fl.l_whence = SEEK_SET;
  /* l_start & l_len are 0, which as a special case means "whole file". */
  switch (operation)
    {
    case LOCK_SH:
      fl.l_type = F_RDLCK;
      break;
    case LOCK_EX:
      fl.l_type = F_WRLCK;
      break;
    case LOCK_UN:
      fl.l_type = F_UNLCK;
      break;
    default:
      errno = EINVAL;
      return -1;
    }
  r = fcntl (fd, cmd, &fl);
  if (r == -1 && errno == EACCES)
    errno = EAGAIN;
  return r;
 }
 #else /* !HAVE_STRUCT_FLOCK_L_TYPE */
 #error "This platform lacks flock function, and Gnulib doesn't provide a replacement. This is a bug in Gnulib."
 #endif /* !HAVE_STRUCT_FLOCK_L_TYPE */
 #endif /* !Windows */
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@ -1,6 +1,6 @@
 /* Determine a canonical name for the current locale's character encoding.
-   Copyright (C) 2000-2006, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2000-2006, 2008-2009 Free Software Foundation, Inc.
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published by
@ -28,6 +28,10 @@
 #include <string.h>
 #include <stdlib.h>
 #if defined __APPLE__ && defined __MACH__ && HAVE_LANGINFO_CODESET
 # define DARWIN7 /* Darwin 7 or newer, i.e. MacOS X 10.3 or newer */
 #endif
 #if defined _WIN32 || defined __WIN32__
 # define WIN32_NATIVE
 #endif
@ -112,7 +116,7 @@ get_charset_aliases (void)
  cp = charset_aliases;
  if (cp == NULL)
    {
-#if !(defined VMS || defined WIN32_NATIVE || defined __CYGWIN__)
+#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__)
      FILE *fp;
      const char *dir;
      const char *base = "charset.alias";
@ -213,6 +217,39 @@ get_charset_aliases (void)
 #else
 # if defined DARWIN7
      /* To avoid the trouble of installing a file that is shared by many
 	 GNU packages -- many packaging systems have problems with this --,
 	 simply inline the aliases here.  */
      cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
 	   "ISO8859-2" "\0" "ISO-8859-2" "\0"
 	   "ISO8859-4" "\0" "ISO-8859-4" "\0"
 	   "ISO8859-5" "\0" "ISO-8859-5" "\0"
 	   "ISO8859-7" "\0" "ISO-8859-7" "\0"
 	   "ISO8859-9" "\0" "ISO-8859-9" "\0"
 	   "ISO8859-13" "\0" "ISO-8859-13" "\0"
 	   "ISO8859-15" "\0" "ISO-8859-15" "\0"
 	   "KOI8-R" "\0" "KOI8-R" "\0"
 	   "KOI8-U" "\0" "KOI8-U" "\0"
 	   "CP866" "\0" "CP866" "\0"
 	   "CP949" "\0" "CP949" "\0"
 	   "CP1131" "\0" "CP1131" "\0"
 	   "CP1251" "\0" "CP1251" "\0"
 	   "eucCN" "\0" "GB2312" "\0"
 	   "GB2312" "\0" "GB2312" "\0"
 	   "eucJP" "\0" "EUC-JP" "\0"
 	   "eucKR" "\0" "EUC-KR" "\0"
 	   "Big5" "\0" "BIG5" "\0"
 	   "Big5HKSCS" "\0" "BIG5-HKSCS" "\0"
 	   "GBK" "\0" "GBK" "\0"
 	   "GB18030" "\0" "GB18030" "\0"
 	   "SJIS" "\0" "SHIFT_JIS" "\0"
 	   "ARMSCII-8" "\0" "ARMSCII-8" "\0"
 	   "PT154" "\0" "PT154" "\0"
 	 /*"ISCII-DEV" "\0" "?" "\0"*/
 	   "*" "\0" "UTF-8" "\0";
 # endif
 # if defined VMS
      /* To avoid the troubles of an extra file charset.alias_vms in the
 	 sources of many GNU packages, simply inline the aliases here.  */
--- a/lib/malloc.c
+++ b/lib/malloc.c
@ -0,0 +1,57 @@
 /* malloc() function that is glibc compatible.
   Copyright (C) 1997, 1998, 2006, 2007 Free Software Foundation, Inc.
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2, or (at your option)
   any later version.
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License for more details.
   You should have received a copy of the GNU Lesser General Public License
   along with this program; if not, write to the Free Software Foundation,
   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 /* written by Jim Meyering and Bruno Haible */
 #include <config.h>
 /* Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h.  */
 #ifdef malloc
 # define NEED_MALLOC_GNU
 # undef malloc
 #endif
 /* Specification.  */
 #include <stdlib.h>
 #include <errno.h>
 /* Call the system's malloc below.  */
 #undef malloc
 /* Allocate an N-byte block of memory from the heap.
   If N is zero, allocate a 1-byte block.  */
 void *
 rpl_malloc (size_t n)
 {
  void *result;
 #ifdef NEED_MALLOC_GNU
  if (n == 0)
    n = 1;
 #endif
  result = malloc (n);
 #if !HAVE_MALLOC_POSIX
  if (result == NULL)
    errno = ENOMEM;
 #endif
  return result;
 }
--- a/lib/mbrtowc.c
+++ b/lib/mbrtowc.c
@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 1999-2002, 2005-2008 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2005-2009 Free Software Foundation, Inc.
   Written by Bruno Haible <bruno@clisp.org>, 2008.
   This program is free software: you can redistribute it and/or modify
@ -89,7 +89,7 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 	return (size_t)(-1);
      }
-    /* Here 0 < m ≤ 4.  */
+    /* Here m > 0.  */
 # if __GLIBC__
    /* Work around bug <http://sourceware.org/bugzilla/show_bug.cgi?id=9674> */
@ -118,7 +118,7 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 	 lack mbrtowc(), we use the second approach.
 	 The possible encodings are:
 	   - 8-bit encodings,
-	   - EUC-JP, EUC-KR, GB2312, EUC-TW, BIG5, SJIS,
+	   - EUC-JP, EUC-KR, GB2312, EUC-TW, BIG5, GB18030, SJIS,
 	   - UTF-8.
 	 Use specialized code for each.  */
      if (m >= 4 || m >= MB_CUR_MAX)
@ -238,6 +238,39 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 	      }
 	    goto invalid;
 	  }
 	if (STREQ (encoding, "GB18030", 'G', 'B', '1', '8', '0', '3', '0', 0, 0))
 	  {
 	    if (m == 1)
 	      {
 		unsigned char c = (unsigned char) p[0];
 		if ((c >= 0x90 && c <= 0xe3) || (c >= 0xf8 && c <= 0xfe))
 		  goto incomplete;
 	      }
 	    else /* m == 2 || m == 3 */
 	      {
 		unsigned char c = (unsigned char) p[0];
 		if (c >= 0x90 && c <= 0xe3)
 		  {
 		    unsigned char c2 = (unsigned char) p[1];
 		    if (c2 >= 0x30 && c2 <= 0x39)
 		      {
 			if (m == 2)
 			  goto incomplete;
 			else /* m == 3 */
 			  {
 			    unsigned char c3 = (unsigned char) p[2];
 			    if (c3 >= 0x81 && c3 <= 0xfe)
 			      goto incomplete;
 			  }
 		      }
 		  }
 	      }
 	    goto invalid;
 	  }
 	if (STREQ (encoding, "SJIS", 'S', 'J', 'I', 'S', 0, 0, 0, 0, 0))
 	  {
 	    if (m == 1)
@ -258,10 +291,14 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
     incomplete:
      {
 	size_t k = nstate;
-	/* Here 0 < k < m < 4.  */
+	/* Here 0 <= k < m < 4.  */
 	pstate[++k] = s[0];
 	if (k < m)
-	  pstate[++k] = s[1];
+	  {
 	    pstate[++k] = s[1];
 	    if (k < m)
 	      pstate[++k] = s[2];
 	  }
 	if (k != m)
 	  abort ();
      }
--- a/lib/putenv.c
+++ b/lib/putenv.c
@ -0,0 +1,132 @@
 /* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2008
   Free Software Foundation, Inc.
   NOTE: The canonical source of this file is maintained with the GNU C
   Library.  Bugs can be reported to bug-glibc@prep.ai.mit.edu.
   This program is free software: you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by the
   Free Software Foundation; either version 3 of the License, or any
   later version.
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License for more details.
   You should have received a copy of the GNU Lesser General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 /* Specification.  */
 #include <stdlib.h>
 #include <stddef.h>
 /* Include errno.h *after* sys/types.h to work around header problems
   on AIX 3.2.5.  */
 #include <errno.h>
 #ifndef __set_errno
 # define __set_errno(ev) ((errno) = (ev))
 #endif
 #include <string.h>
 #include <unistd.h>
 #if HAVE_GNU_LD
 # define environ __environ
 #else
 extern char **environ;
 #endif
 #if _LIBC
 /* This lock protects against simultaneous modifications of `environ'.  */
 # include <bits/libc-lock.h>
 __libc_lock_define_initialized (static, envlock)
 # define LOCK	__libc_lock_lock (envlock)
 # define UNLOCK	__libc_lock_unlock (envlock)
 #else
 # define LOCK
 # define UNLOCK
 #endif
 static int
 _unsetenv (const char *name)
 {
  size_t len;
  char **ep;
  if (name == NULL || *name == '\0' || strchr (name, '=') != NULL)
    {
      __set_errno (EINVAL);
      return -1;
    }
  len = strlen (name);
  LOCK;
  ep = environ;
  while (*ep != NULL)
    if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
      {
 	/* Found it.  Remove this pointer by moving later ones back.  */
 	char **dp = ep;
 	do
 	  dp[0] = dp[1];
 	while (*dp++);
 	/* Continue the loop in case NAME appears again.  */
      }
    else
      ++ep;
  UNLOCK;
  return 0;
 }
 /* Put STRING, which is of the form "NAME=VALUE", in the environment.
   If STRING contains no `=', then remove STRING from the environment.  */
 int
 putenv (char *string)
 {
  const char *const name_end = strchr (string, '=');
  register size_t size;
  register char **ep;
  if (name_end == NULL)
    {
      /* Remove the variable from the environment.  */
      return _unsetenv (string);
    }
  size = 0;
  for (ep = environ; *ep != NULL; ++ep)
    if (!strncmp (*ep, string, name_end - string) &&
 	(*ep)[name_end - string] == '=')
      break;
    else
      ++size;
  if (*ep == NULL)
    {
      static char **last_environ = NULL;
      char **new_environ = (char **) malloc ((size + 2) * sizeof (char *));
      if (new_environ == NULL)
 	return -1;
      (void) memcpy ((void *) new_environ, (void *) environ,
 		     size * sizeof (char *));
      new_environ[size] = (char *) string;
      new_environ[size + 1] = NULL;
      free (last_environ);
      last_environ = new_environ;
      environ = new_environ;
    }
  else
    *ep = string;
  return 0;
 }
--- a/lib/stdint.in.h
+++ b/lib/stdint.in.h
@ -0,0 +1,567 @@
 /* Copyright (C) 2001-2002, 2004-2009 Free Software Foundation, Inc.
   Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
   This file is part of gnulib.
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2, or (at your option)
   any later version.
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License for more details.
   You should have received a copy of the GNU Lesser General Public License
   along with this program; if not, write to the Free Software Foundation,
   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 /*
 * ISO C 99 <stdint.h> for platforms that lack it.
 * <http://www.opengroup.org/susv3xbd/stdint.h.html>
 */
 #ifndef _GL_STDINT_H
 /* When including a system file that in turn includes <inttypes.h>,
   use the system <inttypes.h>, not our substitute.  This avoids
   problems with (for example) VMS, whose <sys/bitypes.h> includes
   <inttypes.h>.  */
 #define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
 /* Get those types that are already defined in other system include
   files, so that we can "#define int8_t signed char" below without
   worrying about a later system include file containing a "typedef
   signed char int8_t;" that will get messed up by our macro.  Our
   macros should all be consistent with the system versions, except
   for the "fast" types and macros, which we recommend against using
   in public interfaces due to compiler differences.  */
 #if @HAVE_STDINT_H@
 # if defined __sgi && ! defined __c99
   /* Bypass IRIX's <stdint.h> if in C89 mode, since it merely annoys users
      with "This header file is to be used only for c99 mode compilations"
      diagnostics.  */
 #  define __STDINT_H__
 # endif
  /* Other systems may have an incomplete or buggy <stdint.h>.
     Include it before <inttypes.h>, since any "#include <stdint.h>"
     in <inttypes.h> would reinclude us, skipping our contents because
     _GL_STDINT_H is defined.
     The include_next requires a split double-inclusion guard.  */
 # if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
 # endif
 # @INCLUDE_NEXT@ @NEXT_STDINT_H@
 #endif
 #if ! defined _GL_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H
 #define _GL_STDINT_H
 /* <sys/types.h> defines some of the stdint.h types as well, on glibc,
   IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>).
   AIX 5.2 <sys/types.h> isn't needed and causes troubles.
   MacOS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
   relies on the system <stdint.h> definitions, so include
   <sys/types.h> after @NEXT_STDINT_H@.  */
 #if @HAVE_SYS_TYPES_H@ && ! defined _AIX
 # include <sys/types.h>
 #endif
 /* Get LONG_MIN, LONG_MAX, ULONG_MAX.  */
 #include <limits.h>
 #if @HAVE_INTTYPES_H@
  /* In OpenBSD 3.8, <inttypes.h> includes <machine/types.h>, which defines
     int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__.
     <inttypes.h> also defines intptr_t and uintptr_t.  */
 # include <inttypes.h>
 #elif @HAVE_SYS_INTTYPES_H@
  /* Solaris 7 <sys/inttypes.h> has the types except the *_fast*_t types, and
     the macros except for *_FAST*_*, INTPTR_MIN, PTRDIFF_MIN, PTRDIFF_MAX.  */
 # include <sys/inttypes.h>
 #endif
 #if @HAVE_SYS_BITYPES_H@ && ! 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>.  */
 # include <sys/bitypes.h>
 #endif
 #undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
 /* Minimum and maximum values for a integer type under the usual assumption.
   Return an unspecified value if BITS == 0, adding a check to pacify
   picky compilers.  */
 #define _STDINT_MIN(signed, bits, zero) \
  ((signed) ? (- ((zero) + 1) << ((bits) ? (bits) - 1 : 0)) : (zero))
 #define _STDINT_MAX(signed, bits, zero) \
  ((signed) \
   ? ~ _STDINT_MIN (signed, bits, zero) \
   : /* The expression for the unsigned case.  The subtraction of (signed) \
 	is a nop in the unsigned case and avoids "signed integer overflow" \
 	warnings in the signed case.  */ \
     ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
 /* 7.18.1.1. Exact-width integer types */
 /* Here we assume a standard architecture where the hardware integer
   types have 8, 16, 32, optionally 64 bits.  */
 #undef int8_t
 #undef uint8_t
 typedef signed char gl_int8_t;
 typedef unsigned char gl_uint8_t;
 #define int8_t gl_int8_t
 #define uint8_t gl_uint8_t
 #undef int16_t
 #undef uint16_t
 typedef short int gl_int16_t;
 typedef unsigned short int gl_uint16_t;
 #define int16_t gl_int16_t
 #define uint16_t gl_uint16_t
 #undef int32_t
 #undef uint32_t
 typedef int gl_int32_t;
 typedef unsigned int gl_uint32_t;
 #define int32_t gl_int32_t
 #define uint32_t gl_uint32_t
 /* Do not undefine int64_t if gnulib is not being used with 64-bit
   types, since otherwise it breaks platforms like Tandem/NSK.  */
 #if LONG_MAX >> 31 >> 31 == 1
 # undef int64_t
 typedef long int gl_int64_t;
 # define int64_t gl_int64_t
 # define GL_INT64_T
 #elif defined _MSC_VER
 # undef int64_t
 typedef __int64 gl_int64_t;
 # define int64_t gl_int64_t
 # define GL_INT64_T
 #elif @HAVE_LONG_LONG_INT@
 # undef int64_t
 typedef long long int gl_int64_t;
 # define int64_t gl_int64_t
 # define GL_INT64_T
 #endif
 #if ULONG_MAX >> 31 >> 31 >> 1 == 1
 # undef uint64_t
 typedef unsigned long int gl_uint64_t;
 # define uint64_t gl_uint64_t
 # define GL_UINT64_T
 #elif defined _MSC_VER
 # undef uint64_t
 typedef unsigned __int64 gl_uint64_t;
 # define uint64_t gl_uint64_t
 # define GL_UINT64_T
 #elif @HAVE_UNSIGNED_LONG_LONG_INT@
 # undef uint64_t
 typedef unsigned long long int gl_uint64_t;
 # define uint64_t gl_uint64_t
 # define GL_UINT64_T
 #endif
 /* Avoid collision with Solaris 2.5.1 <pthread.h> etc.  */
 #define _UINT8_T
 #define _UINT32_T
 #define _UINT64_T
 /* 7.18.1.2. Minimum-width integer types */
 /* Here we assume a standard architecture where the hardware integer
   types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types
   are the same as the corresponding N_t types.  */
 #undef int_least8_t
 #undef uint_least8_t
 #undef int_least16_t
 #undef uint_least16_t
 #undef int_least32_t
 #undef uint_least32_t
 #undef int_least64_t
 #undef uint_least64_t
 #define int_least8_t int8_t
 #define uint_least8_t uint8_t
 #define int_least16_t int16_t
 #define uint_least16_t uint16_t
 #define int_least32_t int32_t
 #define uint_least32_t uint32_t
 #ifdef GL_INT64_T
 # define int_least64_t int64_t
 #endif
 #ifdef GL_UINT64_T
 # define uint_least64_t uint64_t
 #endif
 /* 7.18.1.3. Fastest minimum-width integer types */
 /* Note: Other <stdint.h> substitutes may define these types differently.
   It is not recommended to use these types in public header files. */
 /* Here we assume a standard architecture where the hardware integer
   types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types
   are taken from the same list of types.  Assume that 'long int'
   is fast enough for all narrower integers.  */
 #undef int_fast8_t
 #undef uint_fast8_t
 #undef int_fast16_t
 #undef uint_fast16_t
 #undef int_fast32_t
 #undef uint_fast32_t
 #undef int_fast64_t
 #undef uint_fast64_t
 typedef long int gl_int_fast8_t;
 typedef unsigned long int gl_uint_fast8_t;
 typedef long int gl_int_fast16_t;
 typedef unsigned long int gl_uint_fast16_t;
 typedef long int gl_int_fast32_t;
 typedef unsigned long int gl_uint_fast32_t;
 #define int_fast8_t gl_int_fast8_t
 #define uint_fast8_t gl_uint_fast8_t
 #define int_fast16_t gl_int_fast16_t
 #define uint_fast16_t gl_uint_fast16_t
 #define int_fast32_t gl_int_fast32_t
 #define uint_fast32_t gl_uint_fast32_t
 #ifdef GL_INT64_T
 # define int_fast64_t int64_t
 #endif
 #ifdef GL_UINT64_T
 # define uint_fast64_t uint64_t
 #endif
 /* 7.18.1.4. Integer types capable of holding object pointers */
 #undef intptr_t
 #undef uintptr_t
 typedef long int gl_intptr_t;
 typedef unsigned long int gl_uintptr_t;
 #define intptr_t gl_intptr_t
 #define uintptr_t gl_uintptr_t
 /* 7.18.1.5. Greatest-width integer types */
 /* Note: These types are compiler dependent. It may be unwise to use them in
   public header files. */
 #undef intmax_t
 #if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
 typedef long long int gl_intmax_t;
 # define intmax_t gl_intmax_t
 #elif defined GL_INT64_T
 # define intmax_t int64_t
 #else
 typedef long int gl_intmax_t;
 # define intmax_t gl_intmax_t
 #endif
 #undef uintmax_t
 #if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
 typedef unsigned long long int gl_uintmax_t;
 # define uintmax_t gl_uintmax_t
 #elif defined GL_UINT64_T
 # define uintmax_t uint64_t
 #else
 typedef unsigned long int gl_uintmax_t;
 # define uintmax_t gl_uintmax_t
 #endif
 /* Verify that intmax_t and uintmax_t have the same size.  Too much code
   breaks if this is not the case.  If this check fails, the reason is likely
   to be found in the autoconf macros.  */
 typedef int _verify_intmax_size[2 * (sizeof (intmax_t) == sizeof (uintmax_t)) - 1];
 /* 7.18.2. Limits of specified-width integer types */
 #if ! defined __cplusplus || defined __STDC_LIMIT_MACROS
 /* 7.18.2.1. Limits of exact-width integer types */
 /* Here we assume a standard architecture where the hardware integer
   types have 8, 16, 32, optionally 64 bits.  */
 #undef INT8_MIN
 #undef INT8_MAX
 #undef UINT8_MAX
 #define INT8_MIN  (~ INT8_MAX)
 #define INT8_MAX  127
 #define UINT8_MAX  255
 #undef INT16_MIN
 #undef INT16_MAX
 #undef UINT16_MAX
 #define INT16_MIN  (~ INT16_MAX)
 #define INT16_MAX  32767
 #define UINT16_MAX  65535
 #undef INT32_MIN
 #undef INT32_MAX
 #undef UINT32_MAX
 #define INT32_MIN  (~ INT32_MAX)
 #define INT32_MAX  2147483647
 #define UINT32_MAX  4294967295U
 #undef INT64_MIN
 #undef INT64_MAX
 #ifdef GL_INT64_T
 /* Prefer (- INTMAX_C (1) << 63) over (~ INT64_MAX) because SunPRO C 5.0
   evaluates the latter incorrectly in preprocessor expressions.  */
 # define INT64_MIN  (- INTMAX_C (1) << 63)
 # define INT64_MAX  INTMAX_C (9223372036854775807)
 #endif
 #undef UINT64_MAX
 #ifdef GL_UINT64_T
 # define UINT64_MAX  UINTMAX_C (18446744073709551615)
 #endif
 /* 7.18.2.2. Limits of minimum-width integer types */
 /* Here we assume a standard architecture where the hardware integer
   types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types
   are the same as the corresponding N_t types.  */
 #undef INT_LEAST8_MIN
 #undef INT_LEAST8_MAX
 #undef UINT_LEAST8_MAX
 #define INT_LEAST8_MIN  INT8_MIN
 #define INT_LEAST8_MAX  INT8_MAX
 #define UINT_LEAST8_MAX  UINT8_MAX
 #undef INT_LEAST16_MIN
 #undef INT_LEAST16_MAX
 #undef UINT_LEAST16_MAX
 #define INT_LEAST16_MIN  INT16_MIN
 #define INT_LEAST16_MAX  INT16_MAX
 #define UINT_LEAST16_MAX  UINT16_MAX
 #undef INT_LEAST32_MIN
 #undef INT_LEAST32_MAX
 #undef UINT_LEAST32_MAX
 #define INT_LEAST32_MIN  INT32_MIN
 #define INT_LEAST32_MAX  INT32_MAX
 #define UINT_LEAST32_MAX  UINT32_MAX
 #undef INT_LEAST64_MIN
 #undef INT_LEAST64_MAX
 #ifdef GL_INT64_T
 # define INT_LEAST64_MIN  INT64_MIN
 # define INT_LEAST64_MAX  INT64_MAX
 #endif
 #undef UINT_LEAST64_MAX
 #ifdef GL_UINT64_T
 # define UINT_LEAST64_MAX  UINT64_MAX
 #endif
 /* 7.18.2.3. Limits of fastest minimum-width integer types */
 /* Here we assume a standard architecture where the hardware integer
   types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types
   are taken from the same list of types.  */
 #undef INT_FAST8_MIN
 #undef INT_FAST8_MAX
 #undef UINT_FAST8_MAX
 #define INT_FAST8_MIN  LONG_MIN
 #define INT_FAST8_MAX  LONG_MAX
 #define UINT_FAST8_MAX  ULONG_MAX
 #undef INT_FAST16_MIN
 #undef INT_FAST16_MAX
 #undef UINT_FAST16_MAX
 #define INT_FAST16_MIN  LONG_MIN
 #define INT_FAST16_MAX  LONG_MAX
 #define UINT_FAST16_MAX  ULONG_MAX
 #undef INT_FAST32_MIN
 #undef INT_FAST32_MAX
 #undef UINT_FAST32_MAX
 #define INT_FAST32_MIN  LONG_MIN
 #define INT_FAST32_MAX  LONG_MAX
 #define UINT_FAST32_MAX  ULONG_MAX
 #undef INT_FAST64_MIN
 #undef INT_FAST64_MAX
 #ifdef GL_INT64_T
 # define INT_FAST64_MIN  INT64_MIN
 # define INT_FAST64_MAX  INT64_MAX
 #endif
 #undef UINT_FAST64_MAX
 #ifdef GL_UINT64_T
 # define UINT_FAST64_MAX  UINT64_MAX
 #endif
 /* 7.18.2.4. Limits of integer types capable of holding object pointers */
 #undef INTPTR_MIN
 #undef INTPTR_MAX
 #undef UINTPTR_MAX
 #define INTPTR_MIN  LONG_MIN
 #define INTPTR_MAX  LONG_MAX
 #define UINTPTR_MAX  ULONG_MAX
 /* 7.18.2.5. Limits of greatest-width integer types */
 #undef INTMAX_MIN
 #undef INTMAX_MAX
 #ifdef INT64_MAX
 # define INTMAX_MIN  INT64_MIN
 # define INTMAX_MAX  INT64_MAX
 #else
 # define INTMAX_MIN  INT32_MIN
 # define INTMAX_MAX  INT32_MAX
 #endif
 #undef UINTMAX_MAX
 #ifdef UINT64_MAX
 # define UINTMAX_MAX  UINT64_MAX
 #else
 # define UINTMAX_MAX  UINT32_MAX
 #endif
 /* 7.18.3. Limits of other integer types */
 /* ptrdiff_t limits */
 #undef PTRDIFF_MIN
 #undef PTRDIFF_MAX
 #if @APPLE_UNIVERSAL_BUILD@
 # ifdef _LP64
 #  define PTRDIFF_MIN  _STDINT_MIN (1, 64, 0l)
 #  define PTRDIFF_MAX  _STDINT_MAX (1, 64, 0l)
 # else
 #  define PTRDIFF_MIN  _STDINT_MIN (1, 32, 0)
 #  define PTRDIFF_MAX  _STDINT_MAX (1, 32, 0)
 # endif
 #else
 # define PTRDIFF_MIN  \
    _STDINT_MIN (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@)
 # define PTRDIFF_MAX  \
    _STDINT_MAX (1, @BITSIZEOF_PTRDIFF_T@, 0@PTRDIFF_T_SUFFIX@)
 #endif
 /* sig_atomic_t limits */
 #undef SIG_ATOMIC_MIN
 #undef SIG_ATOMIC_MAX
 #define SIG_ATOMIC_MIN  \
   _STDINT_MIN (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \
 		0@SIG_ATOMIC_T_SUFFIX@)
 #define SIG_ATOMIC_MAX  \
   _STDINT_MAX (@HAVE_SIGNED_SIG_ATOMIC_T@, @BITSIZEOF_SIG_ATOMIC_T@, \
 		0@SIG_ATOMIC_T_SUFFIX@)
 /* size_t limit */
 #undef SIZE_MAX
 #if @APPLE_UNIVERSAL_BUILD@
 # ifdef _LP64
 #  define SIZE_MAX  _STDINT_MAX (0, 64, 0ul)
 # else
 #  define SIZE_MAX  _STDINT_MAX (0, 32, 0ul)
 # endif
 #else
 # define SIZE_MAX  _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@)
 #endif
 /* wchar_t limits */
 /* Get WCHAR_MIN, WCHAR_MAX.
   This include is not on the top, above, because on OSF/1 4.0 we have a sequence of nested
   includes <wchar.h> -> <stdio.h> -> <getopt.h> -> <stdlib.h>, and the latter includes
   <stdint.h> and assumes its types are already defined.  */
 #if ! (defined WCHAR_MIN && defined WCHAR_MAX)
 # define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
 # include <wchar.h>
 # undef _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
 #endif
 #undef WCHAR_MIN
 #undef WCHAR_MAX
 #define WCHAR_MIN  \
   _STDINT_MIN (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@)
 #define WCHAR_MAX  \
   _STDINT_MAX (@HAVE_SIGNED_WCHAR_T@, @BITSIZEOF_WCHAR_T@, 0@WCHAR_T_SUFFIX@)
 /* wint_t limits */
 #undef WINT_MIN
 #undef WINT_MAX
 #define WINT_MIN  \
   _STDINT_MIN (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
 #define WINT_MAX  \
   _STDINT_MAX (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
 #endif /* !defined __cplusplus || defined __STDC_LIMIT_MACROS */
 /* 7.18.4. Macros for integer constants */
 #if ! defined __cplusplus || defined __STDC_CONSTANT_MACROS
 /* 7.18.4.1. Macros for minimum-width integer constants */
 /* According to ISO C 99 Technical Corrigendum 1 */
 /* Here we assume a standard architecture where the hardware integer
   types have 8, 16, 32, optionally 64 bits, and int is 32 bits.  */
 #undef INT8_C
 #undef UINT8_C
 #define INT8_C(x) x
 #define UINT8_C(x) x
 #undef INT16_C
 #undef UINT16_C
 #define INT16_C(x) x
 #define UINT16_C(x) x
 #undef INT32_C
 #undef UINT32_C
 #define INT32_C(x) x
 #define UINT32_C(x) x ## U
 #undef INT64_C
 #undef UINT64_C
 #if LONG_MAX >> 31 >> 31 == 1
 # define INT64_C(x) x##L
 #elif defined _MSC_VER
 # define INT64_C(x) x##i64
 #elif @HAVE_LONG_LONG_INT@
 # define INT64_C(x) x##LL
 #endif
 #if ULONG_MAX >> 31 >> 31 >> 1 == 1
 # define UINT64_C(x) x##UL
 #elif defined _MSC_VER
 # define UINT64_C(x) x##ui64
 #elif @HAVE_UNSIGNED_LONG_LONG_INT@
 # define UINT64_C(x) x##ULL
 #endif
 /* 7.18.4.2. Macros for greatest-width integer constants */
 #undef INTMAX_C
 #if @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
 # define INTMAX_C(x)   x##LL
 #elif defined GL_INT64_T
 # define INTMAX_C(x)   INT64_C(x)
 #else
 # define INTMAX_C(x)   x##L
 #endif
 #undef UINTMAX_C
 #if @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
 # define UINTMAX_C(x)  x##ULL
 #elif defined GL_UINT64_T
 # define UINTMAX_C(x)  UINT64_C(x)
 #else
 # define UINTMAX_C(x)  x##UL
 #endif
 #endif /* !defined __cplusplus || defined __STDC_CONSTANT_MACROS */
 #endif /* _GL_STDINT_H */
 #endif /* !defined _GL_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
--- a/lib/stdlib.in.h
+++ b/lib/stdlib.in.h
@ -0,0 +1,383 @@
 /* A GNU-like <stdlib.h>.
   Copyright (C) 1995, 2001-2004, 2006-2009 Free Software Foundation, Inc.
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 3 of the License, or
   (at your option) any later version.
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License for more details.
   You should have received a copy of the GNU Lesser General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
 #endif
 #if defined __need_malloc_and_calloc
 /* Special invocation convention inside glibc header files.  */
 #@INCLUDE_NEXT@ @NEXT_STDLIB_H@
 #else
 /* Normal invocation convention.  */
 #ifndef _GL_STDLIB_H
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_STDLIB_H@
 #ifndef _GL_STDLIB_H
 #define _GL_STDLIB_H
 /* Solaris declares getloadavg() in <sys/loadavg.h>.  */
 #if @GNULIB_GETLOADAVG@ && @HAVE_SYS_LOADAVG_H@
 # include <sys/loadavg.h>
 #endif
 /* OSF/1 5.1 declares 'struct random_data' in <random.h>, which is included
   from <stdlib.h> if _REENTRANT is defined.  Include it always.  */
 #if @HAVE_RANDOM_H@
 # include <random.h>
 #endif
 #if @GNULIB_RANDOM_R@ || !@HAVE_STRUCT_RANDOM_DATA@
 # include <stdint.h>
 #endif
 #if !@HAVE_STRUCT_RANDOM_DATA@
 struct random_data
 {
  int32_t *fptr;		/* Front pointer.  */
  int32_t *rptr;		/* Rear pointer.  */
  int32_t *state;		/* Array of state values.  */
  int rand_type;		/* Type of random number generator.  */
  int rand_deg;			/* Degree of random number generator.  */
  int rand_sep;			/* Distance between front and rear.  */
  int32_t *end_ptr;		/* Pointer behind state table.  */
 };
 #endif
 /* The definition of GL_LINK_WARNING is copied here.  */
 /* Some systems do not define EXIT_*, despite otherwise supporting C89.  */
 #ifndef EXIT_SUCCESS
 # define EXIT_SUCCESS 0
 #endif
 /* Tandem/NSK and other platforms that define EXIT_FAILURE as -1 interfere
   with proper operation of xargs.  */
 #ifndef EXIT_FAILURE
 # define EXIT_FAILURE 1
 #elif EXIT_FAILURE != 1
 # undef EXIT_FAILURE
 # define EXIT_FAILURE 1
 #endif
 #ifdef __cplusplus
 extern "C" {
 #endif
 #if @GNULIB_MALLOC_POSIX@
 # if !@HAVE_MALLOC_POSIX@
 #  undef malloc
 #  define malloc rpl_malloc
 extern void * malloc (size_t size);
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef malloc
 # define malloc(s) \
    (GL_LINK_WARNING ("malloc is not POSIX compliant everywhere - " \
                      "use gnulib module malloc-posix for portability"), \
     malloc (s))
 #endif
 #if @GNULIB_REALLOC_POSIX@
 # if !@HAVE_REALLOC_POSIX@
 #  undef realloc
 #  define realloc rpl_realloc
 extern void * realloc (void *ptr, size_t size);
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef realloc
 # define realloc(p,s) \
    (GL_LINK_WARNING ("realloc is not POSIX compliant everywhere - " \
                      "use gnulib module realloc-posix for portability"), \
     realloc (p, s))
 #endif
 #if @GNULIB_CALLOC_POSIX@
 # if !@HAVE_CALLOC_POSIX@
 #  undef calloc
 #  define calloc rpl_calloc
 extern void * calloc (size_t nmemb, size_t size);
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef calloc
 # define calloc(n,s) \
    (GL_LINK_WARNING ("calloc is not POSIX compliant everywhere - " \
                      "use gnulib module calloc-posix for portability"), \
     calloc (n, s))
 #endif
 #if @GNULIB_ATOLL@
 # if !@HAVE_ATOLL@
 /* Parse a signed decimal integer.
   Returns the value of the integer.  Errors are not detected.  */
 extern long long atoll (const char *string);
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef atoll
 # define atoll(s) \
    (GL_LINK_WARNING ("atoll is unportable - " \
                      "use gnulib module atoll for portability"), \
     atoll (s))
 #endif
 #if @GNULIB_GETLOADAVG@
 # if !@HAVE_DECL_GETLOADAVG@
 /* Store max(NELEM,3) load average numbers in LOADAVG[].
   The three numbers are the load average of the last 1 minute, the last 5
   minutes, and the last 15 minutes, respectively.
   LOADAVG is an array of NELEM numbers.  */
 extern int getloadavg (double loadavg[], int nelem);
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef getloadavg
 # define getloadavg(l,n) \
    (GL_LINK_WARNING ("getloadavg is not portable - " \
                      "use gnulib module getloadavg for portability"), \
     getloadavg (l, n))
 #endif
 #if @GNULIB_GETSUBOPT@
 /* Assuming *OPTIONP is a comma separated list of elements of the form
   "token" or "token=value", getsubopt parses the first of these elements.
   If the first element refers to a "token" that is member of the given
   NULL-terminated array of tokens:
     - It replaces the comma with a NUL byte, updates *OPTIONP to point past
       the first option and the comma, sets *VALUEP to the value of the
       element (or NULL if it doesn't contain an "=" sign),
     - It returns the index of the "token" in the given array of tokens.
   Otherwise it returns -1, and *OPTIONP and *VALUEP are undefined.
   For more details see the POSIX:2001 specification.
   http://www.opengroup.org/susv3xsh/getsubopt.html */
 # if !@HAVE_GETSUBOPT@
 extern int getsubopt (char **optionp, char *const *tokens, char **valuep);
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef getsubopt
 # define getsubopt(o,t,v) \
    (GL_LINK_WARNING ("getsubopt is unportable - " \
                      "use gnulib module getsubopt for portability"), \
     getsubopt (o, t, v))
 #endif
 #if @GNULIB_MKDTEMP@
 # if !@HAVE_MKDTEMP@
 /* Create a unique temporary directory from TEMPLATE.
   The last six characters of TEMPLATE must be "XXXXXX";
   they are replaced with a string that makes the directory name unique.
   Returns TEMPLATE, or a null pointer if it cannot get a unique name.
   The directory is created mode 700.  */
 extern char * mkdtemp (char * /*template*/);
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef mkdtemp
 # define mkdtemp(t) \
    (GL_LINK_WARNING ("mkdtemp is unportable - " \
                      "use gnulib module mkdtemp for portability"), \
     mkdtemp (t))
 #endif
 #if @GNULIB_MKSTEMP@
 # if @REPLACE_MKSTEMP@
 /* Create a unique temporary file from TEMPLATE.
   The last six characters of TEMPLATE must be "XXXXXX";
   they are replaced with a string that makes the file name unique.
   The file is then created, ensuring it didn't exist before.
   The file is created read-write (mask at least 0600 & ~umask), but it may be
   world-readable and world-writable (mask 0666 & ~umask), depending on the
   implementation.
   Returns the open file descriptor if successful, otherwise -1 and errno
   set.  */
 #  define mkstemp rpl_mkstemp
 extern int mkstemp (char * /*template*/);
 # else
 /* On MacOS X 10.3, only <unistd.h> declares mkstemp.  */
 #  include <unistd.h>
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef mkstemp
 # define mkstemp(t) \
    (GL_LINK_WARNING ("mkstemp is unportable - " \
                      "use gnulib module mkstemp for portability"), \
     mkstemp (t))
 #endif
 #if @GNULIB_PUTENV@
 # if @REPLACE_PUTENV@
 #  undef putenv
 #  define putenv rpl_putenv
 extern int putenv (char *string);
 # endif
 #endif
 #if @GNULIB_RANDOM_R@
 # if !@HAVE_RANDOM_R@
 #  ifndef RAND_MAX
 #   define RAND_MAX 2147483647
 #  endif
 int srandom_r (unsigned int seed, struct random_data *rand_state);
 int initstate_r (unsigned int seed, char *buf, size_t buf_size,
 		 struct random_data *rand_state);
 int setstate_r (char *arg_state, struct random_data *rand_state);
 int random_r (struct random_data *buf, int32_t *result);
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef random_r
 # define random_r(b,r)				  \
    (GL_LINK_WARNING ("random_r is unportable - " \
                      "use gnulib module random_r for portability"), \
     random_r (b,r))
 # undef initstate_r
 # define initstate_r(s,b,sz,r)			     \
    (GL_LINK_WARNING ("initstate_r is unportable - " \
                      "use gnulib module random_r for portability"), \
     initstate_r (s,b,sz,r))
 # undef srandom_r
 # define srandom_r(s,r)				   \
    (GL_LINK_WARNING ("srandom_r is unportable - " \
                      "use gnulib module random_r for portability"), \
     srandom_r (s,r))
 # undef setstate_r
 # define setstate_r(a,r)				    \
    (GL_LINK_WARNING ("setstate_r is unportable - " \
                      "use gnulib module random_r for portability"), \
     setstate_r (a,r))
 #endif
 #if @GNULIB_RPMATCH@
 # if !@HAVE_RPMATCH@
 /* Test a user response to a question.
   Return 1 if it is affirmative, 0 if it is negative, or -1 if not clear.  */
 extern int rpmatch (const char *response);
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef rpmatch
 # define rpmatch(r) \
    (GL_LINK_WARNING ("rpmatch is unportable - " \
                      "use gnulib module rpmatch for portability"), \
     rpmatch (r))
 #endif
 #if @GNULIB_SETENV@
 # if !@HAVE_SETENV@
 /* Set NAME to VALUE in the environment.
   If REPLACE is nonzero, overwrite an existing value.  */
 extern int setenv (const char *name, const char *value, int replace);
 # endif
 #endif
 #if @GNULIB_UNSETENV@
 # if @HAVE_UNSETENV@
 #  if @VOID_UNSETENV@
 /* On some systems, unsetenv() returns void.
   This is the case for MacOS X 10.3, FreeBSD 4.8, NetBSD 1.6, OpenBSD 3.4.  */
 #   define unsetenv(name) ((unsetenv)(name), 0)
 #  endif
 # else
 /* Remove the variable NAME from the environment.  */
 extern int unsetenv (const char *name);
 # endif
 #endif
 #if @GNULIB_STRTOD@
 # if @REPLACE_STRTOD@
 #  define strtod rpl_strtod
 # endif
 # if !@HAVE_STRTOD@ || @REPLACE_STRTOD@
 /* Parse a double from STRING, updating ENDP if appropriate.  */
 extern double strtod (const char *str, char **endp);
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef strtod
 # define strtod(s, e)                           \
    (GL_LINK_WARNING ("strtod is unportable - " \
                      "use gnulib module strtod for portability"), \
     strtod (s, e))
 #endif
 #if @GNULIB_STRTOLL@
 # if !@HAVE_STRTOLL@
 /* Parse a signed integer whose textual representation starts at STRING.
   The integer is expected to be in base BASE (2 <= BASE <= 36); if BASE == 0,
   it may be decimal or octal (with prefix "0") or hexadecimal (with prefix
   "0x").
   If ENDPTR is not NULL, the address of the first byte after the integer is
   stored in *ENDPTR.
   Upon overflow, the return value is LLONG_MAX or LLONG_MIN, and errno is set
   to ERANGE.  */
 extern long long strtoll (const char *string, char **endptr, int base);
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef strtoll
 # define strtoll(s,e,b) \
    (GL_LINK_WARNING ("strtoll is unportable - " \
                      "use gnulib module strtoll for portability"), \
     strtoll (s, e, b))
 #endif
 #if @GNULIB_STRTOULL@
 # if !@HAVE_STRTOULL@
 /* Parse an unsigned integer whose textual representation starts at STRING.
   The integer is expected to be in base BASE (2 <= BASE <= 36); if BASE == 0,
   it may be decimal or octal (with prefix "0") or hexadecimal (with prefix
   "0x").
   If ENDPTR is not NULL, the address of the first byte after the integer is
   stored in *ENDPTR.
   Upon overflow, the return value is ULLONG_MAX, and errno is set to
   ERANGE.  */
 extern unsigned long long strtoull (const char *string, char **endptr, int base);
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef strtoull
 # define strtoull(s,e,b) \
    (GL_LINK_WARNING ("strtoull is unportable - " \
                      "use gnulib module strtoull for portability"), \
     strtoull (s, e, b))
 #endif
 #ifdef __cplusplus
 }
 #endif
 #endif /* _GL_STDLIB_H */
 #endif /* _GL_STDLIB_H */
 #endif
--- a/lib/strftime.c
+++ b/lib/strftime.c
@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 Free Software
+/* Copyright (C) 1991-1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2009 Free Software
   Foundation, Inc.
   NOTE: The canonical source of this file is maintained with the GNU C Library.
@ -18,19 +18,18 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifdef _LIBC
 # define HAVE_MBLEN 1
 # define HAVE_MBRLEN 1
 # define HAVE_STRUCT_ERA_ENTRY 1
 # define HAVE_TM_GMTOFF 1
 # define HAVE_TM_ZONE 1
 # define HAVE_TZNAME 1
 # define HAVE_TZSET 1
 # define MULTIBYTE_IS_FORMAT_SAFE 1
 # include "../locale/localeinfo.h"
 #else
 # include <config.h>
 # if FPRINTFTIME
 #  include "fprintftime.h"
 # else
 #  include "strftime.h"
 # endif
 #endif
@ -44,10 +43,16 @@ extern char *tzname[];
 /* Do multibyte processing if multibytes are supported, unless
   multibyte sequences are safe in formats.  Multibyte sequences are
   safe if they cannot contain byte sequences that look like format
-   conversion specifications.  The GNU C Library uses UTF8 multibyte
+   conversion specifications.  The multibyte encodings used by the
-   encoding, which is safe for formats, but strftime.c can be used
+   C library on the various platforms (UTF-8, GB2312, GBK, CP936,
-   with other C libraries that use unsafe encodings.  */
+   GB18030, EUC-TW, BIG5, BIG5-HKSCS, CP950, EUC-JP, EUC-KR, CP949,
-#define DO_MULTIBYTE (HAVE_MBLEN && ! MULTIBYTE_IS_FORMAT_SAFE)
+   SHIFT_JIS, CP932, JOHAB) are safe for formats, because the byte '%'
   cannot occur in a multibyte character except in the first byte.
   But this does not hold for the DEC-HANYU encoding used on OSF/1.  */
 #if !defined __osf__
 # define MULTIBYTE_IS_FORMAT_SAFE 1
 #endif
 #define DO_MULTIBYTE (! MULTIBYTE_IS_FORMAT_SAFE)
 #if DO_MULTIBYTE
 # include <wchar.h>
@ -79,13 +84,6 @@ extern char *tzname[];
 # define MEMCPY(d, s, n) memcpy (d, s, n)
 # define STRLEN(s) strlen (s)
 # ifdef _LIBC
 #  define MEMPCPY(d, s, n) __mempcpy (d, s, n)
 # else
 #  ifndef HAVE_MEMPCPY
 #   define MEMPCPY(d, s, n) ((void *) ((char *) memcpy (d, s, n) + (n)))
 #  endif
 # endif
 #endif
 /* Shift A right by B bits portably, by dividing A by 2**B and
--- a/lib/sys_file.in.h
+++ b/lib/sys_file.in.h
@ -0,0 +1,60 @@
 /* Provide a more complete sys/file.h.
   Copyright (C) 2007-2008 Free Software Foundation, Inc.
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2, or (at your option)
   any later version.
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU Lesser General Public License for more details.
   You should have received a copy of the GNU Lesser General Public License
   along with this program; if not, write to the Free Software Foundation,
   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 /* Written by Richard W.M. Jones.  */
 #ifndef _GL_SYS_FILE_H
 # if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
 # endif
 /* The include_next requires a split double-inclusion guard.  */
 # if @HAVE_SYS_FILE_H@
 #  @INCLUDE_NEXT@ @NEXT_SYS_FILE_H@
 # endif
 #ifndef _GL_SYS_FILE_H
 #define _GL_SYS_FILE_H
 #if @GNULIB_FLOCK@
 /* Apply or remove advisory locks on an open file.
   Return 0 if successful, otherwise -1 and errno set.  */
 # if !@HAVE_FLOCK@
 extern int flock (int fd, int operation);
 /* Operations for the 'flock' call (same as Linux kernel constants).  */
 #define LOCK_SH 1       /* Shared lock.  */
 #define LOCK_EX 2       /* Exclusive lock.  */
 #define LOCK_UN 8       /* Unlock.  */
 /* Can be OR'd in to one of the above.  */
 #define LOCK_NB 4       /* Don't block when locking.  */
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef flock
 # define flock(fd,op)			       \
    (GL_LINK_WARNING ("flock is unportable - " \
                      "use gnulib module flock for portability"), \
     flock ((fd), (op)))
 #endif
 #endif /* _GL_SYS_FILE_H */
 #endif /* _GL_SYS_FILE_H */
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <unistd.h>.
-   Copyright (C) 2003-2008 Free Software Foundation, Inc.
+   Copyright (C) 2003-2009 Free Software Foundation, Inc.
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published by
@ -29,7 +29,7 @@
 #ifndef _GL_UNISTD_H
 #define _GL_UNISTD_H
-/* mingw doesn't define the SEEK_* macros in <unistd.h>.  */
+/* mingw doesn't define the SEEK_* or *_FILENO macros in <unistd.h>.  */
 #if !(defined SEEK_CUR && defined SEEK_END && defined SEEK_SET)
 # include <stdio.h>
 #endif
@ -87,6 +87,17 @@
 /* The definition of GL_LINK_WARNING is copied here.  */
 /* OS/2 EMX lacks these macros.  */
 #ifndef STDIN_FILENO
 # define STDIN_FILENO 0
 #endif
 #ifndef STDOUT_FILENO
 # define STDOUT_FILENO 1
 #endif
 #ifndef STDERR_FILENO
 # define STDERR_FILENO 2
 #endif
 /* Declare overridden functions.  */
 #ifdef __cplusplus
@ -120,10 +131,6 @@ extern int chown (const char *file, uid_t uid, gid_t gid);
 #if @GNULIB_CLOSE@
 # if @UNISTD_H_HAVE_WINSOCK2_H@
 /* Need a gnulib internal function.  */
 #  define HAVE__GL_CLOSE_FD_MAYBE_SOCKET 1
 # endif
 # if @REPLACE_CLOSE@
 /* Automatically included by modules that need a replacement for close.  */
 #  undef close
@ -475,6 +482,23 @@ extern int lchown (char const *file, uid_t owner, gid_t group);
 #endif
 #if @GNULIB_LINK@
 /* Create a new hard link for an existing file.
   Return 0 if successful, otherwise -1 and errno set.
   See POSIX:2001 specification
   <http://www.opengroup.org/susv3xsh/link.html>.  */
 # if !@HAVE_LINK@
 extern int link (const char *path1, const char *path2);
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef link
 # define link(path1,path2) \
    (GL_LINK_WARNING ("link is unportable - " \
                      "use gnulib module link for portability"), \
     link (path1, path2))
 #endif
 #if @GNULIB_LSEEK@
 # if @REPLACE_LSEEK@
 /* Set the offset of FD relative to SEEK_SET, SEEK_CUR, or SEEK_END.
--- a/lib/wchar.in.h
+++ b/lib/wchar.in.h
@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published by
@ -30,8 +30,18 @@
@PRAGMA_SYSTEM_HEADER@
 #endif
-#ifdef __need_mbstate_t
+#if defined __need_mbstate_t || (defined __hpux && ((defined _INTTYPES_INCLUDED && !defined strtoimax) || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H)) || defined _GL_ALREADY_INCLUDING_WCHAR_H
-/* Special invocation convention inside uClibc header files.  */
+/* Special invocation convention:
   - Inside uClibc header files.
   - On HP-UX 11.00 we have a sequence of nested includes
     <wchar.h> -> <stdlib.h> -> <stdint.h>, and the latter includes <wchar.h>,
     once indirectly <stdint.h> -> <sys/types.h> -> <inttypes.h> -> <wchar.h>
     and once directly.  In both situations 'wint_t' is not yet defined,
     therefore we cannot provide the function overrides; instead include only
     the system's <wchar.h>.
   - On IRIX 6.5, similarly, we have an include <wchar.h> -> <wctype.h>, and
     the latter includes <wchar.h>.  But here, we have no way to detect whether
     <wctype.h> is completely included or is still being included.  */
 #@INCLUDE_NEXT@ @NEXT_WCHAR_H@
@ -40,6 +50,8 @@
 #ifndef _GL_WCHAR_H
 #define _GL_ALREADY_INCLUDING_WCHAR_H
 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
   <wchar.h>.
   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
@ -55,6 +67,8 @@
 # @INCLUDE_NEXT@ @NEXT_WCHAR_H@
 #endif
 #undef _GL_ALREADY_INCLUDING_WCHAR_H
 #ifndef _GL_WCHAR_H
 #define _GL_WCHAR_H
@ -250,7 +264,11 @@ extern size_t wcsrtombs (char *dest, const wchar_t **srcp, size_t len, mbstate_t
 /* Convert a wide string to a string.  */
 #if @GNULIB_WCSNRTOMBS@
-# if !@HAVE_WCSNRTOMBS@
+# if @REPLACE_WCSNRTOMBS@
 #  undef wcsnrtombs
 #  define wcsnrtombs rpl_wcsnrtombs
 # endif
 # if !@HAVE_WCSNRTOMBS@ || @REPLACE_WCSNRTOMBS@
 extern size_t wcsnrtombs (char *dest, const wchar_t **srcp, size_t srclen, size_t len, mbstate_t *ps);
 # endif
 #elif defined GNULIB_POSIXCHECK
--- a/m4/00gnulib.m4
+++ b/m4/00gnulib.m4
@ -0,0 +1,30 @@
 # 00gnulib.m4 serial 2
 dnl Copyright (C) 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl This file must be named something that sorts before all other
 dnl gnulib-provided .m4 files.  It is needed until such time as we can
 dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics.
 # AC_DEFUN_ONCE([NAME], VALUE)
 # ----------------------------
 # Define NAME to expand to VALUE on the first use (whether by direct
 # expansion, or by AC_REQUIRE), and to nothing on all subsequent uses.
 # Avoid bugs in AC_REQUIRE in Autoconf 2.63 and earlier.  This
 # definition is slower than the version in Autoconf 2.64, because it
 # can only use interfaces that existed since 2.59; but it achieves the
 # same effect.  Quoting is necessary to avoid confusing Automake.
 m4_version_prereq([2.63.263], [],
 [m4_define([AC][_DEFUN_ONCE],
  [AC][_DEFUN([$1],
    [AC_REQUIRE([_gl_DEFUN_ONCE([$1])],
      [m4_indir([_gl_DEFUN_ONCE([$1])])])])]dnl
 [AC][_DEFUN([_gl_DEFUN_ONCE([$1])], [$2])])])
 # gl_00GNULIB
 # -----------
 # Witness macro that this file has been included.  Needed to force
 # Automake to include this file prior to all other gnulib .m4 files.
 AC_DEFUN([gl_00GNULIB])
--- a/m4/alloca.m4
+++ b/m4/alloca.m4
@ -1,5 +1,5 @@
-# alloca.m4 serial 8
+# alloca.m4 serial 9
-dnl Copyright (C) 2002-2004, 2006, 2007 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2006, 2007, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@ -26,7 +26,7 @@ AC_DEFUN([gl_FUNC_ALLOCA],
    ])
    if test $gl_cv_rpl_alloca = yes; then
      dnl OK, alloca can be implemented through a compiler built-in.
-      AC_DEFINE([HAVE_ALLOCA], 1,
+      AC_DEFINE([HAVE_ALLOCA], [1],
        [Define to 1 if you have 'alloca' after including <alloca.h>,
         a header that may be supplied by this distribution.])
      ALLOCA_H=alloca.h
--- a/m4/codeset.m4
+++ b/m4/codeset.m4
@ -1,5 +1,5 @@
-# codeset.m4 serial 3 (gettext-0.18)
+# codeset.m4 serial 4 (gettext-0.18)
-dnl Copyright (C) 2000-2002, 2006, 2008 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2006, 2008, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@ -15,7 +15,7 @@ AC_DEFUN([AM_LANGINFO_CODESET],
      [am_cv_langinfo_codeset=no])
    ])
  if test $am_cv_langinfo_codeset = yes; then
-    AC_DEFINE([HAVE_LANGINFO_CODESET], 1,
+    AC_DEFINE([HAVE_LANGINFO_CODESET], [1],
      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
  fi
 ])
--- a/m4/extensions.m4
+++ b/m4/extensions.m4
@ -1,7 +1,7 @@
-# serial 6  -*- Autoconf -*-
+# serial 8  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
-# Copyright (C) 2003, 2006-2008 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2009 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@ -20,7 +20,7 @@
 # AC_DEFINE.  The goal here is to define all known feature-enabling
 # macros, then, if reports of conflicts are made, disable macros that
 # cause problems on some platforms (such as __EXTENSIONS__).
-AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
+AC_DEFUN_ONCE([AC_USE_SYSTEM_EXTENSIONS],
 [AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
 AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
@ -90,5 +90,15 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
 # ------------------------
 # Enable extensions on systems that normally disable them,
 # typically due to standards-conformance issues.
-AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS],
+AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS],
-  [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])])
+[
  dnl Require this macro before AC_USE_SYSTEM_EXTENSIONS.
  dnl gnulib does not need it. But if it gets required by third-party macros
  dnl after AC_USE_SYSTEM_EXTENSIONS is required, autoconf 2.62..2.63 emit a
  dnl warning: "AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS".
  dnl Note: We can do this only for one of the macros AC_AIX, AC_GNU_SOURCE,
  dnl AC_MINIX. If people still use AC_AIX or AC_MINIX, they are out of luck.
  AC_REQUIRE([AC_GNU_SOURCE])
  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 ])
--- a/m4/flock.m4
+++ b/m4/flock.m4
@ -0,0 +1,26 @@
 # flock.m4 serial 1
 dnl Copyright (C) 2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_FLOCK],
 [
  AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS])
  AC_CHECK_FUNCS_ONCE([flock])
  if test $ac_cv_func_flock = no; then
    HAVE_FLOCK=0
    AC_LIBOBJ([flock])
    gl_PREREQ_FLOCK
  fi
 ])
 dnl Prerequisites of lib/flock.c.
 AC_DEFUN([gl_PREREQ_FLOCK],
 [
  AC_CHECK_FUNCS_ONCE([fcntl])
  AC_CHECK_HEADERS_ONCE([unistd.h fcntl.h])
  dnl Do we have a POSIX fcntl lock implementation?
  AC_CHECK_MEMBERS([struct flock.l_type],[],[],[[#include <fcntl.h>]])
 ])
--- a/m4/fpieee.m4
+++ b/m4/fpieee.m4
@ -0,0 +1,52 @@
 # fpieee.m4 serial 1
 dnl Copyright (C) 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl IEEE 754 standardized three items:
 dnl - The formats of single-float and double-float - nowadays commonly
 dnl   available as 'float' and 'double' in C and C++.
 dnl   No autoconf test needed.
 dnl - The overflow and division by zero behaviour: The result are values
 dnl   '±Inf' and 'NaN', rather than exceptions as it was before.
 dnl   This file provides an autoconf macro for ensuring this behaviour of
 dnl   floating-point operations.
 dnl - A set of conditions (overflow, underflow, inexact, etc.) which can
 dnl   be configured to trigger an exception.
 dnl   This cannot be done in a portable way: it depends on the compiler,
 dnl   libc, kernel, and CPU.  No autoconf macro is provided for this.
 dnl Ensure non-trapping behaviour of floating-point overflow and
 dnl floating-point division by zero.
 dnl (For integer overflow, see gcc's -ftrapv option; for integer division by
 dnl zero, see the autoconf macro in intdiv0.m4.)
 AC_DEFUN([gl_FP_IEEE],
 [
  AC_REQUIRE([AC_PROG_CC])
  AC_REQUIRE([AC_CANONICAL_HOST])
  # IEEE behaviour is the default on all CPUs except Alpha and SH
  # (according to the test results of Bruno Haible's ieeefp/fenv_default.m4
  # and the GCC 4.1.2 manual).
  case "$host_cpu" in
    alpha*)
      # On Alpha systems, a compiler option provides the behaviour.
      # See the ieee(3) manual page, also available at
      # <http://h30097.www3.hp.com/docs/base_doc/DOCUMENTATION/V51B_HTML/MAN/MAN3/0600____.HTM>
      if test -n "$GCC"; then
        # GCC has the option -mieee.
        CPPFLAGS="$CPPFLAGS -mieee"
      else
        # Compaq (ex-DEC) C has the option -ieee.
        CPPFLAGS="$CPPFLAGS -ieee"
      fi
      ;;
    sh*)
      if test -n "$GCC"; then
        # GCC has the option -mieee.
        CPPFLAGS="$CPPFLAGS -mieee"
      fi
      ;;
  esac
 ])
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@ -15,7 +15,7 @@
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl --libtool --macro-prefix=gl --no-vc-files alloca-opt autobuild count-one-bits extensions full-read full-write strcase strftime
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl --libtool --macro-prefix=gl --no-vc-files alloca-opt autobuild count-one-bits extensions flock fpieee full-read full-write putenv stdlib strcase strftime
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
@ -24,8 +24,12 @@ gl_MODULES([
  autobuild
  count-one-bits
  extensions
  flock
  fpieee
  full-read
  full-write
  putenv
  stdlib
  strcase
  strftime
 ])
--- a/m4/gnulib-common.m4
+++ b/m4/gnulib-common.m4
@ -1,5 +1,5 @@
-# gnulib-common.m4 serial 6
+# gnulib-common.m4 serial 11
-dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@ -8,6 +8,7 @@ dnl with or without modifications, as long as this notice is preserved.
 # is expanded unconditionally through gnulib-tool magic.
 AC_DEFUN([gl_COMMON], [
  dnl Use AC_REQUIRE here, so that the code is expanded once only.
  AC_REQUIRE([gl_00GNULIB])
  AC_REQUIRE([gl_COMMON_BODY])
 ])
 AC_DEFUN([gl_COMMON_BODY], [
@ -52,7 +53,7 @@ m4_ifndef([m4_foreach_w],
 # is a backport of autoconf-2.60's AC_PROG_MKDIR_P.
 # Remove this macro when we can assume autoconf >= 2.60.
 m4_ifdef([AC_PROG_MKDIR_P], [], [
-  AC_DEFUN([AC_PROG_MKDIR_P],
+  AC_DEFUN_ONCE([AC_PROG_MKDIR_P],
    [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
     MKDIR_P='$(mkdir_p)'
     AC_SUBST([MKDIR_P])])])
@ -63,7 +64,7 @@ m4_ifdef([AC_PROG_MKDIR_P], [], [
 # works.
 # This definition can be removed once autoconf >= 2.62 can be assumed.
 AC_DEFUN([AC_C_RESTRICT],
-[AC_CACHE_CHECK([for C/C++ restrict keyword], ac_cv_c_restrict,
+[AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict],
  [ac_cv_c_restrict=no
   # The order here caters to the fact that C++ does not require restrict.
   for ac_kw in __restrict __restrict__ _Restrict restrict; do
@ -99,3 +100,25 @@ AC_DEFUN([AC_C_RESTRICT],
   *)  AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
 esac
 ])
 # gl_BIGENDIAN
 # is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd.
 # Note that AC_REQUIRE([AC_C_BIGENDIAN]) does not work reliably because some
 # macros invoke AC_C_BIGENDIAN with arguments.
 AC_DEFUN([gl_BIGENDIAN],
 [
  AC_C_BIGENDIAN
 ])
 # gl_CACHE_VAL_SILENT(cache-id, command-to-set-it)
 # is like AC_CACHE_VAL(cache-id, command-to-set-it), except that it does not
 # output a spurious "(cached)" mark in the midst of other configure output.
 # This macro should be used instead of AC_CACHE_VAL when it is not surrounded
 # by an AC_MSG_CHECKING/AC_MSG_RESULT pair.
 AC_DEFUN([gl_CACHE_VAL_SILENT],
 [
  saved_as_echo_n="$as_echo_n"
  as_echo_n=':'
  AC_CACHE_VAL([$1], [$2])
  as_echo_n="$saved_as_echo_n"
 ])
--- a/m4/gnulib-comp.m4
+++ b/m4/gnulib-comp.m4
@ -27,6 +27,7 @@ AC_DEFUN([gl_EARLY],
  AC_REQUIRE([AC_PROG_RANLIB])
  AB_INIT
  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
  AC_REQUIRE([gl_FP_IEEE])
 ])
 # This macro should be invoked from ./configure.in, in the section
@ -44,23 +45,34 @@ AC_DEFUN([gl_INIT],
  gl_source_base='lib'
  gl_FUNC_ALLOCA
  gl_COUNT_ONE_BITS
  gl_FUNC_FLOCK
  gl_HEADER_SYS_FILE_MODULE_INDICATOR([flock])
  gl_INLINE
  gl_LOCALCHARSET
  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\""
  AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
  gl_FUNC_MALLOC_POSIX
  gl_STDLIB_MODULE_INDICATOR([malloc-posix])
  gl_FUNC_MBRLEN
  gl_WCHAR_MODULE_INDICATOR([mbrlen])
  gl_FUNC_MBRTOWC
  gl_WCHAR_MODULE_INDICATOR([mbrtowc])
  gl_FUNC_MBSINIT
  gl_WCHAR_MODULE_INDICATOR([mbsinit])
  gl_MULTIARCH
  gl_FUNC_PUTENV
  gl_STDLIB_MODULE_INDICATOR([putenv])
  gl_SAFE_READ
  gl_SAFE_WRITE
  gt_TYPE_SSIZE_T
  AM_STDBOOL_H
  gl_STDINT_H
  gl_STDLIB_H
  gl_STRCASE
  gl_FUNC_GNU_STRFTIME
  gl_HEADER_STRINGS_H
  gl_HEADER_SYS_FILE_H
  AC_PROG_MKDIR_P
  gl_HEADER_TIME_H
  gl_TIME_R
  gl_UNISTD_H
@ -199,15 +211,18 @@ AC_DEFUN([gl_FILE_LIST], [
  lib/alloca.in.h
  lib/config.charset
  lib/count-one-bits.h
  lib/flock.c
  lib/full-read.c
  lib/full-read.h
  lib/full-write.c
  lib/full-write.h
  lib/localcharset.c
  lib/localcharset.h
  lib/malloc.c
  lib/mbrlen.c
  lib/mbrtowc.c
  lib/mbsinit.c
  lib/putenv.c
  lib/ref-add.sin
  lib/ref-del.sin
  lib/safe-read.c
@ -215,23 +230,29 @@ AC_DEFUN([gl_FILE_LIST], [
  lib/safe-write.c
  lib/safe-write.h
  lib/stdbool.in.h
  lib/stdint.in.h
  lib/stdlib.in.h
  lib/strcasecmp.c
  lib/streq.h
  lib/strftime.c
  lib/strftime.h
  lib/strings.in.h
  lib/strncasecmp.c
  lib/sys_file.in.h
  lib/time.in.h
  lib/time_r.c
  lib/unistd.in.h
  lib/verify.h
  lib/wchar.in.h
  lib/write.c
  m4/00gnulib.m4
  m4/alloca.m4
  m4/autobuild.m4
  m4/codeset.m4
  m4/count-one-bits.m4
  m4/extensions.m4
  m4/flock.m4
  m4/fpieee.m4
  m4/glibc21.m4
  m4/gnulib-common.m4
  m4/include_next.m4
@ -240,17 +261,24 @@ AC_DEFUN([gl_FILE_LIST], [
  m4/locale-fr.m4
  m4/locale-ja.m4
  m4/locale-zh.m4
  m4/longlong.m4
  m4/malloc.m4
  m4/mbrlen.m4
  m4/mbrtowc.m4
  m4/mbsinit.m4
  m4/mbstate_t.m4
  m4/multiarch.m4
  m4/putenv.m4
  m4/safe-read.m4
  m4/safe-write.m4
  m4/ssize_t.m4
  m4/stdbool.m4
  m4/stdint.m4
  m4/stdlib_h.m4
  m4/strcase.m4
  m4/strftime.m4
  m4/strings_h.m4
  m4/sys_file_h.m4
  m4/time_h.m4
  m4/time_r.m4
  m4/tm_gmtoff.m4
--- a/m4/include_next.m4
+++ b/m4/include_next.m4
@ -1,5 +1,5 @@
-# include_next.m4 serial 10
+# include_next.m4 serial 12
-dnl Copyright (C) 2006-2008 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@ -32,14 +32,15 @@ AC_DEFUN([gl_INCLUDE_NEXT],
    [gl_cv_have_include_next],
    [rm -rf conftestd1a conftestd1b conftestd2
     mkdir conftestd1a conftestd1b conftestd2
-     dnl The include of <stdio.h> is because IBM C 9.0 on AIX 6.1 supports
+     dnl IBM C 9.0, 10.1 (original versions, prior to the 2009-01 updates) on
-     dnl include_next when used as first preprocessor directive in a file,
+     dnl AIX 6.1 support include_next when used as first preprocessor directive
-     dnl but not when preceded by another include directive. Additionally,
+     dnl in a file, but not when preceded by another include directive. Check
-     dnl with this same compiler, include_next is a no-op when used in a
+     dnl for this bug by including <stdio.h>.
-     dnl header file that was included by specifying its absolute file name.
+     dnl Additionally, with this same compiler, include_next is a no-op when
-     dnl Despite these two bugs, include_next is used in the compiler's
+     dnl used in a header file that was included by specifying its absolute
-     dnl <math.h>. By virtue of the second bug, we need to use include_next
+     dnl file name. Despite these two bugs, include_next is used in the
-     dnl as well in this case.
+     dnl compiler's <math.h>. By virtue of the second bug, we need to use
     dnl include_next as well in this case.
     cat <<EOF > conftestd1a/conftest.h
 #define DEFINED_IN_CONFTESTD1
 #include_next <conftest.h>
--- a/m4/inline.m4
+++ b/m4/inline.m4
@ -1,5 +1,5 @@
-# inline.m4 serial 3
+# inline.m4 serial 4
-dnl Copyright (C) 2006 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@ -32,7 +32,7 @@ AC_DEFUN([gl_INLINE],
     fi
    ])
  if test $gl_cv_c_inline_effective = yes; then
-    AC_DEFINE([HAVE_INLINE], 1,
+    AC_DEFINE([HAVE_INLINE], [1],
      [Define to 1 if the compiler supports one of the keywords
       'inline', '__inline__', '__inline' and effectively inlines
       functions marked as such.])
--- a/m4/localcharset.m4
+++ b/m4/localcharset.m4
@ -1,5 +1,5 @@
-# localcharset.m4 serial 5
+# localcharset.m4 serial 6
-dnl Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2004, 2006, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@ -8,7 +8,7 @@ AC_DEFUN([gl_LOCALCHARSET],
 [
  dnl Prerequisites of lib/localcharset.c.
  AC_REQUIRE([AM_LANGINFO_CODESET])
-  AC_CHECK_DECLS_ONCE(getc_unlocked)
+  AC_CHECK_DECLS_ONCE([getc_unlocked])
  dnl Prerequisites of the lib/Makefile.am snippet.
  AC_REQUIRE([AC_CANONICAL_HOST])
--- a/m4/locale-fr.m4
+++ b/m4/locale-fr.m4
@ -1,5 +1,5 @@
-# locale-fr.m4 serial 9
+# locale-fr.m4 serial 11
-dnl Copyright (C) 2003, 2005-2008 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@ -11,26 +11,8 @@ AC_DEFUN([gt_LOCALE_FR],
 [
  AC_REQUIRE([AC_CANONICAL_HOST])
  AC_REQUIRE([AM_LANGINFO_CODESET])
-  AC_CACHE_CHECK([for a traditional french locale], gt_cv_locale_fr, [
+  AC_CACHE_CHECK([for a traditional french locale], [gt_cv_locale_fr], [
-    macosx=
+    AC_LANG_CONFTEST([AC_LANG_SOURCE([
 changequote(,)dnl
    case "$host_os" in
      darwin[56]*) ;;
      darwin*) macosx=yes;;
    esac
 changequote([,])dnl
    if test -n "$macosx"; then
      # On Darwin 7 (MacOS X), the libc supports some locales in non-UTF-8
      # encodings, but the kernel does not support them. The documentation
      # says:
      #   "... all code that calls BSD system routines should ensure
      #    that the const *char parameters of these routines are in UTF-8
      #    encoding. All BSD system functions expect their string
      #    parameters to be in UTF-8 encoding and nothing else."
      # See the comments in config.charset. Therefore we bypass the test.
      gt_cv_locale_fr=none
    else
      AC_LANG_CONFTEST([AC_LANG_SOURCE([
 changequote(,)dnl
 #include <locale.h>
 #include <time.h>
@ -75,42 +57,41 @@ int main () {
  return 0;
 }
 changequote([,])dnl
-        ])])
+      ])])
-      if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
+    if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
-        # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-        # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
-        # configure script would override the LC_ALL setting. Likewise for
+      # configure script would override the LC_ALL setting. Likewise for
-        # LC_CTYPE, which is also set at the beginning of the configure script.
+      # LC_CTYPE, which is also set at the beginning of the configure script.
-        # Test for the usual locale name.
+      # Test for the usual locale name.
-        if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+      if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-          gt_cv_locale_fr=fr_FR
+        gt_cv_locale_fr=fr_FR
      else
        # Test for the locale name with explicit encoding suffix.
        if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
          gt_cv_locale_fr=fr_FR.ISO-8859-1
        else
-          # Test for the locale name with explicit encoding suffix.
+          # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
-          if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr=fr_FR.ISO-8859-1
+            gt_cv_locale_fr=fr_FR.ISO8859-1
          else
-            # Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
+            # Test for the HP-UX locale name.
-            if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr=fr_FR.ISO8859-1
+              gt_cv_locale_fr=fr_FR.iso88591
            else
-              # Test for the HP-UX locale name.
+              # Test for the Solaris 7 locale name.
-              if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+              if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr=fr_FR.iso88591
+                gt_cv_locale_fr=fr
              else
-                # Test for the Solaris 7 locale name.
+                # None found.
-                if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_fr=none
                  gt_cv_locale_fr=fr
                else
                  # None found.
                  gt_cv_locale_fr=none
                fi
              fi
            fi
          fi
        fi
      fi
      rm -fr conftest*
    fi
    rm -fr conftest*
  ])
  LOCALE_FR=$gt_cv_locale_fr
  AC_SUBST([LOCALE_FR])
@ -120,7 +101,7 @@ dnl Determine the name of a french locale with UTF-8 encoding.
 AC_DEFUN([gt_LOCALE_FR_UTF8],
 [
  AC_REQUIRE([AM_LANGINFO_CODESET])
-  AC_CACHE_CHECK([for a french Unicode locale], gt_cv_locale_fr_utf8, [
+  AC_CACHE_CHECK([for a french Unicode locale], [gt_cv_locale_fr_utf8], [
    AC_LANG_CONFTEST([AC_LANG_SOURCE([
 changequote(,)dnl
 #include <locale.h>
--- a/m4/locale-ja.m4
+++ b/m4/locale-ja.m4
@ -1,5 +1,5 @@
-# locale-ja.m4 serial 5
+# locale-ja.m4 serial 7
-dnl Copyright (C) 2003, 2005-2008 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@ -11,26 +11,8 @@ AC_DEFUN([gt_LOCALE_JA],
 [
  AC_REQUIRE([AC_CANONICAL_HOST])
  AC_REQUIRE([AM_LANGINFO_CODESET])
-  AC_CACHE_CHECK([for a traditional japanese locale], gt_cv_locale_ja, [
+  AC_CACHE_CHECK([for a traditional japanese locale], [gt_cv_locale_ja], [
-    macosx=
+    AC_LANG_CONFTEST([AC_LANG_SOURCE([
 changequote(,)dnl
    case "$host_os" in
      darwin[56]*) ;;
      darwin*) macosx=yes;;
    esac
 changequote([,])dnl
    if test -n "$macosx"; then
      # On Darwin 7 (MacOS X), the libc supports some locales in non-UTF-8
      # encodings, but the kernel does not support them. The documentation
      # says:
      #   "... all code that calls BSD system routines should ensure
      #    that the const *char parameters of these routines are in UTF-8
      #    encoding. All BSD system functions expect their string
      #    parameters to be in UTF-8 encoding and nothing else."
      # See the comments in config.charset. Therefore we bypass the test.
      gt_cv_locale_ja=none
    else
      AC_LANG_CONFTEST([AC_LANG_SOURCE([
 changequote(,)dnl
 #include <locale.h>
 #include <time.h>
@ -79,47 +61,46 @@ int main ()
  return 0;
 }
 changequote([,])dnl
-        ])])
+      ])])
-      if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
+    if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
-        # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-        # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
-        # configure script would override the LC_ALL setting. Likewise for
+      # configure script would override the LC_ALL setting. Likewise for
-        # LC_CTYPE, which is also set at the beginning of the configure script.
+      # LC_CTYPE, which is also set at the beginning of the configure script.
-        # Test for the AIX locale name.
+      # Test for the AIX locale name.
-        if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+      if (LC_ALL=ja_JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-          gt_cv_locale_ja=ja_JP
+        gt_cv_locale_ja=ja_JP
      else
        # Test for the locale name with explicit encoding suffix.
        if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
          gt_cv_locale_ja=ja_JP.EUC-JP
        else
-          # Test for the locale name with explicit encoding suffix.
+          # Test for the HP-UX, OSF/1, NetBSD locale name.
-          if (LC_ALL=ja_JP.EUC-JP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+          if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_ja=ja_JP.EUC-JP
+            gt_cv_locale_ja=ja_JP.eucJP
          else
-            # Test for the HP-UX, OSF/1, NetBSD locale name.
+            # Test for the IRIX, FreeBSD locale name.
-            if (LC_ALL=ja_JP.eucJP LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_ja=ja_JP.eucJP
+              gt_cv_locale_ja=ja_JP.EUC
            else
-              # Test for the IRIX, FreeBSD locale name.
+              # Test for the Solaris 7 locale name.
-              if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+              if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_ja=ja_JP.EUC
+                gt_cv_locale_ja=ja
              else
-                # Test for the Solaris 7 locale name.
+                # Special test for NetBSD 1.6.
-                if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then
-                  gt_cv_locale_ja=ja
+                  gt_cv_locale_ja=ja_JP.eucJP
                else
-                  # Special test for NetBSD 1.6.
+                  # None found.
-                  if test -f /usr/share/locale/ja_JP.eucJP/LC_CTYPE; then
+                  gt_cv_locale_ja=none
                    gt_cv_locale_ja=ja_JP.eucJP
                  else
                    # None found.
                    gt_cv_locale_ja=none
                  fi
                fi
              fi
            fi
          fi
        fi
      fi
      rm -fr conftest*
    fi
    rm -fr conftest*
  ])
  LOCALE_JA=$gt_cv_locale_ja
  AC_SUBST([LOCALE_JA])
--- a/m4/locale-zh.m4
+++ b/m4/locale-zh.m4
@ -1,5 +1,5 @@
-# locale-zh.m4 serial 4
+# locale-zh.m4 serial 6
-dnl Copyright (C) 2003, 2005-2008 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@ -11,26 +11,8 @@ AC_DEFUN([gt_LOCALE_ZH_CN],
 [
  AC_REQUIRE([AC_CANONICAL_HOST])
  AC_REQUIRE([AM_LANGINFO_CODESET])
-  AC_CACHE_CHECK([for a transitional chinese locale], gt_cv_locale_zh_CN, [
+  AC_CACHE_CHECK([for a transitional chinese locale], [gt_cv_locale_zh_CN], [
-    macosx=
+    AC_LANG_CONFTEST([AC_LANG_SOURCE([
 changequote(,)dnl
    case "$host_os" in
      darwin[56]*) ;;
      darwin*) macosx=yes;;
    esac
 changequote([,])dnl
    if test -n "$macosx"; then
      # On Darwin 7 (MacOS X), the libc supports some locales in non-UTF-8
      # encodings, but the kernel does not support them. The documentation
      # says:
      #   "... all code that calls BSD system routines should ensure
      #    that the const *char parameters of these routines are in UTF-8
      #    encoding. All BSD system functions expect their string
      #    parameters to be in UTF-8 encoding and nothing else."
      # See the comments in config.charset. Therefore we bypass the test.
      gt_cv_locale_zh_CN=none
    else
      AC_LANG_CONFTEST([AC_LANG_SOURCE([
 changequote(,)dnl
 #include <locale.h>
 #include <stdlib.h>
@ -80,31 +62,30 @@ int main ()
  return 0;
 }
 changequote([,])dnl
-        ])])
+      ])])
-      if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
+    if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
-        # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+      # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
-        # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
+      # otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
-        # configure script would override the LC_ALL setting. Likewise for
+      # configure script would override the LC_ALL setting. Likewise for
-        # LC_CTYPE, which is also set at the beginning of the configure script.
+      # LC_CTYPE, which is also set at the beginning of the configure script.
-        # Test for the locale name without encoding suffix.
+      # Test for the locale name without encoding suffix.
-        if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+      if (LC_ALL=zh_CN LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-          gt_cv_locale_zh_CN=zh_CN
+        gt_cv_locale_zh_CN=zh_CN
        else
          # Test for the locale name with explicit encoding suffix.
          if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
            gt_cv_locale_zh_CN=zh_CN.GB18030
          else
            # None found.
            gt_cv_locale_zh_CN=none
          fi
        fi
      else
-        # If there was a link error, due to mblen(), the system is so old that
+        # Test for the locale name with explicit encoding suffix.
-        # it certainly doesn't have a chinese locale.
+        if (LC_ALL=zh_CN.GB18030 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-        gt_cv_locale_zh_CN=none
+          gt_cv_locale_zh_CN=zh_CN.GB18030
        else
          # None found.
          gt_cv_locale_zh_CN=none
        fi
      fi
-      rm -fr conftest*
+    else
      # If there was a link error, due to mblen(), the system is so old that
      # it certainly doesn't have a chinese locale.
      gt_cv_locale_zh_CN=none
    fi
    rm -fr conftest*
  ])
  LOCALE_ZH_CN=$gt_cv_locale_zh_CN
  AC_SUBST([LOCALE_ZH_CN])
--- a/m4/longlong.m4
+++ b/m4/longlong.m4
@ -0,0 +1,106 @@
 # longlong.m4 serial 14
 dnl Copyright (C) 1999-2007, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl From Paul Eggert.
 # Define HAVE_LONG_LONG_INT if 'long long int' works.
 # This fixes a bug in Autoconf 2.61, but can be removed once we
 # assume 2.62 everywhere.
 # Note: If the type 'long long int' exists but is only 32 bits large
 # (as on some very old compilers), HAVE_LONG_LONG_INT will not be
 # defined. In this case you can treat 'long long int' like 'long int'.
 AC_DEFUN([AC_TYPE_LONG_LONG_INT],
 [
  AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],
    [AC_LINK_IFELSE(
       [_AC_TYPE_LONG_LONG_SNIPPET],
       [dnl This catches a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004.
 	dnl If cross compiling, assume the bug isn't important, since
 	dnl nobody cross compiles for this platform as far as we know.
 	AC_RUN_IFELSE(
 	  [AC_LANG_PROGRAM(
 	     [[@%:@include <limits.h>
 	       @%:@ifndef LLONG_MAX
 	       @%:@ define HALF \
 			(1LL << (sizeof (long long int) * CHAR_BIT - 2))
 	       @%:@ define LLONG_MAX (HALF - 1 + HALF)
 	       @%:@endif]],
 	     [[long long int n = 1;
 	       int i;
 	       for (i = 0; ; i++)
 		 {
 		   long long int m = n << i;
 		   if (m >> i != n)
 		     return 1;
 		   if (LLONG_MAX / 2 < m)
 		     break;
 		 }
 	       return 0;]])],
 	  [ac_cv_type_long_long_int=yes],
 	  [ac_cv_type_long_long_int=no],
 	  [ac_cv_type_long_long_int=yes])],
       [ac_cv_type_long_long_int=no])])
  if test $ac_cv_type_long_long_int = yes; then
    AC_DEFINE([HAVE_LONG_LONG_INT], [1],
      [Define to 1 if the system has the type `long long int'.])
  fi
 ])
 # Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
 # This fixes a bug in Autoconf 2.61, but can be removed once we
 # assume 2.62 everywhere.
 # Note: If the type 'unsigned long long int' exists but is only 32 bits
 # large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
 # will not be defined. In this case you can treat 'unsigned long long int'
 # like 'unsigned long int'.
 AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
 [
  AC_CACHE_CHECK([for unsigned long long int],
    [ac_cv_type_unsigned_long_long_int],
    [AC_LINK_IFELSE(
       [_AC_TYPE_LONG_LONG_SNIPPET],
       [ac_cv_type_unsigned_long_long_int=yes],
       [ac_cv_type_unsigned_long_long_int=no])])
  if test $ac_cv_type_unsigned_long_long_int = yes; then
    AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1],
      [Define to 1 if the system has the type `unsigned long long int'.])
  fi
 ])
 # Expands to a C program that can be used to test for simultaneous support
 # of 'long long' and 'unsigned long long'. We don't want to say that
 # 'long long' is available if 'unsigned long long' is not, or vice versa,
 # because too many programs rely on the symmetry between signed and unsigned
 # integer types (excluding 'bool').
 AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET],
 [
  AC_LANG_PROGRAM(
    [[/* For now, do not test the preprocessor; as of 2007 there are too many
 	 implementations with broken preprocessors.  Perhaps this can
 	 be revisited in 2012.  In the meantime, code should not expect
 	 #if to work with literals wider than 32 bits.  */
      /* Test literals.  */
      long long int ll = 9223372036854775807ll;
      long long int nll = -9223372036854775807LL;
      unsigned long long int ull = 18446744073709551615ULL;
      /* Test constant expressions.   */
      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
 		     ? 1 : -1)];
      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
 		     ? 1 : -1)];
      int i = 63;]],
    [[/* Test availability of runtime routines for shift and division.  */
      long long int llmax = 9223372036854775807ll;
      unsigned long long int ullmax = 18446744073709551615ull;
      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
 	      | (llmax / ll) | (llmax % ll)
 	      | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
 	      | (ullmax / ull) | (ullmax % ull));]])
 ])
--- a/m4/malloc.m4
+++ b/m4/malloc.m4
@ -0,0 +1,41 @@
 # malloc.m4 serial 9
 dnl Copyright (C) 2007, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 # gl_FUNC_MALLOC_POSIX
 # --------------------
 # Test whether 'malloc' is POSIX compliant (sets errno to ENOMEM when it
 # fails), and replace malloc if it is not.
 AC_DEFUN([gl_FUNC_MALLOC_POSIX],
 [
  AC_REQUIRE([gl_CHECK_MALLOC_POSIX])
  if test $gl_cv_func_malloc_posix = yes; then
    HAVE_MALLOC_POSIX=1
    AC_DEFINE([HAVE_MALLOC_POSIX], [1],
      [Define if the 'malloc' function is POSIX compliant.])
  else
    AC_LIBOBJ([malloc])
    HAVE_MALLOC_POSIX=0
  fi
  AC_SUBST([HAVE_MALLOC_POSIX])
 ])
 # Test whether malloc, realloc, calloc are POSIX compliant,
 # Set gl_cv_func_malloc_posix to yes or no accordingly.
 AC_DEFUN([gl_CHECK_MALLOC_POSIX],
 [
  AC_CACHE_CHECK([whether malloc, realloc, calloc are POSIX compliant],
    [gl_cv_func_malloc_posix],
    [
      dnl It is too dangerous to try to allocate a large amount of memory:
      dnl some systems go to their knees when you do that. So assume that
      dnl all Unix implementations of the function are POSIX compliant.
      AC_TRY_COMPILE([],
        [#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
         choke me
         #endif
        ], [gl_cv_func_malloc_posix=yes], [gl_cv_func_malloc_posix=no])
    ])
 ])
--- a/m4/mbrtowc.m4
+++ b/m4/mbrtowc.m4
@ -1,5 +1,5 @@
-# mbrtowc.m4 serial 12
+# mbrtowc.m4 serial 15
-dnl Copyright (C) 2001-2002, 2004-2005, 2008 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2002, 2004-2005, 2008, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@ -65,9 +65,15 @@ AC_DEFUN([gl_MBSTATE_T_BROKEN],
  AC_CHECK_FUNCS_ONCE([mbrtowc])
  if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then
    gl_MBRTOWC_INCOMPLETE_STATE
    gl_MBRTOWC_SANITYCHECK
    REPLACE_MBSTATE_T=0
    case "$gl_cv_func_mbrtowc_incomplete_state" in
-      *yes) REPLACE_MBSTATE_T=0 ;;
+      *yes) ;;
-      *)    REPLACE_MBSTATE_T=1 ;;
+      *) REPLACE_MBSTATE_T=1 ;;
    esac
    case "$gl_cv_func_mbrtowc_sanitycheck" in
      *yes) ;;
      *) REPLACE_MBSTATE_T=1 ;;
    esac
  else
    REPLACE_MBSTATE_T=1
@ -121,7 +127,58 @@ int main ()
 }],
          [gl_cv_func_mbrtowc_incomplete_state=yes],
          [gl_cv_func_mbrtowc_incomplete_state=no],
-          [])
+          [:])
      fi
    ])
 ])
 dnl Test whether mbrtowc works not worse than mbtowc.
 dnl Result is gl_cv_func_mbrtowc_sanitycheck.
 AC_DEFUN([gl_MBRTOWC_SANITYCHECK],
 [
  AC_REQUIRE([AC_PROG_CC])
  AC_REQUIRE([gt_LOCALE_ZH_CN])
  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
  AC_CACHE_CHECK([whether mbrtowc works as well as mbtowc],
    [gl_cv_func_mbrtowc_sanitycheck],
    [
      dnl Initial guess, used when cross-compiling or when no suitable locale
      dnl is present.
 changequote(,)dnl
      case "$host_os" in
                    # Guess no on Solaris 8.
        solaris2.8) gl_cv_func_mbrtowc_sanitycheck="guessing no" ;;
                    # Guess yes otherwise.
        *)          gl_cv_func_mbrtowc_sanitycheck="guessing yes" ;;
      esac
 changequote([,])dnl
      if test $LOCALE_ZH_CN != none; then
        AC_TRY_RUN([
 #include <locale.h>
 #include <string.h>
 #include <wchar.h>
 int main ()
 {
  /* This fails on Solaris 8:
     mbrtowc returns 2, and sets wc to 0x00F0.
     mbtowc returns 4 (correct) and sets wc to 0x5EDC.  */
  if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
    {
      char input[] = "B\250\271\201\060\211\070er"; /* "Büßer" */
      mbstate_t state;
      wchar_t wc;
      memset (&state, '\0', sizeof (mbstate_t));
      if (mbrtowc (&wc, input + 3, 6, &state) != 4
          && mbtowc (&wc, input + 3, 6) == 4)
        return 1;
    }
  return 0;
 }],
          [gl_cv_func_mbrtowc_sanitycheck=yes],
          [gl_cv_func_mbrtowc_sanitycheck=no],
          [:])
      fi
    ])
 ])
@ -168,7 +225,7 @@ int main ()
        return 1;
    }
  return 0;
-}], [gl_cv_func_mbrtowc_null_arg=yes], [gl_cv_func_mbrtowc_null_arg=no], [])
+}], [gl_cv_func_mbrtowc_null_arg=yes], [gl_cv_func_mbrtowc_null_arg=no], [:])
      fi
    ])
 ])
@ -238,7 +295,7 @@ int main ()
 }],
          [gl_cv_func_mbrtowc_retval=yes],
          [gl_cv_func_mbrtowc_retval=no],
-          [])
+          [:])
      fi
    ])
 ])
@ -258,10 +315,10 @@ AC_DEFUN([gl_MBRTOWC_NUL_RETVAL],
      dnl is present.
 changequote(,)dnl
      case "$host_os" in
-                    # Guess no on Solaris 9.
+                       # Guess no on Solaris 8 and 9.
-        solaris2.9) gl_cv_func_mbrtowc_nul_retval="guessing no" ;;
+        solaris2.[89]) gl_cv_func_mbrtowc_nul_retval="guessing no" ;;
-                    # Guess yes otherwise.
+                       # Guess yes otherwise.
-        *)          gl_cv_func_mbrtowc_nul_retval="guessing yes" ;;
+        *)             gl_cv_func_mbrtowc_nul_retval="guessing yes" ;;
      esac
 changequote([,])dnl
      if test $LOCALE_ZH_CN != none; then
@ -271,7 +328,7 @@ changequote([,])dnl
 #include <wchar.h>
 int main ()
 {
-  /* This fails on Solaris 9.  */
+  /* This fails on Solaris 8 and 9.  */
  if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
    {
      mbstate_t state;
@ -285,7 +342,7 @@ int main ()
 }],
          [gl_cv_func_mbrtowc_nul_retval=yes],
          [gl_cv_func_mbrtowc_nul_retval=no],
-          [])
+          [:])
      fi
    ])
 ])
@ -318,7 +375,7 @@ AC_DEFUN([AC_FUNC_MBRTOWC],
       gl_cv_func_mbrtowc=yes,
       gl_cv_func_mbrtowc=no)])
  if test $gl_cv_func_mbrtowc = yes; then
-    AC_DEFINE([HAVE_MBRTOWC], 1,
+    AC_DEFINE([HAVE_MBRTOWC], [1],
      [Define to 1 if mbrtowc and mbstate_t are properly declared.])
  fi
 ])
--- a/m4/mbstate_t.m4
+++ b/m4/mbstate_t.m4
@ -1,5 +1,5 @@
-# mbstate_t.m4 serial 11
+# mbstate_t.m4 serial 12
-dnl Copyright (C) 2000-2002, 2008 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2008, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@ -16,7 +16,7 @@ AC_DEFUN([AC_TYPE_MBSTATE_T],
 [
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) dnl for HP-UX 11.11
-   AC_CACHE_CHECK([for mbstate_t], ac_cv_type_mbstate_t,
+   AC_CACHE_CHECK([for mbstate_t], [ac_cv_type_mbstate_t],
     [AC_COMPILE_IFELSE(
 	[AC_LANG_PROGRAM(
 	   [AC_INCLUDES_DEFAULT[
@ -25,10 +25,10 @@ AC_DEFUN([AC_TYPE_MBSTATE_T],
 	[ac_cv_type_mbstate_t=yes],
 	[ac_cv_type_mbstate_t=no])])
   if test $ac_cv_type_mbstate_t = yes; then
-     AC_DEFINE([HAVE_MBSTATE_T], 1,
+     AC_DEFINE([HAVE_MBSTATE_T], [1],
 	       [Define to 1 if <wchar.h> declares mbstate_t.])
   else
-     AC_DEFINE([mbstate_t], int,
+     AC_DEFINE([mbstate_t], [int],
 	       [Define to a type if <wchar.h> does not define.])
   fi
 ])
--- a/m4/multiarch.m4
+++ b/m4/multiarch.m4
@ -0,0 +1,65 @@
 # multiarch.m4 serial 5
 dnl Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 # Determine whether the compiler is or may be producing universal binaries.
 #
 # On MacOS X 10.5 and later systems, the user can create libraries and
 # executables that work on multiple system types--known as "fat" or
 # "universal" binaries--by specifying multiple '-arch' options to the
 # compiler but only a single '-arch' option to the preprocessor.  Like
 # this:
 #
 #     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
 #                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
 #                 CPP="gcc -E" CXXCPP="g++ -E"
 #
 # Detect this situation and set the macro AA_APPLE_UNIVERSAL_BUILD at the
 # beginning of config.h and set APPLE_UNIVERSAL_BUILD accordingly.
 AC_DEFUN_ONCE([gl_MULTIARCH],
 [
  dnl Code similar to autoconf-2.63 AC_C_BIGENDIAN.
  gl_cv_c_multiarch=no
  AC_COMPILE_IFELSE(
    [AC_LANG_SOURCE(
      [[#ifndef __APPLE_CC__
         not a universal capable compiler
        #endif
        typedef int dummy;
      ]])],
    [
     dnl Check for potential -arch flags.  It is not universal unless
     dnl there are at least two -arch flags with different values.
     arch=
     prev=
     for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do
       if test -n "$prev"; then
         case $word in
           i?86 | x86_64 | ppc | ppc64)
             if test -z "$arch" || test "$arch" = "$word"; then
               arch="$word"
             else
               gl_cv_c_multiarch=yes
             fi
             ;;
         esac
         prev=
       else
         if test "x$word" = "x-arch"; then
           prev=arch
         fi
       fi
     done
    ])
  if test $gl_cv_c_multiarch = yes; then
    AC_DEFINE([AA_APPLE_UNIVERSAL_BUILD], [1],
      [Define if the compiler is building for multiple architectures of Apple platforms at once.])
    APPLE_UNIVERSAL_BUILD=1
  else
    APPLE_UNIVERSAL_BUILD=0
  fi
  AC_SUBST([APPLE_UNIVERSAL_BUILD])
 ])
--- a/m4/putenv.m4
+++ b/m4/putenv.m4
@ -0,0 +1,41 @@
 # putenv.m4 serial 16
 dnl Copyright (C) 2002-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl From Jim Meyering.
 dnl
 dnl Check whether putenv ("FOO") removes FOO from the environment.
 dnl The putenv in libc on at least SunOS 4.1.4 does *not* do that.
 AC_DEFUN([gl_FUNC_PUTENV],
 [
  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
  AC_CACHE_CHECK([for putenv compatible with GNU and SVID],
   [gl_cv_func_svid_putenv],
   [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],[[
    /* Put it in env.  */
    if (putenv ("CONFTEST_putenv=val"))
      return 1;
    /* Try to remove it.  */
    if (putenv ("CONFTEST_putenv"))
      return 1;
    /* Make sure it was deleted.  */
    if (getenv ("CONFTEST_putenv") != 0)
      return 1;
    return 0;
 	      ]])],
 	     gl_cv_func_svid_putenv=yes,
 	     gl_cv_func_svid_putenv=no,
 	     dnl When crosscompiling, assume putenv is broken.
 	     gl_cv_func_svid_putenv=no)
   ])
  if test $gl_cv_func_svid_putenv = no; then
    REPLACE_PUTENV=1
    AC_LIBOBJ([putenv])
  fi
 ])
--- a/m4/stdbool.m4
+++ b/m4/stdbool.m4
@ -1,6 +1,6 @@
 # Check for stdbool.h that conforms to C99.
-dnl Copyright (C) 2002-2006 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@ -111,5 +111,5 @@ AC_DEFUN([AC_HEADER_STDBOOL],
 	[ac_cv_header_stdbool_h=no])])
   AC_CHECK_TYPES([_Bool])
   if test $ac_cv_header_stdbool_h = yes; then
-     AC_DEFINE(HAVE_STDBOOL_H, 1, [Define to 1 if stdbool.h conforms to C99.])
+     AC_DEFINE([HAVE_STDBOOL_H], [1], [Define to 1 if stdbool.h conforms to C99.])
   fi])
--- a/m4/stdint.m4
+++ b/m4/stdint.m4
@ -0,0 +1,472 @@
 # stdint.m4 serial 34
 dnl Copyright (C) 2001-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl From Paul Eggert and Bruno Haible.
 dnl Test whether <stdint.h> is supported or must be substituted.
 AC_DEFUN([gl_STDINT_H],
 [
  AC_PREREQ([2.59])dnl
  dnl Check for long long int and unsigned long long int.
  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
  if test $ac_cv_type_long_long_int = yes; then
    HAVE_LONG_LONG_INT=1
  else
    HAVE_LONG_LONG_INT=0
  fi
  AC_SUBST([HAVE_LONG_LONG_INT])
  AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
  if test $ac_cv_type_unsigned_long_long_int = yes; then
    HAVE_UNSIGNED_LONG_LONG_INT=1
  else
    HAVE_UNSIGNED_LONG_LONG_INT=0
  fi
  AC_SUBST([HAVE_UNSIGNED_LONG_LONG_INT])
  dnl Check for <inttypes.h>.
  dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_inttypes_h.
  if test $ac_cv_header_inttypes_h = yes; then
    HAVE_INTTYPES_H=1
  else
    HAVE_INTTYPES_H=0
  fi
  AC_SUBST([HAVE_INTTYPES_H])
  dnl Check for <sys/types.h>.
  dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_sys_types_h.
  if test $ac_cv_header_sys_types_h = yes; then
    HAVE_SYS_TYPES_H=1
  else
    HAVE_SYS_TYPES_H=0
  fi
  AC_SUBST([HAVE_SYS_TYPES_H])
  gl_CHECK_NEXT_HEADERS([stdint.h])
  if test $ac_cv_header_stdint_h = yes; then
    HAVE_STDINT_H=1
  else
    HAVE_STDINT_H=0
  fi
  AC_SUBST([HAVE_STDINT_H])
  dnl Now see whether we need a substitute <stdint.h>.
  if test $ac_cv_header_stdint_h = yes; then
    AC_CACHE_CHECK([whether stdint.h conforms to C99],
      [gl_cv_header_working_stdint_h],
      [gl_cv_header_working_stdint_h=no
       AC_COMPILE_IFELSE([
         AC_LANG_PROGRAM([[
 #define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
 #define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
 #include <stdint.h>
 /* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
 #if !(defined WCHAR_MIN && defined WCHAR_MAX)
 #error "WCHAR_MIN, WCHAR_MAX not defined in <stdint.h>"
 #endif
 ]
 gl_STDINT_INCLUDES
 [
 #ifdef INT8_MAX
 int8_t a1 = INT8_MAX;
 int8_t a1min = INT8_MIN;
 #endif
 #ifdef INT16_MAX
 int16_t a2 = INT16_MAX;
 int16_t a2min = INT16_MIN;
 #endif
 #ifdef INT32_MAX
 int32_t a3 = INT32_MAX;
 int32_t a3min = INT32_MIN;
 #endif
 #ifdef INT64_MAX
 int64_t a4 = INT64_MAX;
 int64_t a4min = INT64_MIN;
 #endif
 #ifdef UINT8_MAX
 uint8_t b1 = UINT8_MAX;
 #else
 typedef int b1[(unsigned char) -1 != 255 ? 1 : -1];
 #endif
 #ifdef UINT16_MAX
 uint16_t b2 = UINT16_MAX;
 #endif
 #ifdef UINT32_MAX
 uint32_t b3 = UINT32_MAX;
 #endif
 #ifdef UINT64_MAX
 uint64_t b4 = UINT64_MAX;
 #endif
 int_least8_t c1 = INT8_C (0x7f);
 int_least8_t c1max = INT_LEAST8_MAX;
 int_least8_t c1min = INT_LEAST8_MIN;
 int_least16_t c2 = INT16_C (0x7fff);
 int_least16_t c2max = INT_LEAST16_MAX;
 int_least16_t c2min = INT_LEAST16_MIN;
 int_least32_t c3 = INT32_C (0x7fffffff);
 int_least32_t c3max = INT_LEAST32_MAX;
 int_least32_t c3min = INT_LEAST32_MIN;
 int_least64_t c4 = INT64_C (0x7fffffffffffffff);
 int_least64_t c4max = INT_LEAST64_MAX;
 int_least64_t c4min = INT_LEAST64_MIN;
 uint_least8_t d1 = UINT8_C (0xff);
 uint_least8_t d1max = UINT_LEAST8_MAX;
 uint_least16_t d2 = UINT16_C (0xffff);
 uint_least16_t d2max = UINT_LEAST16_MAX;
 uint_least32_t d3 = UINT32_C (0xffffffff);
 uint_least32_t d3max = UINT_LEAST32_MAX;
 uint_least64_t d4 = UINT64_C (0xffffffffffffffff);
 uint_least64_t d4max = UINT_LEAST64_MAX;
 int_fast8_t e1 = INT_FAST8_MAX;
 int_fast8_t e1min = INT_FAST8_MIN;
 int_fast16_t e2 = INT_FAST16_MAX;
 int_fast16_t e2min = INT_FAST16_MIN;
 int_fast32_t e3 = INT_FAST32_MAX;
 int_fast32_t e3min = INT_FAST32_MIN;
 int_fast64_t e4 = INT_FAST64_MAX;
 int_fast64_t e4min = INT_FAST64_MIN;
 uint_fast8_t f1 = UINT_FAST8_MAX;
 uint_fast16_t f2 = UINT_FAST16_MAX;
 uint_fast32_t f3 = UINT_FAST32_MAX;
 uint_fast64_t f4 = UINT_FAST64_MAX;
 #ifdef INTPTR_MAX
 intptr_t g = INTPTR_MAX;
 intptr_t gmin = INTPTR_MIN;
 #endif
 #ifdef UINTPTR_MAX
 uintptr_t h = UINTPTR_MAX;
 #endif
 intmax_t i = INTMAX_MAX;
 uintmax_t j = UINTMAX_MAX;
 #include <limits.h> /* for CHAR_BIT */
 #define TYPE_MINIMUM(t) \
  ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))
 #define TYPE_MAXIMUM(t) \
  ((t) ((t) 0 < (t) -1 ? (t) -1 : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
 struct s {
  int check_PTRDIFF:
      PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)
      && PTRDIFF_MAX == TYPE_MAXIMUM (ptrdiff_t)
      ? 1 : -1;
  /* Detect bug in FreeBSD 6.0 / ia64.  */
  int check_SIG_ATOMIC:
      SIG_ATOMIC_MIN == TYPE_MINIMUM (sig_atomic_t)
      && SIG_ATOMIC_MAX == TYPE_MAXIMUM (sig_atomic_t)
      ? 1 : -1;
  int check_SIZE: SIZE_MAX == TYPE_MAXIMUM (size_t) ? 1 : -1;
  int check_WCHAR:
      WCHAR_MIN == TYPE_MINIMUM (wchar_t)
      && WCHAR_MAX == TYPE_MAXIMUM (wchar_t)
      ? 1 : -1;
  /* Detect bug in mingw.  */
  int check_WINT:
      WINT_MIN == TYPE_MINIMUM (wint_t)
      && WINT_MAX == TYPE_MAXIMUM (wint_t)
      ? 1 : -1;
  /* Detect bugs in glibc 2.4 and Solaris 10 stdint.h, among others.  */
  int check_UINT8_C:
        (-1 < UINT8_C (0)) == (-1 < (uint_least8_t) 0) ? 1 : -1;
  int check_UINT16_C:
        (-1 < UINT16_C (0)) == (-1 < (uint_least16_t) 0) ? 1 : -1;
  /* Detect bugs in OpenBSD 3.9 stdint.h.  */
 #ifdef UINT8_MAX
  int check_uint8: (uint8_t) -1 == UINT8_MAX ? 1 : -1;
 #endif
 #ifdef UINT16_MAX
  int check_uint16: (uint16_t) -1 == UINT16_MAX ? 1 : -1;
 #endif
 #ifdef UINT32_MAX
  int check_uint32: (uint32_t) -1 == UINT32_MAX ? 1 : -1;
 #endif
 #ifdef UINT64_MAX
  int check_uint64: (uint64_t) -1 == UINT64_MAX ? 1 : -1;
 #endif
  int check_uint_least8: (uint_least8_t) -1 == UINT_LEAST8_MAX ? 1 : -1;
  int check_uint_least16: (uint_least16_t) -1 == UINT_LEAST16_MAX ? 1 : -1;
  int check_uint_least32: (uint_least32_t) -1 == UINT_LEAST32_MAX ? 1 : -1;
  int check_uint_least64: (uint_least64_t) -1 == UINT_LEAST64_MAX ? 1 : -1;
  int check_uint_fast8: (uint_fast8_t) -1 == UINT_FAST8_MAX ? 1 : -1;
  int check_uint_fast16: (uint_fast16_t) -1 == UINT_FAST16_MAX ? 1 : -1;
  int check_uint_fast32: (uint_fast32_t) -1 == UINT_FAST32_MAX ? 1 : -1;
  int check_uint_fast64: (uint_fast64_t) -1 == UINT_FAST64_MAX ? 1 : -1;
  int check_uintptr: (uintptr_t) -1 == UINTPTR_MAX ? 1 : -1;
  int check_uintmax: (uintmax_t) -1 == UINTMAX_MAX ? 1 : -1;
  int check_size: (size_t) -1 == SIZE_MAX ? 1 : -1;
 };
         ]])],
         [dnl Determine whether the various *_MIN, *_MAX macros are usable
          dnl in preprocessor expression. We could do it by compiling a test
          dnl program for each of these macros. It is faster to run a program
          dnl that inspects the macro expansion.
          dnl This detects a bug on HP-UX 11.23/ia64.
          AC_RUN_IFELSE([
            AC_LANG_PROGRAM([[
 #define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
 #define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
 #include <stdint.h>
 ]
 gl_STDINT_INCLUDES
 [
 #include <stdio.h>
 #include <string.h>
 #define MVAL(macro) MVAL1(macro)
 #define MVAL1(expression) #expression
 static const char *macro_values[] =
  {
 #ifdef INT8_MAX
    MVAL (INT8_MAX),
 #endif
 #ifdef INT16_MAX
    MVAL (INT16_MAX),
 #endif
 #ifdef INT32_MAX
    MVAL (INT32_MAX),
 #endif
 #ifdef INT64_MAX
    MVAL (INT64_MAX),
 #endif
 #ifdef UINT8_MAX
    MVAL (UINT8_MAX),
 #endif
 #ifdef UINT16_MAX
    MVAL (UINT16_MAX),
 #endif
 #ifdef UINT32_MAX
    MVAL (UINT32_MAX),
 #endif
 #ifdef UINT64_MAX
    MVAL (UINT64_MAX),
 #endif
    NULL
  };
 ]], [[
  const char **mv;
  for (mv = macro_values; *mv != NULL; mv++)
    {
      const char *value = *mv;
      /* Test whether it looks like a cast expression.  */
      if (strncmp (value, "((unsigned int)"/*)*/, 15) == 0
          || strncmp (value, "((unsigned short)"/*)*/, 17) == 0
          || strncmp (value, "((unsigned char)"/*)*/, 16) == 0
          || strncmp (value, "((int)"/*)*/, 6) == 0
          || strncmp (value, "((signed short)"/*)*/, 15) == 0
          || strncmp (value, "((signed char)"/*)*/, 14) == 0)
        return 1;
    }
  return 0;
 ]])],
              [gl_cv_header_working_stdint_h=yes],
              [],
              [dnl When cross-compiling, assume it works.
               gl_cv_header_working_stdint_h=yes
              ])
         ])
      ])
  fi
  if test "$gl_cv_header_working_stdint_h" = yes; then
    STDINT_H=
  else
    dnl Check for <sys/inttypes.h>, and for
    dnl <sys/bitypes.h> (used in Linux libc4 >= 4.6.7 and libc5).
    AC_CHECK_HEADERS([sys/inttypes.h sys/bitypes.h])
    if test $ac_cv_header_sys_inttypes_h = yes; then
      HAVE_SYS_INTTYPES_H=1
    else
      HAVE_SYS_INTTYPES_H=0
    fi
    AC_SUBST([HAVE_SYS_INTTYPES_H])
    if test $ac_cv_header_sys_bitypes_h = yes; then
      HAVE_SYS_BITYPES_H=1
    else
      HAVE_SYS_BITYPES_H=0
    fi
    AC_SUBST([HAVE_SYS_BITYPES_H])
    dnl Check for <wchar.h> (missing in Linux uClibc when built without wide
    dnl character support).
    AC_CHECK_HEADERS_ONCE([wchar.h])
    gl_STDINT_TYPE_PROPERTIES
    STDINT_H=stdint.h
  fi
  AC_SUBST([STDINT_H])
 ])
 dnl gl_STDINT_BITSIZEOF(TYPES, INCLUDES)
 dnl Determine the size of each of the given types in bits.
 AC_DEFUN([gl_STDINT_BITSIZEOF],
 [
  dnl Use a shell loop, to avoid bloating configure, and
  dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into
  dnl   config.h.in,
  dnl - extra AC_SUBST calls, so that the right substitutions are made.
  m4_foreach_w([gltype], [$1],
    [AH_TEMPLATE([BITSIZEOF_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
       [Define to the number of bits in type ']gltype['.])])
  for gltype in $1 ; do
    AC_CACHE_CHECK([for bit size of $gltype], [gl_cv_bitsizeof_${gltype}],
      [AC_COMPUTE_INT([result], [sizeof ($gltype) * CHAR_BIT],
         [$2
 #include <limits.h>], [result=unknown])
       eval gl_cv_bitsizeof_${gltype}=\$result
      ])
    eval result=\$gl_cv_bitsizeof_${gltype}
    if test $result = unknown; then
      dnl Use a nonempty default, because some compilers, such as IRIX 5 cc,
      dnl do a syntax check even on unused #if conditions and give an error
      dnl on valid C code like this:
      dnl   #if 0
      dnl   # if  > 32
      dnl   # endif
      dnl   #endif
      result=0
    fi
    GLTYPE=`echo "$gltype" | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
    AC_DEFINE_UNQUOTED([BITSIZEOF_${GLTYPE}], [$result])
    eval BITSIZEOF_${GLTYPE}=\$result
  done
  m4_foreach_w([gltype], [$1],
    [AC_SUBST([BITSIZEOF_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
 ])
 dnl gl_CHECK_TYPES_SIGNED(TYPES, INCLUDES)
 dnl Determine the signedness of each of the given types.
 dnl Define HAVE_SIGNED_TYPE if type is signed.
 AC_DEFUN([gl_CHECK_TYPES_SIGNED],
 [
  dnl Use a shell loop, to avoid bloating configure, and
  dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into
  dnl   config.h.in,
  dnl - extra AC_SUBST calls, so that the right substitutions are made.
  m4_foreach_w([gltype], [$1],
    [AH_TEMPLATE([HAVE_SIGNED_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
       [Define to 1 if ']gltype[' is a signed integer type.])])
  for gltype in $1 ; do
    AC_CACHE_CHECK([whether $gltype is signed], [gl_cv_type_${gltype}_signed],
      [AC_COMPILE_IFELSE(
         [AC_LANG_PROGRAM([$2[
            int verify[2 * (($gltype) -1 < ($gltype) 0) - 1];]])],
         result=yes, result=no)
       eval gl_cv_type_${gltype}_signed=\$result
      ])
    eval result=\$gl_cv_type_${gltype}_signed
    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
    if test "$result" = yes; then
      AC_DEFINE_UNQUOTED([HAVE_SIGNED_${GLTYPE}], [1])
      eval HAVE_SIGNED_${GLTYPE}=1
    else
      eval HAVE_SIGNED_${GLTYPE}=0
    fi
  done
  m4_foreach_w([gltype], [$1],
    [AC_SUBST([HAVE_SIGNED_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
 ])
 dnl gl_INTEGER_TYPE_SUFFIX(TYPES, INCLUDES)
 dnl Determine the suffix to use for integer constants of the given types.
 dnl Define t_SUFFIX for each such type.
 AC_DEFUN([gl_INTEGER_TYPE_SUFFIX],
 [
  dnl Use a shell loop, to avoid bloating configure, and
  dnl - extra AH_TEMPLATE calls, so that autoheader knows what to put into
  dnl   config.h.in,
  dnl - extra AC_SUBST calls, so that the right substitutions are made.
  m4_foreach_w([gltype], [$1],
    [AH_TEMPLATE(translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX],
       [Define to l, ll, u, ul, ull, etc., as suitable for
        constants of type ']gltype['.])])
  for gltype in $1 ; do
    AC_CACHE_CHECK([for $gltype integer literal suffix],
      [gl_cv_type_${gltype}_suffix],
      [eval gl_cv_type_${gltype}_suffix=no
       eval result=\$gl_cv_type_${gltype}_signed
       if test "$result" = yes; then
         glsufu=
       else
         glsufu=u
       fi
       for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
         case $glsuf in
           '')  gltype1='int';;
           l)	gltype1='long int';;
           ll)	gltype1='long long int';;
           i64)	gltype1='__int64';;
           u)	gltype1='unsigned int';;
           ul)	gltype1='unsigned long int';;
           ull)	gltype1='unsigned long long int';;
           ui64)gltype1='unsigned __int64';;
         esac
         AC_COMPILE_IFELSE(
           [AC_LANG_PROGRAM([$2[
              extern $gltype foo;
              extern $gltype1 foo;]])],
           [eval gl_cv_type_${gltype}_suffix=\$glsuf])
         eval result=\$gl_cv_type_${gltype}_suffix
         test "$result" != no && break
       done])
    GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
    eval result=\$gl_cv_type_${gltype}_suffix
    test "$result" = no && result=
    eval ${GLTYPE}_SUFFIX=\$result
    AC_DEFINE_UNQUOTED([${GLTYPE}_SUFFIX], [$result])
  done
  m4_foreach_w([gltype], [$1],
    [AC_SUBST(translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX])])
 ])
 dnl gl_STDINT_INCLUDES
 AC_DEFUN([gl_STDINT_INCLUDES],
 [[
  /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
     included before <wchar.h>.  */
  #include <stddef.h>
  #include <signal.h>
  #if HAVE_WCHAR_H
  # include <stdio.h>
  # include <time.h>
  # include <wchar.h>
  #endif
 ]])
 dnl gl_STDINT_TYPE_PROPERTIES
 dnl Compute HAVE_SIGNED_t, BITSIZEOF_t and t_SUFFIX, for all the types t
 dnl of interest to stdint.in.h.
 AC_DEFUN([gl_STDINT_TYPE_PROPERTIES],
 [
  AC_REQUIRE([gl_MULTIARCH])
  if test $APPLE_UNIVERSAL_BUILD = 0; then
    gl_STDINT_BITSIZEOF([ptrdiff_t size_t],
      [gl_STDINT_INCLUDES])
  fi
  gl_STDINT_BITSIZEOF([sig_atomic_t wchar_t wint_t],
    [gl_STDINT_INCLUDES])
  gl_CHECK_TYPES_SIGNED([sig_atomic_t wchar_t wint_t],
    [gl_STDINT_INCLUDES])
  gl_cv_type_ptrdiff_t_signed=yes
  gl_cv_type_size_t_signed=no
  if test $APPLE_UNIVERSAL_BUILD = 0; then
    gl_INTEGER_TYPE_SUFFIX([ptrdiff_t size_t],
      [gl_STDINT_INCLUDES])
  fi
  gl_INTEGER_TYPE_SUFFIX([sig_atomic_t wchar_t wint_t],
    [gl_STDINT_INCLUDES])
 ])
 dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in.
 dnl Remove this when we can assume autoconf >= 2.61.
 m4_ifdef([AC_COMPUTE_INT], [], [
  AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])])
 ])
 # Hey Emacs!
 # Local Variables:
 # indent-tabs-mode: nil
 # End:
--- a/m4/stdlib_h.m4
+++ b/m4/stdlib_h.m4
@ -0,0 +1,73 @@
 # stdlib_h.m4 serial 15
 dnl Copyright (C) 2007-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_STDLIB_H],
 [
  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
  gl_CHECK_NEXT_HEADERS([stdlib.h])
  AC_CHECK_HEADERS([random.h], [], [], [AC_INCLUDES_DEFAULT])
  if test $ac_cv_header_random_h = yes; then
    HAVE_RANDOM_H=1
  else
    HAVE_RANDOM_H=0
  fi
  AC_SUBST([HAVE_RANDOM_H])
  AC_CHECK_TYPES([struct random_data],
    [], [HAVE_STRUCT_RANDOM_DATA=0],
    [[#include <stdlib.h>
      #if HAVE_RANDOM_H
      # include <random.h>
      #endif
    ]])
 ])
 AC_DEFUN([gl_STDLIB_MODULE_INDICATOR],
 [
  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
  GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
 ])
 AC_DEFUN([gl_STDLIB_H_DEFAULTS],
 [
  GNULIB_MALLOC_POSIX=0;  AC_SUBST([GNULIB_MALLOC_POSIX])
  GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX])
  GNULIB_CALLOC_POSIX=0;  AC_SUBST([GNULIB_CALLOC_POSIX])
  GNULIB_ATOLL=0;         AC_SUBST([GNULIB_ATOLL])
  GNULIB_GETLOADAVG=0;    AC_SUBST([GNULIB_GETLOADAVG])
  GNULIB_GETSUBOPT=0;     AC_SUBST([GNULIB_GETSUBOPT])
  GNULIB_MKDTEMP=0;       AC_SUBST([GNULIB_MKDTEMP])
  GNULIB_MKSTEMP=0;       AC_SUBST([GNULIB_MKSTEMP])
  GNULIB_PUTENV=0;        AC_SUBST([GNULIB_PUTENV])
  GNULIB_RANDOM_R=0;      AC_SUBST([GNULIB_RANDOM_R])
  GNULIB_RPMATCH=0;       AC_SUBST([GNULIB_RPMATCH])
  GNULIB_SETENV=0;        AC_SUBST([GNULIB_SETENV])
  GNULIB_STRTOD=0;        AC_SUBST([GNULIB_STRTOD])
  GNULIB_STRTOLL=0;       AC_SUBST([GNULIB_STRTOLL])
  GNULIB_STRTOULL=0;      AC_SUBST([GNULIB_STRTOULL])
  GNULIB_UNSETENV=0;      AC_SUBST([GNULIB_UNSETENV])
  dnl Assume proper GNU behavior unless another module says otherwise.
  HAVE_ATOLL=1;              AC_SUBST([HAVE_ATOLL])
  HAVE_CALLOC_POSIX=1;       AC_SUBST([HAVE_CALLOC_POSIX])
  HAVE_GETSUBOPT=1;          AC_SUBST([HAVE_GETSUBOPT])
  HAVE_MALLOC_POSIX=1;       AC_SUBST([HAVE_MALLOC_POSIX])
  HAVE_MKDTEMP=1;            AC_SUBST([HAVE_MKDTEMP])
  HAVE_REALLOC_POSIX=1;      AC_SUBST([HAVE_REALLOC_POSIX])
  HAVE_RANDOM_R=1;           AC_SUBST([HAVE_RANDOM_R])
  HAVE_RPMATCH=1;            AC_SUBST([HAVE_RPMATCH])
  HAVE_SETENV=1;             AC_SUBST([HAVE_SETENV])
  HAVE_STRTOD=1;             AC_SUBST([HAVE_STRTOD])
  HAVE_STRTOLL=1;            AC_SUBST([HAVE_STRTOLL])
  HAVE_STRTOULL=1;           AC_SUBST([HAVE_STRTOULL])
  HAVE_STRUCT_RANDOM_DATA=1; AC_SUBST([HAVE_STRUCT_RANDOM_DATA])
  HAVE_SYS_LOADAVG_H=0;      AC_SUBST([HAVE_SYS_LOADAVG_H])
  HAVE_UNSETENV=1;           AC_SUBST([HAVE_UNSETENV])
  HAVE_DECL_GETLOADAVG=1;    AC_SUBST([HAVE_DECL_GETLOADAVG])
  REPLACE_MKSTEMP=0;         AC_SUBST([REPLACE_MKSTEMP])
  REPLACE_PUTENV=0;          AC_SUBST([REPLACE_PUTENV])
  REPLACE_STRTOD=0;          AC_SUBST([REPLACE_STRTOD])
  VOID_UNSETENV=0;           AC_SUBST([VOID_UNSETENV])
 ])
--- a/m4/strcase.m4
+++ b/m4/strcase.m4
@ -1,5 +1,5 @@
-# strcase.m4 serial 9
+# strcase.m4 serial 10
-dnl Copyright (C) 2002, 2005-2008 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@ -13,7 +13,7 @@ AC_DEFUN([gl_STRCASE],
 AC_DEFUN([gl_FUNC_STRCASECMP],
 [
  AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS])
-  AC_REPLACE_FUNCS(strcasecmp)
+  AC_REPLACE_FUNCS([strcasecmp])
  if test $ac_cv_func_strcasecmp = no; then
    HAVE_STRCASECMP=0
    gl_PREREQ_STRCASECMP
@ -23,11 +23,11 @@ AC_DEFUN([gl_FUNC_STRCASECMP],
 AC_DEFUN([gl_FUNC_STRNCASECMP],
 [
  AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS])
-  AC_REPLACE_FUNCS(strncasecmp)
+  AC_REPLACE_FUNCS([strncasecmp])
  if test $ac_cv_func_strncasecmp = no; then
    gl_PREREQ_STRNCASECMP
  fi
-  AC_CHECK_DECLS(strncasecmp)
+  AC_CHECK_DECLS([strncasecmp])
  if test $ac_cv_have_decl_strncasecmp = no; then
    HAVE_DECL_STRNCASECMP=0
  fi
--- a/m4/strftime.m4
+++ b/m4/strftime.m4
@ -1,7 +1,7 @@
-#serial 29
+# serial 32
 # Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-# 2006, 2007 Free Software Foundation, Inc.
+# 2006, 2007, 2009 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -25,8 +25,8 @@ AC_DEFUN([gl_FUNC_STRFTIME],
 AC_REQUIRE([AC_TYPE_MBSTATE_T])
 AC_REQUIRE([gl_TM_GMTOFF])
- AC_CHECK_FUNCS_ONCE(mblen mbrlen mempcpy tzset)
+ AC_CHECK_FUNCS_ONCE([tzset])
- AC_CHECK_HEADERS_ONCE(wchar.h)
+ AC_CHECK_HEADERS_ONCE([wchar.h])
 AC_DEFINE([my_strftime], [nstrftime],
   [Define to the name of the strftime replacement function.])
--- a/m4/sys_file_h.m4
+++ b/m4/sys_file_h.m4
@ -0,0 +1,41 @@
 # Configure a replacement for <sys/file.h>.
 # Copyright (C) 2008 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 # Written by Richard W.M. Jones.
 AC_DEFUN([gl_HEADER_SYS_FILE_H],
 [
  AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS])
  dnl Only flock is defined in a working <sys/file.h>.  If that
  dnl function is already there, we don't want to do any substitution.
  AC_CHECK_FUNCS_ONCE([flock])
  gl_CHECK_NEXT_HEADERS([sys/file.h])
  SYS_FILE_H='sys/file.h'
  AC_SUBST([SYS_FILE_H])
  AC_CHECK_HEADERS_ONCE([sys/file.h])
  if test $ac_cv_header_sys_file_h = yes; then
    HAVE_SYS_FILE_H=1
  else
    HAVE_SYS_FILE_H=0
  fi
  AC_SUBST([HAVE_SYS_FILE_H])
 ])
 AC_DEFUN([gl_HEADER_SYS_FILE_MODULE_INDICATOR],
 [
  AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS])
  GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
 ])
 AC_DEFUN([gl_HEADER_SYS_FILE_H_DEFAULTS],
 [
  GNULIB_FLOCK=0;        AC_SUBST([GNULIB_FLOCK])
  HAVE_FLOCK=1;          AC_SUBST([HAVE_FLOCK])
 ])
--- a/m4/tm_gmtoff.m4
+++ b/m4/tm_gmtoff.m4
@ -1,5 +1,5 @@
-# tm_gmtoff.m4 serial 2
+# tm_gmtoff.m4 serial 3
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_TM_GMTOFF],
 [
 AC_CHECK_MEMBER([struct tm.tm_gmtoff],
-                 [AC_DEFINE(HAVE_TM_GMTOFF, 1,
+                 [AC_DEFINE([HAVE_TM_GMTOFF], [1],
                            [Define if struct tm has the tm_gmtoff member.])],
                 ,
                 [#include <time.h>])
--- a/m4/unistd_h.m4
+++ b/m4/unistd_h.m4
@ -1,5 +1,5 @@
-# unistd_h.m4 serial 16
+# unistd_h.m4 serial 17
-dnl Copyright (C) 2006-2008 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@ -48,6 +48,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
  GNULIB_GETPAGESIZE=0;      AC_SUBST([GNULIB_GETPAGESIZE])
  GNULIB_GETUSERSHELL=0;     AC_SUBST([GNULIB_GETUSERSHELL])
  GNULIB_LCHOWN=0;           AC_SUBST([GNULIB_LCHOWN])
  GNULIB_LINK=0;             AC_SUBST([GNULIB_LINK])
  GNULIB_LSEEK=0;            AC_SUBST([GNULIB_LSEEK])
  GNULIB_READLINK=0;         AC_SUBST([GNULIB_READLINK])
  GNULIB_SLEEP=0;            AC_SUBST([GNULIB_SLEEP])
@ -63,6 +64,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
  HAVE_GETHOSTNAME=1;     AC_SUBST([HAVE_GETHOSTNAME])
  HAVE_GETPAGESIZE=1;     AC_SUBST([HAVE_GETPAGESIZE])
  HAVE_GETUSERSHELL=1;    AC_SUBST([HAVE_GETUSERSHELL])
  HAVE_LINK=1;            AC_SUBST([HAVE_LINK])
  HAVE_READLINK=1;        AC_SUBST([HAVE_READLINK])
  HAVE_SLEEP=1;           AC_SUBST([HAVE_SLEEP])
  HAVE_DECL_ENVIRON=1;    AC_SUBST([HAVE_DECL_ENVIRON])
--- a/m4/wchar.m4
+++ b/m4/wchar.m4
@ -1,13 +1,13 @@
 dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
-dnl Copyright (C) 2007-2008 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl Written by Eric Blake.
-# wchar.m4 serial 22
+# wchar.m4 serial 23
 AC_DEFUN([gl_WCHAR_H],
 [
@ -73,27 +73,28 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS],
  GNULIB_WCSNRTOMBS=0; AC_SUBST([GNULIB_WCSNRTOMBS])
  GNULIB_WCWIDTH=0;    AC_SUBST([GNULIB_WCWIDTH])
  dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_BTOWC=1;        AC_SUBST([HAVE_BTOWC])
+  HAVE_BTOWC=1;         AC_SUBST([HAVE_BTOWC])
-  HAVE_MBSINIT=1;      AC_SUBST([HAVE_MBSINIT])
+  HAVE_MBSINIT=1;       AC_SUBST([HAVE_MBSINIT])
-  HAVE_MBRTOWC=1;      AC_SUBST([HAVE_MBRTOWC])
+  HAVE_MBRTOWC=1;       AC_SUBST([HAVE_MBRTOWC])
-  HAVE_MBRLEN=1;       AC_SUBST([HAVE_MBRLEN])
+  HAVE_MBRLEN=1;        AC_SUBST([HAVE_MBRLEN])
-  HAVE_MBSRTOWCS=1;    AC_SUBST([HAVE_MBSRTOWCS])
+  HAVE_MBSRTOWCS=1;     AC_SUBST([HAVE_MBSRTOWCS])
-  HAVE_MBSNRTOWCS=1;   AC_SUBST([HAVE_MBSNRTOWCS])
+  HAVE_MBSNRTOWCS=1;    AC_SUBST([HAVE_MBSNRTOWCS])
-  HAVE_WCRTOMB=1;      AC_SUBST([HAVE_WCRTOMB])
+  HAVE_WCRTOMB=1;       AC_SUBST([HAVE_WCRTOMB])
-  HAVE_WCSRTOMBS=1;    AC_SUBST([HAVE_WCSRTOMBS])
+  HAVE_WCSRTOMBS=1;     AC_SUBST([HAVE_WCSRTOMBS])
-  HAVE_WCSNRTOMBS=1;   AC_SUBST([HAVE_WCSNRTOMBS])
+  HAVE_WCSNRTOMBS=1;    AC_SUBST([HAVE_WCSNRTOMBS])
-  HAVE_DECL_WCTOB=1;   AC_SUBST([HAVE_DECL_WCTOB])
+  HAVE_DECL_WCTOB=1;    AC_SUBST([HAVE_DECL_WCTOB])
-  HAVE_DECL_WCWIDTH=1; AC_SUBST([HAVE_DECL_WCWIDTH])
+  HAVE_DECL_WCWIDTH=1;  AC_SUBST([HAVE_DECL_WCWIDTH])
-  REPLACE_MBSTATE_T=0; AC_SUBST([REPLACE_MBSTATE_T])
+  REPLACE_MBSTATE_T=0;  AC_SUBST([REPLACE_MBSTATE_T])
-  REPLACE_BTOWC=0;     AC_SUBST([REPLACE_BTOWC])
+  REPLACE_BTOWC=0;      AC_SUBST([REPLACE_BTOWC])
-  REPLACE_WCTOB=0;     AC_SUBST([REPLACE_WCTOB])
+  REPLACE_WCTOB=0;      AC_SUBST([REPLACE_WCTOB])
-  REPLACE_MBSINIT=0;   AC_SUBST([REPLACE_MBSINIT])
+  REPLACE_MBSINIT=0;    AC_SUBST([REPLACE_MBSINIT])
-  REPLACE_MBRTOWC=0;   AC_SUBST([REPLACE_MBRTOWC])
+  REPLACE_MBRTOWC=0;    AC_SUBST([REPLACE_MBRTOWC])
-  REPLACE_MBRLEN=0;    AC_SUBST([REPLACE_MBRLEN])
+  REPLACE_MBRLEN=0;     AC_SUBST([REPLACE_MBRLEN])
-  REPLACE_MBSRTOWCS=0; AC_SUBST([REPLACE_MBSRTOWCS])
+  REPLACE_MBSRTOWCS=0;  AC_SUBST([REPLACE_MBSRTOWCS])
-  REPLACE_MBSNRTOWCS=0;AC_SUBST([REPLACE_MBSNRTOWCS])
+  REPLACE_MBSNRTOWCS=0; AC_SUBST([REPLACE_MBSNRTOWCS])
-  REPLACE_WCRTOMB=0;   AC_SUBST([REPLACE_WCRTOMB])
+  REPLACE_WCRTOMB=0;    AC_SUBST([REPLACE_WCRTOMB])
-  REPLACE_WCSRTOMBS=0; AC_SUBST([REPLACE_WCSRTOMBS])
+  REPLACE_WCSRTOMBS=0;  AC_SUBST([REPLACE_WCSRTOMBS])
-  REPLACE_WCWIDTH=0;   AC_SUBST([REPLACE_WCWIDTH])
+  REPLACE_WCSNRTOMBS=0; AC_SUBST([REPLACE_WCSNRTOMBS])
-  WCHAR_H='';          AC_SUBST([WCHAR_H])
+  REPLACE_WCWIDTH=0;    AC_SUBST([REPLACE_WCWIDTH])
  WCHAR_H='';           AC_SUBST([WCHAR_H])
 ])
--- a/m4/wint_t.m4
+++ b/m4/wint_t.m4
@ -1,5 +1,5 @@
-# wint_t.m4 serial 3 (gettext-0.18)
+# wint_t.m4 serial 4 (gettext-0.18)
-dnl Copyright (C) 2003, 2007-2008 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@ -23,6 +23,6 @@ AC_DEFUN([gt_TYPE_WINT_T],
       wint_t foo = (wchar_t)'\0';], ,
       [gt_cv_c_wint_t=yes], [gt_cv_c_wint_t=no])])
  if test $gt_cv_c_wint_t = yes; then
-    AC_DEFINE([HAVE_WINT_T], 1, [Define if you have the 'wint_t' type.])
+    AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.])
  fi
 ])