Merge tag 'upstream/0.9.7'

Upstream version 0.9.7

1 files changed, 51 insertions, 12 deletions

diff --git a/gnulib-m4/gnulib-comp.m4 b/gnulib-m4/gnulib-comp.m4
index cab72bd..cf33452 100644
--- a/gnulib-m4/gnulib-comp.m4
+++ b/gnulib-m4/gnulib-comp.m4
@@ -1,5 +1,5 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -37,7 +37,11 @@ AC_DEFUN([gl_EARLY],
   m4_pattern_allow([^gl_ES$])dnl a valid locale name
   m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
   m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
+
+  # Pre-early section.
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_REQUIRE([gl_PROG_AR_RANLIB])
+
   AC_REQUIRE([AM_PROG_CC_C_O])
   # Code from module absolute-header:
   # Code from module alloca-opt:
@@ -53,6 +57,11 @@ AC_DEFUN([gl_EARLY],
   # Code from module c-strcase-tests:
   # Code from module c-strcaseeq:
   # Code from module configmake:
+  # Code from module ctype:
+  # Code from module ctype-tests:
+  # Code from module dirname-lgpl:
+  # Code from module dosname:
+  # Code from module double-slash-root:
   # Code from module environ:
   # Code from module environ-tests:
   # Code from module errno:
@@ -60,11 +69,11 @@ AC_DEFUN([gl_EARLY],
   # Code from module error:
   # Code from module exitfail:
   # Code from module extensions:
-  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   # Code from module extern-inline:
   # Code from module fdopen:
   # Code from module fdopen-tests:
   # Code from module fgetc-tests:
+  # Code from module flexmember:
   # Code from module float:
   # Code from module float-tests:
   # Code from module fpieee:
@@ -80,8 +89,11 @@ AC_DEFUN([gl_EARLY],
   # Code from module fseterr-tests:
   # Code from module fwrite-tests:
   # Code from module getpagesize:
+  # Code from module getprogname:
+  # Code from module getprogname-tests:
   # Code from module gettext-h:
   # Code from module gperf:
+  # Code from module hard-locale:
   # Code from module havelib:
   # Code from module iconv:
   # Code from module iconv-h:
@@ -105,6 +117,8 @@ AC_DEFUN([gl_EARLY],
   # Code from module iswblank-tests:
   # Code from module langinfo:
   # Code from module langinfo-tests:
+  # Code from module limits-h:
+  # Code from module limits-h-tests:
   # Code from module localcharset:
   # Code from module locale:
   # Code from module locale-tests:
@@ -138,7 +152,6 @@ AC_DEFUN([gl_EARLY],
   # Code from module printf-frexpl:
   # Code from module printf-frexpl-tests:
   # Code from module printf-safe:
-  # Code from module progname:
   # Code from module putenv:
   # Code from module relocatable-lib-lgpl:
   # Code from module setenv:
@@ -1159,6 +1172,7 @@ AC_DEFUN([gl_INIT],
   gl_CONFIGMAKE_PREP
   gl_HEADER_ERRNO_H
   AC_REQUIRE([gl_EXTERN_INLINE])
+  AC_C_FLEXIBLE_ARRAY_MEMBER
   gl_FLOAT_H
   if test $REPLACE_FLOAT_LDBL = 1; then
     AC_LIBOBJ([float])
@@ -1180,6 +1194,7 @@ AC_DEFUN([gl_INIT],
   if test $ac_cv_func___fseterr = no; then
     AC_LIBOBJ([fseterr])
   fi
+  gl_HARD_LOCALE
   AM_ICONV
   m4_ifdef([gl_ICONV_MODULE_INDICATOR],
     [gl_ICONV_MODULE_INDICATOR([iconv])])
@@ -1218,6 +1233,7 @@ AC_DEFUN([gl_INIT],
   fi
   gl_WCTYPE_MODULE_INDICATOR([iswblank])
   gl_LANGINFO_H
+  gl_LIMITS_H
   gl_LOCALCHARSET
   LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
   AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
@@ -1827,7 +1843,7 @@ AC_DEFUN([gl_INIT],
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strrchr])
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strspn])
   gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u16-strstr])
-  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strtok])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unistr/u16-strtok])
   gl_LIBUNISTRING_MODULE([0.9.3], [unistr/u16-to-u32])
   gl_LIBUNISTRING_MODULE([0.9.3], [unistr/u16-to-u8])
   gl_MODULE_INDICATOR([unistr/u16-uctomb])
@@ -1872,7 +1888,7 @@ AC_DEFUN([gl_INIT],
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strrchr])
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strspn])
   gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u32-strstr])
-  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strtok])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unistr/u32-strtok])
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-to-u16])
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-to-u8])
   gl_MODULE_INDICATOR([unistr/u32-uctomb])
@@ -1919,7 +1935,7 @@ AC_DEFUN([gl_INIT],
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strrchr])
   gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strspn])
   gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u8-strstr])
-  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strtok])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unistr/u8-strtok])
   gl_LIBUNISTRING_MODULE([0.9.3], [unistr/u8-to-u16])
   gl_LIBUNISTRING_MODULE([0.9.3], [unistr/u8-to-u32])
   gl_MODULE_INDICATOR([unistr/u8-uctomb])
@@ -2003,6 +2019,9 @@ changequote([, ])dnl
   gt_LOCALE_FR_UTF8
   gt_LOCALE_FR
   gt_LOCALE_TR_UTF8
+  gl_CTYPE_H
+  gl_DIRNAME_LGPL
+  gl_DOUBLE_SLASH_ROOT
   gl_ENVIRON
   gl_UNISTD_MODULE_INDICATOR([environ])
   gl_ERROR
@@ -2024,6 +2043,7 @@ changequote([, ])dnl
     AC_LIBOBJ([getpagesize])
   fi
   gl_UNISTD_MODULE_INDICATOR([getpagesize])
+  gl_FUNC_GETPROGNAME
   AC_SUBST([LIBINTL])
   AC_SUBST([LTLIBINTL])
   gl_INTTYPES_H
@@ -2050,16 +2070,14 @@ changequote([, ])dnl
   gl_FUNC_MMAP_ANON
   AC_CHECK_HEADERS_ONCE([sys/mman.h])
   AC_CHECK_FUNCS_ONCE([mprotect])
-  gl_MSVC_INVAL
+  AC_REQUIRE([gl_MSVC_INVAL])
   if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
     AC_LIBOBJ([msvc-inval])
   fi
-  gl_MSVC_NOTHROW
+  AC_REQUIRE([gl_MSVC_NOTHROW])
   if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
     AC_LIBOBJ([msvc-nothrow])
   fi
-  AC_CHECK_DECLS([program_invocation_name], [], [], [#include <errno.h>])
-  AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include <errno.h>])
   gl_FUNC_PUTENV
   if test $REPLACE_PUTENV = 1; then
     AC_LIBOBJ([putenv])
@@ -2338,6 +2356,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/c-strncasecmp.c
   lib/config.charset
   lib/errno.in.h
+  lib/flexmember.h
   lib/float+.h
   lib/float.c
   lib/float.in.h
@@ -2349,6 +2368,8 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/glthread/lock.c
   lib/glthread/lock.h
   lib/glthread/threadlib.c
+  lib/hard-locale.c
+  lib/hard-locale.h
   lib/iconv.c
   lib/iconv.in.h
   lib/iconv_close.c
@@ -2369,6 +2390,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/iswblank.c
   lib/itold.c
   lib/langinfo.in.h
+  lib/limits.in.h
   lib/localcharset.c
   lib/localcharset.h
   lib/localename.c
@@ -3202,6 +3224,9 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/btowc.m4
   m4/codeset.m4
   m4/configmake.m4
+  m4/ctype.m4
+  m4/dirname.m4
+  m4/double-slash-root.m4
   m4/eealloc.m4
   m4/environ.m4
   m4/errno_h.m4
@@ -3213,14 +3238,17 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/extern-inline.m4
   m4/fcntl-o.m4
   m4/fdopen.m4
+  m4/flexmember.m4
   m4/float_h.m4
   m4/fpieee.m4
   m4/frexp.m4
   m4/frexpl.m4
   m4/fseterr.m4
   m4/getpagesize.m4
+  m4/getprogname.m4
   m4/glibc21.m4
   m4/gnulib-common.m4
+  m4/hard-locale.m4
   m4/iconv.m4
   m4/iconv_h.m4
   m4/iconv_open.m4
@@ -3242,6 +3270,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/lib-link.m4
   m4/lib-prefix.m4
   m4/libunistring-base.m4
+  m4/limits-h.m4
   m4/localcharset.m4
   m4/locale-ar.m4
   m4/locale-fr.m4
@@ -3325,6 +3354,7 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/test-c-strcase.sh
   tests/test-c-strcasecmp.c
   tests/test-c-strncasecmp.c
+  tests/test-ctype.c
   tests/test-environ.c
   tests/test-errno.c
   tests/test-fdopen.c
@@ -3337,6 +3367,7 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/test-frexpl.c
   tests/test-fseterr.c
   tests/test-fwrite.c
+  tests/test-getprogname.c
   tests/test-iconv-h.c
   tests/test-iconv.c
   tests/test-init.sh
@@ -3350,6 +3381,7 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/test-isnanl.h
   tests/test-iswblank.c
   tests/test-langinfo.c
+  tests/test-limits-h.c
   tests/test-locale.c
   tests/test-localename.c
   tests/test-lock.c
@@ -3366,6 +3398,7 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/test-mbrtowc2.sh
   tests/test-mbrtowc3.sh
   tests/test-mbrtowc4.sh
+  tests/test-mbrtowc5.sh
   tests/test-mbsinit.c
   tests/test-mbsinit.sh
   tests/test-memchr.c
@@ -3924,13 +3957,20 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/uniwidth/test-uc_width2.c
   tests/uniwidth/test-uc_width2.sh
   tests/zerosize-ptr.h
+  tests=lib/basename-lgpl.c
   tests=lib/btowc.c
+  tests=lib/ctype.in.h
+  tests=lib/dirname-lgpl.c
+  tests=lib/dirname.h
+  tests=lib/dosname.h
   tests=lib/error.c
   tests=lib/error.h
   tests=lib/exitfail.c
   tests=lib/exitfail.h
   tests=lib/fdopen.c
   tests=lib/getpagesize.c
+  tests=lib/getprogname.c
+  tests=lib/getprogname.h
   tests=lib/gettext.h
   tests=lib/glthread/thread.c
   tests=lib/glthread/thread.h
@@ -3944,8 +3984,6 @@ AC_DEFUN([gl_FILE_LIST], [
   tests=lib/msvc-inval.h
   tests=lib/msvc-nothrow.c
   tests=lib/msvc-nothrow.h
-  tests=lib/progname.c
-  tests=lib/progname.h
   tests=lib/putenv.c
   tests=lib/setenv.c
   tests=lib/setlocale.c
@@ -3954,6 +3992,7 @@ AC_DEFUN([gl_FILE_LIST], [
   tests=lib/strerror-override.c
   tests=lib/strerror-override.h
   tests=lib/strerror.c
+  tests=lib/stripslash.c
   tests=lib/unsetenv.c
   tests=lib/wcrtomb.c
   tests=lib/wctob.c