Re-generate gnulib import

I noticed that re-generating our gnulib import introduced some changes.
I supposed that this comes from the recent upgrade to autoconf 2.69
(though I haven't checked).

Tested by rebuilding on GNU/Linux x86-64 and mingw (cross-compiled from
GNU/Linux).

gdb/ChangeLog:

	* gnulib/aclocal.m4: Re-generate.
	* gnulib/config.in: Re-generate.
	* gnulib/configure: Re-generate.
	* gnulib/import/Makefile.in: Re-generate.
	* gnulib/import/m4/gnulib-comp.m4: Re-generate.
	* gnulib/import/m4/onceonly.m4: Re-generate.

1 files changed, 937 insertions, 79 deletions

diff --git a/gdb/gnulib/configure b/gdb/gnulib/configure
index 55a59b9..a5d76ac 100644
--- a/gdb/gnulib/configure
+++ b/gdb/gnulib/configure
@@ -619,8 +619,8 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_func_list=
-ac_header_list=
+gl_func_list=
+gl_header_list=
 gl_fnmatch_required=POSIX
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
@@ -3376,62 +3376,62 @@ $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
-as_fn_append ac_func_list " canonicalize_file_name"
-as_fn_append ac_func_list " getcwd"
-as_fn_append ac_func_list " readlink"
-as_fn_append ac_func_list " realpath"
-as_fn_append ac_header_list " sys/param.h"
-as_fn_append ac_header_list " unistd.h"
-as_fn_append ac_func_list " _set_invalid_parameter_handler"
-as_fn_append ac_header_list " sys/socket.h"
-as_fn_append ac_func_list " fchdir"
-as_fn_append ac_header_list " dirent.h"
-as_fn_append ac_func_list " fcntl"
-as_fn_append ac_func_list " symlink"
-as_fn_append ac_func_list " fdopendir"
-as_fn_append ac_func_list " mempcpy"
-as_fn_append ac_func_list " btowc"
-as_fn_append ac_func_list " isblank"
-as_fn_append ac_func_list " iswctype"
-as_fn_append ac_func_list " mbsrtowcs"
-as_fn_append ac_func_list " wmemchr"
-as_fn_append ac_func_list " wmemcpy"
-as_fn_append ac_func_list " wmempcpy"
-as_fn_append ac_header_list " wctype.h"
+gl_func_list="$gl_func_list canonicalize_file_name"
+gl_func_list="$gl_func_list getcwd"
+gl_func_list="$gl_func_list readlink"
+gl_func_list="$gl_func_list realpath"
+gl_header_list="$gl_header_list sys/param.h"
+gl_header_list="$gl_header_list unistd.h"
+gl_func_list="$gl_func_list _set_invalid_parameter_handler"
+gl_header_list="$gl_header_list sys/socket.h"
+gl_func_list="$gl_func_list fchdir"
+gl_header_list="$gl_header_list dirent.h"
+gl_func_list="$gl_func_list fcntl"
+gl_func_list="$gl_func_list symlink"
+gl_func_list="$gl_func_list fdopendir"
+gl_func_list="$gl_func_list mempcpy"
+gl_func_list="$gl_func_list btowc"
+gl_func_list="$gl_func_list isblank"
+gl_func_list="$gl_func_list iswctype"
+gl_func_list="$gl_func_list mbsrtowcs"
+gl_func_list="$gl_func_list wmemchr"
+gl_func_list="$gl_func_list wmemcpy"
+gl_func_list="$gl_func_list wmempcpy"
+gl_header_list="$gl_header_list wctype.h"
 gl_fnmatch_required=GNU
-as_fn_append ac_header_list " sys/stat.h"
-as_fn_append ac_func_list " fstatat"
-as_fn_append ac_func_list " getdtablesize"
-as_fn_append ac_func_list " getlogin_r"
-as_fn_append ac_func_list " getprogname"
-as_fn_append ac_func_list " getexecname"
-as_fn_append ac_header_list " sys/time.h"
-as_fn_append ac_func_list " gettimeofday"
-as_fn_append ac_header_list " sys/cdefs.h"
-as_fn_append ac_func_list " getpwnam_r"
-as_fn_append ac_header_list " limits.h"
-as_fn_append ac_header_list " wchar.h"
-as_fn_append ac_header_list " stdint.h"
-as_fn_append ac_header_list " inttypes.h"
-as_fn_append ac_func_list " lstat"
-as_fn_append ac_header_list " math.h"
-as_fn_append ac_func_list " mbsinit"
-as_fn_append ac_func_list " mbrtowc"
-as_fn_append ac_header_list " sys/mman.h"
-as_fn_append ac_func_list " mprotect"
-as_fn_append ac_func_list " mkstemp"
-as_fn_append ac_func_list " openat"
-as_fn_append ac_func_list " link"
-as_fn_append ac_func_list " secure_getenv"
-as_fn_append ac_func_list " getuid"
-as_fn_append ac_func_list " geteuid"
-as_fn_append ac_func_list " getgid"
-as_fn_append ac_func_list " getegid"
-as_fn_append ac_func_list " setenv"
-as_fn_append ac_func_list " strdup"
-as_fn_append ac_func_list " pipe"
-as_fn_append ac_header_list " features.h"
-as_fn_append ac_func_list " iswcntrl"
+gl_header_list="$gl_header_list sys/stat.h"
+gl_func_list="$gl_func_list fstatat"
+gl_func_list="$gl_func_list getdtablesize"
+gl_func_list="$gl_func_list getlogin_r"
+gl_func_list="$gl_func_list getprogname"
+gl_func_list="$gl_func_list getexecname"
+gl_header_list="$gl_header_list sys/time.h"
+gl_func_list="$gl_func_list gettimeofday"
+gl_header_list="$gl_header_list sys/cdefs.h"
+gl_func_list="$gl_func_list getpwnam_r"
+gl_header_list="$gl_header_list limits.h"
+gl_header_list="$gl_header_list wchar.h"
+gl_header_list="$gl_header_list stdint.h"
+gl_header_list="$gl_header_list inttypes.h"
+gl_func_list="$gl_func_list lstat"
+gl_header_list="$gl_header_list math.h"
+gl_func_list="$gl_func_list mbsinit"
+gl_func_list="$gl_func_list mbrtowc"
+gl_header_list="$gl_header_list sys/mman.h"
+gl_func_list="$gl_func_list mprotect"
+gl_func_list="$gl_func_list mkstemp"
+gl_func_list="$gl_func_list openat"
+gl_func_list="$gl_func_list link"
+gl_func_list="$gl_func_list secure_getenv"
+gl_func_list="$gl_func_list getuid"
+gl_func_list="$gl_func_list geteuid"
+gl_func_list="$gl_func_list getgid"
+gl_func_list="$gl_func_list getegid"
+gl_func_list="$gl_func_list setenv"
+gl_func_list="$gl_func_list strdup"
+gl_func_list="$gl_func_list pipe"
+gl_header_list="$gl_header_list features.h"
+gl_func_list="$gl_func_list iswcntrl"
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -6753,7 +6753,8 @@ fi
 
 
 
-  for ac_func in $ac_func_list
+
+  for ac_func in $gl_func_list
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -6773,6 +6774,14 @@ done
 
 
 
+
+
+
+
+
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether // is distinct from /" >&5
 $as_echo_n "checking whether // is distinct from /... " >&6; }
 if ${gl_cv_double_slash_root+:} false; then :
@@ -6814,6 +6823,15 @@ $as_echo "#define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
 
 
 
+
+
+
+  :
+
+
+
+
+
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether realpath works" >&5
 $as_echo_n "checking whether realpath works... " >&6; }
 if ${gl_cv_func_realpath_works+:} false; then :
@@ -7015,11 +7033,11 @@ $as_echo "#define FUNC_REALPATH_WORKS 1" >>confdefs.h
 
 
 
-  for ac_header in $ac_header_list
+
+  for ac_header in $gl_header_list
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
@@ -7036,6 +7054,26 @@ done
 
 
 
+  :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  :
+
+
+
+
 
 
 
@@ -7171,6 +7209,27 @@ done
 
 
 
+  :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  :
+
+
+
 
 
   if test $ac_cv_func__set_invalid_parameter_handler = yes; then
@@ -7188,6 +7247,12 @@ $as_echo "#define HAVE_MSVC_INVALID_PARAMETER_HANDLER 1" >>confdefs.h
 
 
 
+
+
+
+
+
+
      GNULIB_OPENDIR=0;
   GNULIB_READDIR=0;
   GNULIB_REWINDDIR=0;
@@ -7333,6 +7398,15 @@ $as_echo "$gl_cv_pragma_columns" >&6; }
 
 
 
+
+  :
+
+
+
+
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if environ is properly declared" >&5
 $as_echo_n "checking if environ is properly declared... " >&6; }
   if ${gt_cv_var_environ_declaration+:} false; then :
@@ -7846,12 +7920,10 @@ $as_echo "#define STRERROR_R_CHAR_P 1" >>confdefs.h
 fi
 
 
-  XGETTEXT_EXTRA_OPTIONS=
-
 
 
 
-ac_fn_c_check_decl "$LINENO" "fchdir" "ac_cv_have_decl_fchdir" "$ac_includes_default"
+      ac_fn_c_check_decl "$LINENO" "fchdir" "ac_cv_have_decl_fchdir" "$ac_includes_default"
 if test "x$ac_cv_have_decl_fchdir" = xyes; then :
   ac_have_decl=1
 else
@@ -7863,6 +7935,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+
   GNULIB_FCNTL=0;
   GNULIB_NONBLOCKING=0;
   GNULIB_OPEN=0;
@@ -7882,6 +7955,24 @@ _ACEOF
 
 
 
+
+
+
+
+
+  :
+
+
+
+
+
+
+  :
+
+
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fcntl.h" >&5
 $as_echo_n "checking for working fcntl.h... " >&6; }
 if ${gl_cv_header_working_fcntl_h+:} false; then :
@@ -8051,6 +8142,12 @@ fi
 
 
 
+
+
+
+
+
+
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
 $as_echo_n "checking for mbstate_t... " >&6; }
 if ${ac_cv_type_mbstate_t+:} false; then :
@@ -8111,6 +8208,30 @@ $as_echo "#define mbstate_t int" >>confdefs.h
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
   GNULIB_ACOSF=0;
   GNULIB_ACOSL=0;
   GNULIB_ASINF=0;
@@ -8397,7 +8518,8 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_frexp_no_libm" >&5
 $as_echo "$gl_cv_func_frexp_no_libm" >&6; }
 
-ac_fn_c_check_decl "$LINENO" "alarm" "ac_cv_have_decl_alarm" "$ac_includes_default"
+
+      ac_fn_c_check_decl "$LINENO" "alarm" "ac_cv_have_decl_alarm" "$ac_includes_default"
 if test "x$ac_cv_have_decl_alarm" = xyes; then :
   ac_have_decl=1
 else
@@ -8409,6 +8531,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether long double and double are the same" >&5
 $as_echo_n "checking whether long double and double are the same... " >&6; }
 if ${gl_cv_long_double_equals_double+:} false; then :
@@ -8531,6 +8654,9 @@ fi
 
 
 
+
+
+
   case "$host_os" in
     mingw*)
                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit off_t" >&5
@@ -8585,6 +8711,12 @@ $as_echo "$gl_cv_type_off_t_64" >&6; }
 
 
 
+  :
+
+
+
+
+
 
 
 
@@ -8788,6 +8920,15 @@ _ACEOF
 
 
 
+
+
+
+  :
+
+
+
+
+
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getcwd (NULL, 0) allocates memory for result" >&5
 $as_echo_n "checking whether getcwd (NULL, 0) allocates memory for result... " >&6; }
 if ${gl_cv_func_getcwd_null+:} false; then :
@@ -8892,7 +9033,8 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getcwd_posix_signature" >&5
 $as_echo "$gl_cv_func_getcwd_posix_signature" >&6; }
 
-ac_fn_c_check_decl "$LINENO" "getcwd" "ac_cv_have_decl_getcwd" "$ac_includes_default"
+
+      ac_fn_c_check_decl "$LINENO" "getcwd" "ac_cv_have_decl_getcwd" "$ac_includes_default"
 if test "x$ac_cv_have_decl_getcwd" = xyes; then :
   ac_have_decl=1
 else
@@ -8905,7 +9047,12 @@ _ACEOF
 
 
 
-ac_fn_c_check_decl "$LINENO" "getdtablesize" "ac_cv_have_decl_getdtablesize" "$ac_includes_default"
+
+
+
+
+
+      ac_fn_c_check_decl "$LINENO" "getdtablesize" "ac_cv_have_decl_getdtablesize" "$ac_includes_default"
 if test "x$ac_cv_have_decl_getdtablesize" = xyes; then :
   ac_have_decl=1
 else
@@ -8916,7 +9063,9 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_GETDTABLESIZE $ac_have_decl
 _ACEOF
 
-ac_fn_c_check_decl "$LINENO" "getlogin_r" "ac_cv_have_decl_getlogin_r" "$ac_includes_default"
+
+
+      ac_fn_c_check_decl "$LINENO" "getlogin_r" "ac_cv_have_decl_getlogin_r" "$ac_includes_default"
 if test "x$ac_cv_have_decl_getlogin_r" = xyes; then :
   ac_have_decl=1
 else
@@ -8929,7 +9078,12 @@ _ACEOF
 
 
 
-ac_fn_c_check_decl "$LINENO" "getlogin" "ac_cv_have_decl_getlogin" "$ac_includes_default"
+
+
+
+
+
+      ac_fn_c_check_decl "$LINENO" "getlogin" "ac_cv_have_decl_getlogin" "$ac_includes_default"
 if test "x$ac_cv_have_decl_getlogin" = xyes; then :
   ac_have_decl=1
 else
@@ -8944,6 +9098,13 @@ _ACEOF
 
 
 
+
+
+
+
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
 $as_echo_n "checking for C/C++ restrict keyword... " >&6; }
 if ${ac_cv_c_restrict+:} false; then :
@@ -9010,6 +9171,21 @@ _ACEOF
 
 
 
+  :
+
+
+
+
+
+
+
+
+
+
+
+  :
+
+
 
 
 
@@ -9094,6 +9270,12 @@ $as_echo "$gl_cv_next_sys_time_h" >&6; }
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_header_sys_socket_h != yes; then
                     for ac_header in winsock2.h
 do :
@@ -9261,6 +9443,24 @@ fi
 
 
 
+
+
+
+
+
+
+
+
+
+  :
+
+
+
+
+
+
+
+
      if test $gl_cv_have_include_next = yes; then
        gl_cv_next_limits_h='<'limits.h'>'
      else
@@ -9497,6 +9697,12 @@ $as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h
 
 
 
+
+
+
+
+
+
     gl_cv_c_multiarch=no
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9558,6 +9764,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_header_wchar_h = yes; then
     HAVE_WCHAR_H=1
   else
@@ -9585,6 +9797,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
+  :
+
+
+
+
+
 
 
 
@@ -10395,6 +10613,9 @@ fi
 
 
 
+
+
+
   GNULIB_IMAXABS=0;
   GNULIB_IMAXDIV=0;
   GNULIB_STRTOIMAX=0;
@@ -10415,10 +10636,22 @@ fi
 
 
 
+  :
+
+
+
+
+
+
+
+
+
 
 
 
 
+  :
+
 
 
 
@@ -11204,7 +11437,8 @@ $as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
 
   fi
 
-ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default"
+
+      ac_fn_c_check_decl "$LINENO" "getc_unlocked" "ac_cv_have_decl_getc_unlocked" "$ac_includes_default"
 if test "x$ac_cv_have_decl_getc_unlocked" = xyes; then :
   ac_have_decl=1
 else
@@ -11216,6 +11450,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library >= 2.1 or uClibc" >&5
 $as_echo_n "checking whether we are using the GNU C Library >= 2.1 or uClibc... " >&6; }
 if ${ac_cv_gnu_library_2_1+:} false; then :
@@ -11255,6 +11490,9 @@ $as_echo "$ac_cv_gnu_library_2_1" >&6; }
 
 
 
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether malloc, realloc, calloc are POSIX compliant" >&5
 $as_echo_n "checking whether malloc, realloc, calloc are POSIX compliant... " >&6; }
 if ${gl_cv_func_malloc_posix+:} false; then :
@@ -11364,6 +11602,9 @@ _ACEOF
 
 
 
+
+
+
   GNULIB_BTOWC=0;
   GNULIB_WCTOB=0;
   GNULIB_MBSINIT=0;
@@ -11463,6 +11704,12 @@ _ACEOF
 
 
 
+
+
+
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a traditional japanese locale" >&5
 $as_echo_n "checking for a traditional japanese locale... " >&6; }
 if ${gt_cv_locale_ja+:} false; then :
@@ -12000,6 +12247,12 @@ $as_echo "$gt_cv_locale_fr" >&6; }
 
 
 
+
+
+
+
+
+
   GNULIB_FFSL=0;
   GNULIB_FFSLL=0;
   GNULIB_MEMCHR=0;
@@ -12139,6 +12392,18 @@ $as_echo "#define HAVE_MAP_ANONYMOUS 1" >>confdefs.h
   fi
 
 
+  :
+
+
+
+
+
+
+  :
+
+
+
+
 
 
 
@@ -12231,7 +12496,8 @@ $as_echo "$gl_cv_func_memchr_works" >&6; }
     fi
   fi
 
-ac_fn_c_check_decl "$LINENO" "memmem" "ac_cv_have_decl_memmem" "$ac_includes_default"
+
+      ac_fn_c_check_decl "$LINENO" "memmem" "ac_cv_have_decl_memmem" "$ac_includes_default"
 if test "x$ac_cv_have_decl_memmem" = xyes; then :
   ac_have_decl=1
 else
@@ -12246,6 +12512,7 @@ _ACEOF
 
 
 
+
   for ac_func in memmem
 do :
   ac_fn_c_check_func "$LINENO" "memmem" "ac_cv_func_memmem"
@@ -12263,6 +12530,12 @@ done
     HAVE_MEMMEM=0
   fi
 
+  :
+
+
+
+
+
   if test $ac_cv_have_decl_memmem = no; then
     HAVE_DECL_MEMMEM=0
   else
@@ -12352,7 +12625,8 @@ $as_echo "$gl_cv_func_memmem_works_always" >&6; }
   fi
   :
 
-ac_fn_c_check_decl "$LINENO" "memrchr" "ac_cv_have_decl_memrchr" "$ac_includes_default"
+
+      ac_fn_c_check_decl "$LINENO" "memrchr" "ac_cv_have_decl_memrchr" "$ac_includes_default"
 if test "x$ac_cv_have_decl_memrchr" = xyes; then :
   ac_have_decl=1
 else
@@ -12370,6 +12644,10 @@ _ACEOF
 
 
 
+
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for promoted mode_t type" >&5
 $as_echo_n "checking for promoted mode_t type... " >&6; }
 if ${gl_cv_promoted_mode_t+:} false; then :
@@ -12406,6 +12684,9 @@ _ACEOF
 
 
 
+
+
+
   GNULIB_DPRINTF=0;
   GNULIB_FCLOSE=0;
   GNULIB_FDOPEN=0;
@@ -12520,7 +12801,26 @@ _ACEOF
 
 
 
-ac_fn_c_check_decl "$LINENO" "setenv" "ac_cv_have_decl_setenv" "$ac_includes_default"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      ac_fn_c_check_decl "$LINENO" "setenv" "ac_cv_have_decl_setenv" "$ac_includes_default"
 if test "x$ac_cv_have_decl_setenv" = xyes; then :
   ac_have_decl=1
 else
@@ -12536,10 +12836,32 @@ _ACEOF
 
 
 
+
+
+
+
+  :
+
+
+
+
+
   if test $ac_cv_have_decl_setenv = no; then
     HAVE_DECL_SETENV=0
   fi
 
+  :
+
+
+
+
+
+
+
+
+
+  :
+
 
 
 
@@ -12776,7 +13098,11 @@ $as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h
 
 
 
-ac_fn_c_check_decl "$LINENO" "strdup" "ac_cv_have_decl_strdup" "$ac_includes_default"
+
+
+
+
+      ac_fn_c_check_decl "$LINENO" "strdup" "ac_cv_have_decl_strdup" "$ac_includes_default"
 if test "x$ac_cv_have_decl_strdup" = xyes; then :
   ac_have_decl=1
 else
@@ -12788,6 +13114,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+
      REPLACE_STRERROR_0=0
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror(0) succeeds" >&5
 $as_echo_n "checking whether strerror(0) succeeds... " >&6; }
@@ -13042,7 +13369,8 @@ $as_echo "$gl_cv_func_strstr_works_always" >&6; }
     esac
   fi
 
-ac_fn_c_check_decl "$LINENO" "strtok_r" "ac_cv_have_decl_strtok_r" "$ac_includes_default"
+
+      ac_fn_c_check_decl "$LINENO" "strtok_r" "ac_cv_have_decl_strtok_r" "$ac_includes_default"
 if test "x$ac_cv_have_decl_strtok_r" = xyes; then :
   ac_have_decl=1
 else
@@ -13053,6 +13381,7 @@ cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_STRTOK_R $ac_have_decl
 _ACEOF
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
@@ -13205,6 +13534,12 @@ $as_echo "$gl_cv_next_sys_types_h" >&6; }
 
 
 
+  :
+
+
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5
 $as_echo_n "checking for struct timespec in <time.h>... " >&6; }
 if ${gl_cv_sys_struct_timespec_in_time_h+:} false; then :
@@ -13412,7 +13747,11 @@ $as_echo "$gl_cv_next_time_h" >&6; }
 
 
 
-ac_fn_c_check_decl "$LINENO" "unsetenv" "ac_cv_have_decl_unsetenv" "$ac_includes_default"
+
+
+
+
+      ac_fn_c_check_decl "$LINENO" "unsetenv" "ac_cv_have_decl_unsetenv" "$ac_includes_default"
 if test "x$ac_cv_have_decl_unsetenv" = xyes; then :
   ac_have_decl=1
 else
@@ -13424,6 +13763,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether <wchar.h> uses 'inline' correctly" >&5
 $as_echo_n "checking whether <wchar.h> uses 'inline' correctly... " >&6; }
 if ${gl_cv_header_wchar_h_correct_inline+:} false; then :
@@ -13503,6 +13843,15 @@ Configuration aborted." "$LINENO" 5
 
 
 
+
+
+
+  :
+
+
+
+
+
   if test $ac_cv_header_features_h = yes; then
     HAVE_FEATURES_H=1
   else
@@ -13565,6 +13914,9 @@ $as_echo "#define HAVE_WINT_T 1" >>confdefs.h
 
 
 
+
+
+
    if false; then
   GL_COND_LIBTOOL_TRUE=
   GL_COND_LIBTOOL_FALSE='#'
@@ -13815,6 +14167,12 @@ $as_echo "#define GNULIB_TEST_CLOEXEC 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_header_sys_socket_h != yes; then
                     for ac_header in winsock2.h
 do :
@@ -13847,6 +14205,12 @@ done
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_fchdir = no; then
     HAVE_FCHDIR=0
   fi
@@ -13905,6 +14269,12 @@ done
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_fchdir = no; then
     HAVE_FCHDIR=0
   fi
@@ -14098,6 +14468,12 @@ $as_echo "#define HAVE_STRUCT_DIRENT_D_TYPE 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
 
 
 
@@ -14418,6 +14794,12 @@ $as_echo "#define DOUBLE_SLASH_IS_DISTINCT_ROOT 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_fchdir = no; then
     HAVE_FCHDIR=0
   fi
@@ -14631,6 +15013,12 @@ done
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_fchdir = no; then
     HAVE_FCHDIR=0
   fi
@@ -14733,13 +15121,12 @@ $as_echo "$ac_cv_lib_error_at_line" >&6; }
   fi
 
 
-  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=error:3:c-format"
 
 
 
-  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=error_at_line:5:c-format"
 
 
+  :
 
 
 
@@ -14833,10 +15220,22 @@ $as_echo "#define GNULIB_TEST_FCHDIR 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_fcntl = no; then
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_fcntl = no; then
     HAVE_FCNTL=0
   else
@@ -14919,6 +15318,12 @@ $as_echo "$gl_cv_func_fcntl_f_dupfd_works" >&6; }
       *)
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_fcntl = no; then
     HAVE_FCNTL=0
   else
@@ -14986,6 +15391,12 @@ $as_echo "$gl_cv_func_fcntl_f_dupfd_cloexec" >&6; }
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_fcntl = no; then
     HAVE_FCNTL=0
   else
@@ -14998,6 +15409,12 @@ $as_echo "$gl_cv_func_fcntl_f_dupfd_cloexec" >&6; }
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_fchdir = no; then
     HAVE_FCHDIR=0
   fi
@@ -15006,6 +15423,12 @@ $as_echo "$gl_cv_func_fcntl_f_dupfd_cloexec" >&6; }
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_fcntl = no; then
     HAVE_FCNTL=0
   else
@@ -15187,6 +15610,12 @@ else
 fi
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_fdopendir = no; then
     HAVE_FDOPENDIR=0
   else
@@ -15287,6 +15716,12 @@ _ACEOF
 
 
 
+  :
+
+
+
+
+
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flexible array member" >&5
@@ -15724,6 +16159,39 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+  :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  :
+
+
+
+
 
 
   fi
@@ -15763,6 +16231,39 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+  :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  :
+
+
+
+
 
 
   fi
@@ -15814,6 +16315,12 @@ $as_echo "$gl_cv_func_frexp_in_libm" >&6; }
 
 
 
+  :
+
+
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether frexp works" >&5
 $as_echo_n "checking whether frexp works... " >&6; }
 if ${gl_cv_func_frexp_works+:} false; then :
@@ -16234,6 +16741,12 @@ $as_echo "#define GNULIB_TEST_FREXPL 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_fchdir = no; then
     HAVE_FCHDIR=0
   fi
@@ -16281,6 +16794,12 @@ $as_echo "#define GNULIB_TEST_FSTAT 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
 
   if test $ac_cv_func_fstatat = no; then
     HAVE_FSTATAT=0
@@ -16378,6 +16897,18 @@ $as_echo "#define GNULIB_TEST_FSTATAT 1" >>confdefs.h
     *)
 
 
+  :
+
+
+
+
+
+
+
+  :
+
+
+
 
 
 
@@ -16615,6 +17146,18 @@ $as_echo "$gl_cv_func_getcwd_path_max" >&6; }
         *yes)
 
 
+  :
+
+
+
+
+
+
+  :
+
+
+
+
 
 
   for ac_func in getpagesize
@@ -16894,6 +17437,18 @@ $as_echo "#define GNULIB_TEST_GETCWD 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
+
+  :
+
+
+
+
 
   if test $ac_cv_func_getdtablesize = yes &&
      test $ac_cv_have_decl_getdtablesize = yes; then
@@ -16984,11 +17539,23 @@ $as_echo "#define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_have_decl_getlogin_r = no; then
     HAVE_DECL_GETLOGIN_R=0
   fi
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_getlogin_r = no; then
     HAVE_GETLOGIN_R=0
   else
@@ -17069,6 +17636,12 @@ $as_echo "$gl_cv_func_getlogin_r_works" >&6; }
 
 
 
+  :
+
+
+
+
+
 
   fi
 
@@ -17088,6 +17661,15 @@ $as_echo "#define GNULIB_TEST_GETLOGIN_R 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
+
+
+
 
   ac_found=0
   ac_fn_c_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h>
@@ -17184,6 +17766,12 @@ $as_echo "#define HAVE_VAR___PROGNAME 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
 
   gl_gettimeofday_timezone=void
   if test $ac_cv_func_gettimeofday != yes; then
@@ -17497,13 +18085,34 @@ fi
   gl_LIBOBJS="$gl_LIBOBJS glob.$ac_objext"
 
 
-          if test $ac_cv_header_sys_cdefs_h = yes; then
+
+  :
+
+
+
+
+
+
+
+  if test $ac_cv_header_sys_cdefs_h = yes; then
     HAVE_SYS_CDEFS_H=1
   else
     HAVE_SYS_CDEFS_H=0
   fi
 
 
+  :
+
+
+
+
+
+
+
+
+
+
+
   fi
 
   :
@@ -18148,6 +18757,12 @@ _ACEOF
 
 
 
+  :
+
+
+
+
+
 
 
 
@@ -18157,6 +18772,12 @@ _ACEOF
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_lstat = yes; then
 
     case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
@@ -18246,6 +18867,12 @@ $as_echo "#define GNULIB_TEST_MALLOC_POSIX 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
 
 
 
@@ -18434,6 +19061,18 @@ fi
 
 
 
+  :
+
+
+
+
+
+
+  :
+
+
+
+
 
   if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then
 
@@ -18581,6 +19220,12 @@ $as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_mbrtowc = no; then
     HAVE_MBRTOWC=0
     ac_fn_c_check_decl "$LINENO" "mbrtowc" "ac_cv_have_decl_mbrtowc" "
@@ -19141,6 +19786,18 @@ $as_echo "#define GNULIB_TEST_MBRTOWC 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
+
+  :
+
+
+
+
 
   if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then
 
@@ -19288,6 +19945,12 @@ $as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_mbsinit = no; then
     HAVE_MBSINIT=0
     ac_fn_c_check_decl "$LINENO" "mbsinit" "ac_cv_have_decl_mbsinit" "
@@ -19363,6 +20026,18 @@ $as_echo "#define GNULIB_TEST_MBSINIT 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
+
+  :
+
+
+
+
 
   if test $ac_cv_func_mbsinit = yes && test $ac_cv_func_mbrtowc = yes; then
 
@@ -19510,6 +20185,12 @@ $as_echo "$gl_cv_func_mbrtowc_sanitycheck" >&6; }
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_mbsrtowcs = no; then
     HAVE_MBSRTOWCS=0
     ac_fn_c_check_decl "$LINENO" "mbsrtowcs" "ac_cv_have_decl_mbsrtowcs" "
@@ -19870,6 +20551,12 @@ done
     HAVE_MEMMEM=0
   fi
 
+  :
+
+
+
+
+
   if test $ac_cv_have_decl_memmem = no; then
     HAVE_DECL_MEMMEM=0
   else
@@ -20042,6 +20729,12 @@ $as_echo "#define GNULIB_TEST_MEMPCPY 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_have_decl_memrchr = no; then
     HAVE_DECL_MEMRCHR=0
   fi
@@ -20090,6 +20783,12 @@ $as_echo "#define GNULIB_TEST_MEMRCHR 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_mkstemp = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mkstemp" >&5
 $as_echo_n "checking for working mkstemp... " >&6; }
@@ -20232,6 +20931,12 @@ $as_echo "#define GNULIB_TEST_MKSTEMP 1" >>confdefs.h
       ;;
     *)
 
+  :
+
+
+
+
+
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether open recognizes a trailing slash" >&5
 $as_echo_n "checking whether open recognizes a trailing slash... " >&6; }
 if ${gl_cv_func_open_slash+:} false; then :
@@ -20300,6 +21005,12 @@ $as_echo "#define OPEN_TRAILING_SLASH_BUG 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_fchdir = no; then
     HAVE_FCHDIR=0
   fi
@@ -20346,6 +21057,12 @@ $as_echo "#define GNULIB_TEST_OPEN 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
 
   case $ac_cv_func_openat+$gl_cv_func_lstat_dereferences_slashed_symlink in
   yes+*yes)
@@ -20418,6 +21135,12 @@ done
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_fchdir = no; then
     HAVE_FCHDIR=0
   fi
@@ -20462,6 +21185,12 @@ $as_echo "#define GNULIB_TEST_OPENDIR 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
 
 
 
@@ -20558,6 +21287,12 @@ $as_echo "#define GNULIB_TEST_READDIR 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_readlink = no; then
     HAVE_READLINK=0
   else
@@ -20718,6 +21453,12 @@ $as_echo "#define GNULIB_TEST_REALLOC_POSIX 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
 
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether rename honors trailing slash on destination" >&5
 $as_echo_n "checking whether rename honors trailing slash on destination... " >&6; }
@@ -20858,6 +21599,12 @@ $as_echo "#define RENAME_TRAILING_SLASH_SOURCE_BUG 1" >>confdefs.h
   esac
 
 
+  :
+
+
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether rename manages hard links correctly" >&5
 $as_echo_n "checking whether rename manages hard links correctly... " >&6; }
 if ${gl_cv_func_rename_link_works+:} false; then :
@@ -21067,6 +21814,12 @@ $as_echo "#define GNULIB_TEST_REWINDDIR 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether rmdir works" >&5
 $as_echo_n "checking whether rmdir works... " >&6; }
 if ${gl_cv_func_rmdir_works+:} false; then :
@@ -21158,10 +21911,22 @@ $as_echo "#define GNULIB_TEST_RMDIR 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
+
+
 
 
 
 
+  :
+
+
+
 
 
   if test $ac_cv_func_secure_getenv = no; then
@@ -21205,6 +21970,21 @@ done
 
   fi
 
+  :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
   fi
 
@@ -21499,6 +22279,12 @@ $as_echo "#define ssize_t int" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on directories" >&5
 $as_echo_n "checking whether stat handles trailing slashes on directories... " >&6; }
 if ${gl_cv_func_stat_dir_slash+:} false; then :
@@ -22217,12 +23003,24 @@ $as_echo "#define GNULIB_TEST_STRCHRNUL 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_strdup = yes; then
     if test $gl_cv_func_malloc_posix != yes; then
       REPLACE_STRDUP=1
     fi
   fi
 
+  :
+
+
+
+
+
   if test $ac_cv_have_decl_strdup = no; then
     HAVE_DECL_STRDUP=0
   fi
@@ -22362,6 +23160,12 @@ $as_echo "#define GNULIB_TEST_STRERROR 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_header_sys_socket_h != yes; then
                     for ac_header in winsock2.h
 do :
@@ -22690,6 +23494,12 @@ $as_echo "$gl_cv_func_strtok_r_works" >&6; }
     HAVE_STRTOK_R=0
   fi
 
+  :
+
+
+
+
+
   if test $ac_cv_have_decl_strtok_r = no; then
     HAVE_DECL_STRTOK_R=0
   fi
@@ -22735,6 +23545,12 @@ $as_echo "#define GNULIB_TEST_STRTOK_R 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
 
 
 
@@ -22897,6 +23713,12 @@ fi
 
 
 
+  :
+
+
+
+
+
 
 
 
@@ -23035,6 +23857,18 @@ fi
 
 
 
+  :
+
+
+
+
+
+
+
+
+
+  :
+
 
 
 
@@ -23177,6 +24011,12 @@ $as_echo "$gl_cv_func_unsetenv_works" >&6; }
 
 
 
+  :
+
+
+
+
+
 
   fi
 
@@ -23203,6 +24043,12 @@ $as_echo "#define GNULIB_TEST_UNSETENV 1" >>confdefs.h
 
 
 
+  :
+
+
+
+
+
 
 
 
@@ -23348,6 +24194,12 @@ fi
 
 
 
+  :
+
+
+
+
+
   if test $ac_cv_func_iswcntrl = yes; then
     HAVE_ISWCNTRL=1
   else
@@ -23369,6 +24221,12 @@ fi
 
 
 
+  :
+
+
+
+
+