开源软件构建与测试

_service:tar_scm:libidn2.spec Changed

_service Changed

_service:tar_scm:libidn2-2.3.4.tar.gz.sig Deleted

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/error.h Deleted

@@ -1,66 +0,0 @@
-/* Declaration for error-reporting function
-   Copyright (C) 1995-1997, 2003, 2006, 2008-2022 Free Software Foundation,
-   Inc.
-   This file is part of the GNU C Library.
-
-   This file 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 file 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 <https://www.gnu.org/licenses/>.  */
-
-#ifndef _ERROR_H
-#define _ERROR_H 1
-
-/* Get _GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, _GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM.  */
-#include <stdio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Print a message with 'fprintf (stderr, FORMAT, ...)';
-   if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
-   If STATUS is nonzero, terminate the program with 'exit (STATUS)'.  */
-
-extern void error (int __status, int __errnum, const char *__format, ...)
-#if GNULIB_VFPRINTF_POSIX
-     _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, 3, 4))
-#else
-     _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM, 3, 4))
-#endif
-     ;
-
-extern void error_at_line (int __status, int __errnum, const char *__fname,
-                           unsigned int __lineno, const char *__format, ...)
-#if GNULIB_VFPRINTF_POSIX
-     _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, 5, 6))
-#else
-     _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM, 5, 6))
-#endif
-     ;
-
-/* If NULL, error will flush stdout, then print on stderr the program
-   name, a colon and a space.  Otherwise, error will call this
-   function without parameters instead.  */
-extern void (*error_print_progname) (void);
-
-/* This variable is incremented each time 'error' is called.  */
-extern unsigned int error_message_count;
-
-/* Sometimes we want to have at most one error per line.  This
-   variable controls whether this mode is selected or not.  */
-extern int error_one_per_line;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* error.h */

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/stdalign.m4 Deleted

@@ -1,134 +0,0 @@
-# Check for alignas and alignof that conform to C23.
-
-dnl Copyright 2011-2022 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.
-
-# Prepare for substituting <stdalign.h> if it is not supported.
-
-AC_DEFUN(gl_STDALIGN_H,
-
-  AC_CACHE_CHECK(for alignas and alignof,
-    gl_cv_header_working_stdalign_h,
-    gl_save_CFLAGS=$CFLAGS
-     for gl_working in "yes, keywords" "yes, <stdalign.h> macros"; do
-      AS_CASE($gl_working,
-        *stdalign.h*, CFLAGS="$gl_save_CFLAGS -DINCLUDE_STDALIGN_H")
-      AC_COMPILE_IFELSE(
-       AC_LANG_PROGRAM(
-          #include <stdint.h>
-            #ifdef INCLUDE_STDALIGN_H
-             #include <stdalign.h>
-            #endif
-            #include <stddef.h>
-
-            /* Test that alignof yields a result consistent with offsetof.
-               This catches GCC bug 52023
-               <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>.  */
-            #ifdef __cplusplus
-               template <class t> struct alignof_helper { char a; t b; };
-            # define ao(type) offsetof (alignof_helper<type>, b)
-            #else
-            # define ao(type) offsetof (struct { char a; type b; }, b)
-            #endif
-            char test_doubleao (double) % _Alignof (double) == 0 ? 1 : -1;
-            char test_longao (long int) % _Alignof (long int) == 0 ? 1 : -1;
-            char test_alignofalignof (double) == _Alignof (double) ? 1 : -1;
-
-            /* Test alignas only on platforms where gnulib can help.  */
-            #if \
-                ((defined __cplusplus && 201103 <= __cplusplus) \
-                 || (__TINYC__ && defined __attribute__) \
-                 || (defined __APPLE__ && defined __MACH__ \
-                     ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \
-                     : __GNUC__) \
-                 || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \
-                 || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__ \
-                 || 1300 <= _MSC_VER)
-              struct alignas_test { char c; char alignas (8) alignas_8; };
-              char test_alignasoffsetof (struct alignas_test, alignas_8) == 8
-                                ? 1 : -1;
-            #endif
-          ),
-       gl_cv_header_working_stdalign_h=$gl_working,
-       gl_cv_header_working_stdalign_h=no)
-
-      CFLAGS=$gl_save_CFLAGS
-      test "$gl_cv_header_working_stdalign_h" != no && break
-     done)
-
-  GL_GENERATE_STDALIGN_H=false
-  AS_CASE($gl_cv_header_working_stdalign_h,
-    no,
-      GL_GENERATE_STDALIGN_H=true,
-    yes*keyword*,
-      AC_DEFINE(HAVE_C_ALIGNASOF, 1,
-         Define to 1 if the alignas and alignof keywords work.))
-
-  AC_CHECK_HEADERS_ONCE(stdalign.h)
-
-  dnl The "zz" puts this toward config.h's end, to avoid potential
-  dnl collisions with other definitions.
-  AH_VERBATIM(zzalignas,
-#if !defined HAVE_C_ALIGNASOF && __cplusplus < 201103 && !defined alignof
-# if HAVE_STDALIGN_H
-#  include <stdalign.h>
-# else
-   /* Substitute.  Keep consistent with gnulib/lib/stdalign.in.h.  */
-#  ifndef _GL_STDALIGN_H
-#   define _GL_STDALIGN_H
-#   undef _Alignas
-#   undef _Alignof
-#   if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \
-        || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \
-            && !defined __clang__) \
-        || (defined __clang__ && __clang_major__ < 8))
-#    ifdef __cplusplus
-#     if (201103 <= __cplusplus || defined _MSC_VER)
-#      define _Alignof(type) alignof (type)
-#     else
-       template <class __t> struct __alignof_helper { char __a; __t __b; };
-#      define _Alignof(type) offsetof (__alignof_helper<type>, __b)
-#      define _GL_STDALIGN_NEEDS_STDDEF 1
-#     endif
-#    else
-#     define _Alignof(type) offsetof (struct { char __a; type __b; }, __b)
-#     define _GL_STDALIGN_NEEDS_STDDEF 1
-#    endif
-#   endif
-#   if ! (defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER))
-#    define alignof _Alignof
-#   endif
-#   define __alignof_is_defined 1
-#   if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112
-#    if defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER)
-#     define _Alignas(a) alignas (a)
-#    elif (!defined __attribute__ \
-           && ((defined __APPLE__ && defined __MACH__ \
-                ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \
-                : __GNUC__ && !defined __ibmxl__) \
-               || (4 <= __clang_major__) \
-               || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \
-               || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__))
-#     define _Alignas(a) __attribute__ ((__aligned__ (a)))
-#    elif 1300 <= _MSC_VER
-#     define _Alignas(a) __declspec (align (a))
-#    endif
-#   endif
-#   if ((defined _Alignas \
-         && !(defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER))) \
-        || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
-#    define alignas _Alignas
-#   endif
-#   if (defined alignas \
-        || (defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER)))
-#    define __alignas_is_defined 1
-#   endif
-#   if _GL_STDALIGN_NEEDS_STDDEF
-#    include <stddef.h>
-#   endif
-#  endif /* _GL_STDALIGN_H */
-# endif
-#endif)
-)

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/year2038.m4 Deleted

@@ -1,132 +0,0 @@
-# year2038.m4 serial 8
-dnl Copyright (C) 2017-2022 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 Attempt to ensure that 'time_t' can go past the year 2038 and that
-dnl the functions 'time', 'stat', etc. work with post-2038 timestamps.
-
-m4_ifdef(AC_SYS_YEAR2038, 
-  AC_DEFUN(gl_YEAR2038_EARLY)
-  AC_DEFUN(gl_YEAR2038, AC_SYS_YEAR2038)
-  AC_DEFUN(gl_YEAR2038_BODY, _AC_SYS_YEAR2038)
-, 
-
-AC_DEFUN(gl_YEAR2038_EARLY,
-
-  AC_REQUIRE(AC_CANONICAL_HOST)
-  case "$host_os" in
-    mingw*)
-      AC_DEFINE(__MINGW_USE_VC2005_COMPAT, 1,
-        For 64-bit time_t on 32-bit mingw.)
-      ;;
-  esac
-)
-
-# gl_YEAR2038_TEST_INCLUDES
-# -------------------------
-AC_DEFUN(gl_YEAR2038_TEST_INCLUDES,
-
-  #include <time.h>
-  /* Check that time_t can represent 2**32 - 1 correctly.  */
-  #define LARGE_TIME_T \\
-    ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30)))
-  int verify_time_t_range(LARGE_TIME_T / 65537 == 65535
-                           && LARGE_TIME_T % 65537 == 0)
-                          ? 1 : -1;
-)
-
-# gl_YEAR2038_BODY(REQUIRE-YEAR2038-SAFE)
------------------------------------------
-AC_DEFUN(gl_YEAR2038_BODY,
-
- AC_ARG_ENABLE(year2038,
-     --disable-year2038      omit support for timestamps past the year 2038)
- AS_IF(test "$enable_year2038" != no,
- 
-  dnl On many systems, time_t is already a 64-bit type.
-  dnl On those systems where time_t is still 32-bit, it requires kernel
-  dnl and libc support to make it 64-bit. For glibc 2.34 and later on Linux,
-  dnl defining _TIME_BITS=64 and _FILE_OFFSET_BITS=64 is needed on x86 and ARM.
-  dnl
-  dnl On native Windows, the system include files define types __time32_t
-  dnl and __time64_t. By default, time_t is an alias of
-  dnl   - __time32_t on 32-bit mingw,
-  dnl   - __time64_t on 64-bit mingw and on MSVC (since MSVC 8).
-  dnl But when compiling with -D__MINGW_USE_VC2005_COMPAT, time_t is an
-  dnl alias of __time64_t.
-  dnl And when compiling with -D_USE_32BIT_TIME_T, time_t is an alias of
-  dnl __time32_t.
-  AC_CACHE_CHECK(for time_t past the year 2038, gl_cv_type_time_t_y2038,
-    AC_COMPILE_IFELSE(
-       AC_LANG_SOURCE(gl_YEAR2038_TEST_INCLUDES),
-       gl_cv_type_time_t_y2038=yes, gl_cv_type_time_t_y2038=no)
-    )
-  if test "$gl_cv_type_time_t_y2038" = no; then
-    AC_CACHE_CHECK(for 64-bit time_t with _TIME_BITS=64,
-      gl_cv_type_time_t_bits_macro,
-      AC_COMPILE_IFELSE(
-         AC_LANG_SOURCE(#define _TIME_BITS 64
-                           #define _FILE_OFFSET_BITS 64
-                           gl_YEAR2038_TEST_INCLUDES),
-         gl_cv_type_time_t_bits_macro=yes,
-         gl_cv_type_time_t_bits_macro=no)
-      )
-    if test "$gl_cv_type_time_t_bits_macro" = yes; then
-      AC_DEFINE(_TIME_BITS, 64,
-        Number of bits in a timestamp, on hosts where this is settable.)
-      dnl AC_SYS_LARGFILE also defines this; it's OK if we do too.
-      AC_DEFINE(_FILE_OFFSET_BITS, 64,
-        Number of bits in a file offset, on hosts where this is settable.)
-      gl_cv_type_time_t_y2038=yes
-    fi
-  fi
-  if test $gl_cv_type_time_t_y2038 = no; then
-    AC_COMPILE_IFELSE(
-      AC_LANG_SOURCE(
-         #ifdef _USE_32BIT_TIME_T
-             int ok;
-           #else
-             error fail
-           #endif
-         ),
-      AC_MSG_FAILURE(
-         The 'time_t' type stops working after January 2038.
-          Remove _USE_32BIT_TIME_T from the compiler flags.),
-      # If not cross-compiling and $1 says we should check,
-       # and 'touch' works with a large timestamp, then evidently wider time_t
-       # is desired and supported, so fail and ask the builder to fix the
-       # problem.  Otherwise, just warn the builder.
-       m4_ifval($1,
-         if test $cross_compiling = no \
-             && TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null; then
-            case `TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null` in
-              *'Feb  7  2106'* | *'Feb  7 17:10'*)
-                AC_MSG_FAILURE(
-                  The 'time_t' type stops working after January 2038,
-                   and your system appears to support a wider 'time_t'.
-                   Try configuring with 'CC="${CC} -m64"'.
-                   To build with a 32-bit time_t anyway (not recommended),
-                   configure with '--disable-year2038'.);;
-            esac
-            rm -f conftest.time
-          fi)
-       if test "$gl_warned_about_y2038" != yes; then
-         AC_MSG_WARN(
-           The 'time_t' type stops working after January 2038,
-            and this package needs a wider 'time_t' type
-            if there is any way to access timestamps after that.
-            Configure with 'CC="${CC} -m64"' perhaps?)
-         gl_warned_about_y2038=yes
-       fi
-      )
-  fi)
-)
-
-AC_DEFUN(gl_YEAR2038,
-
-  gl_YEAR2038_BODY(require-year2038-safe)
-)
-
-) # m4_ifndef AC_SYS_YEAR2038

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/stdalign.in.h Deleted

@@ -1,133 +0,0 @@
-/* A substitute for ISO C11 <stdalign.h>.
-
-   Copyright 2011-2022 Free Software Foundation, Inc.
-
-   This file 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 file 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 <https://www.gnu.org/licenses/>.  */
-
-/* Written by Paul Eggert and Bruno Haible.  */
-
-#ifndef _GL_STDALIGN_H
-#define _GL_STDALIGN_H
-
-/* ISO C11 <stdalign.h> for platforms that lack it.
-
-   References:
-   ISO C11 (latest free draft
-   <http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1570.pdf>)
-   sections 6.5.3.4, 6.7.5, 7.15.
-   C++11 (latest free draft
-   <http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3242.pdf>)
-   section 18.10. */
-
-/* alignof (TYPE), also known as _Alignof (TYPE), yields the alignment
-   requirement of a structure member (i.e., slot or field) that is of
-   type TYPE, as an integer constant expression.
-
-   This differs from GCC's and clang's __alignof__ operator, which can
-   yield a better-performing alignment for an object of that type.  For
-   example, on x86 with GCC and on Linux/x86 with clang,
-   __alignof__ (double) and __alignof__ (long long) are 8, whereas
-   alignof (double) and alignof (long long) are 4 unless the option
-   '-malign-double' is used.
-
-   The result cannot be used as a value for an 'enum' constant, if you
-   want to be portable to HP-UX 10.20 cc and AIX 3.2.5 xlc.  */
-
-/* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other
-   standard headers, defines conflicting implementations of _Alignas
-   and _Alignof that are no better than ours; override them.  */
-#undef _Alignas
-#undef _Alignof
-
-/* GCC releases before GCC 4.9 had a bug in _Alignof.  See GCC bug 52023
-   <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>.
-   clang versions < 8.0.0 have the same bug.  */
-#if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \
-     || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \
-         && !defined __clang__) \
-     || (defined __clang__ && __clang_major__ < 8))
-# ifdef __cplusplus
-#  if (201103 <= __cplusplus || defined _MSC_VER)
-#   define _Alignof(type) alignof (type)
-#  else
-   template <class __t> struct __alignof_helper { char __a; __t __b; };
-#   define _Alignof(type) offsetof (__alignof_helper<type>, __b)
-#   define _GL_STDALIGN_NEEDS_STDDEF 1
-#  endif
-# else
-#  define _Alignof(type) offsetof (struct { char __a; type __b; }, __b)
-#  define _GL_STDALIGN_NEEDS_STDDEF 1
-# endif
-#endif
-#if ! (defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER))
-# define alignof _Alignof
-#endif
-#define __alignof_is_defined 1
-
-/* alignas (A), also known as _Alignas (A), aligns a variable or type
-   to the alignment A, where A is an integer constant expression.  For
-   example:
-
-      int alignas (8) foo;
-      struct s { int a; int alignas (8) bar; };
-
-   aligns the address of FOO and the offset of BAR to be multiples of 8.
-
-   A should be a power of two that is at least the type's alignment
-   and at most the implementation's alignment limit.  This limit is
-   2**28 on typical GNUish hosts, and 2**13 on MSVC.  To be portable
-   to MSVC through at least version 10.0, A should be an integer
-   constant, as MSVC does not support expressions such as 1 << 3.
-   To be portable to Sun C 5.11, do not align auto variables to
-   anything stricter than their default alignment.
-
-   The following C11 requirements are not supported here:
-
-     - If A is zero, alignas has no effect.
-     - alignas can be used multiple times; the strictest one wins.
-     - alignas (TYPE) is equivalent to alignas (alignof (TYPE)).
-
-   */
-
-#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112
-# if defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER)
-#  define _Alignas(a) alignas (a)
-# elif (!defined __attribute__ \
-        && ((defined __APPLE__ && defined __MACH__ \
-             ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \
-             : __GNUC__ && !defined __ibmxl__) \
-            || (4 <= __clang_major__) \
-            || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \
-            || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__))
-#  define _Alignas(a) __attribute__ ((__aligned__ (a)))
-# elif 1300 <= _MSC_VER
-#  define _Alignas(a) __declspec (align (a))
-# endif
-#endif
-#if ((defined _Alignas \
-      && !(defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER))) \
-     || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
-# define alignas _Alignas
-#endif
-#if (defined alignas \
-     || (defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER)))
-# define __alignas_is_defined 1
-#endif
-
-/* Include <stddef.h> if needed for offsetof.  */
-#if _GL_STDALIGN_NEEDS_STDDEF
-# include <stddef.h>
-#endif
-
-#endif /* _GL_STDALIGN_H */

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/puny_decode.c Deleted

@@ -1,253 +0,0 @@
-/* punycode.c - punycode encoding/decoding
-   Copyright (C) 2011-2022 Simon Josefsson
-
-   Libidn2 is free software: you can redistribute it and/or modify it
-   under the terms of either:
-
-     * 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.
-
-   or
-
-     * the GNU General Public License as published by the Free
-       Software Foundation; either version 2 of the License, or (at
-       your option) any later version.
-
-   or both in parallel, as here.
-
-   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 General Public License for more details.
-
-   You should have received copies of the GNU General Public License and
-   the GNU Lesser General Public License along with this program.  If
-   not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*
-  Code copied from http://www.nicemice.net/idn/punycode-spec.gz on
-  2011-01-04 with SHA-1 a966a8017f6be579d74a50a226accc7607c40133
-  labeled punycode-spec 1.0.3 (2006-Mar-23-Thu).  It is modified for
-  Libidn2 by Simon Josefsson.  License on the original code:
-
-  punycode-spec 1.0.3 (2006-Mar-23-Thu)
-  http://www.nicemice.net/idn/
-  Adam M. Costello
-  http://www.nicemice.net/amc/
-
-  B. Disclaimer and license
-
-    Regarding this entire document or any portion of it (including
-    the pseudocode and C code), the author makes no guarantees and
-    is not responsible for any damage resulting from its use.  The
-    author grants irrevocable permission to anyone to use, modify,
-    and distribute it in any way that does not diminish the rights
-    of anyone else to use, modify, and distribute it, provided that
-    redistributed derivative works do not contain misleading author or
-    version information.  Derivative works need not be licensed under
-    similar terms.
-
-  C. Punycode sample implementation
-
-  punycode-sample.c 2.0.0 (2004-Mar-21-Sun)
-  http://www.nicemice.net/idn/
-  Adam M. Costello
-  http://www.nicemice.net/amc/
-
-  This is ANSI C code (C89) implementing Punycode 1.0.x.
-*/
-
-#include <config.h>
-
-#include "idn2.h"		/* IDN2_OK, ... */
-
-/* Re-definitions to avoid modifying code below too much. */
-#define punycode_uint uint32_t
-#define punycode_success IDN2_OK
-#define punycode_overflow IDN2_PUNYCODE_OVERFLOW
-#define punycode_big_output IDN2_PUNYCODE_BIG_OUTPUT
-#define punycode_bad_input IDN2_PUNYCODE_BAD_INPUT
-#define punycode_decode _idn2_punycode_decode_internal
-
-/**********************************************************/
-/* Implementation (would normally go in its own .c file): */
-
-#include <stdio.h>
-#include <string.h>
-
-#include "punycode.h"
-
-/*** Bootstring parameters for Punycode ***/
-
-enum
-{ base = 36, tmin = 1, tmax = 26, skew = 38, damp = 700,
-  initial_bias = 72, initial_n = 0x80, delimiter = 0x2D
-};
-
-/* basic(cp) tests whether cp is a basic code point: */
-#define basic(cp) ((cp >= 'a' && cp <= 'z') || (cp >= '0' && cp <='9') || (cp >= 'A' && cp <='Z') || cp == '-' || cp == '_')
-
-/* decode_digit(cp) returns the numeric value of a basic code */
-/* point (for use in representing integers) in the range 0 to */
-/* base-1, or base if cp does not represent a value.          */
-
-static unsigned
-decode_digit (int cp)
-{
-  if (cp >= 'a' && cp <= 'z')
-    return cp - 'a';
-  if (cp >= '0' && cp <= '9')
-    return cp - '0' + 26;
-  if (cp >= 'A' && cp <= 'Z')
-    return cp - 'A';
-
-  return 0;
-}
-
-/*** Platform-specific constants ***/
-
-/* maxint is the maximum value of a punycode_uint variable: */
-static const punycode_uint maxint = -1;
-/* Because maxint is unsigned, -1 becomes the maximum value. */
-
-/*** Bias adaptation function ***/
-
-static punycode_uint
-adapt (punycode_uint delta, punycode_uint numpoints, int firsttime)
-  _GL_ATTRIBUTE_CONST;
-
-     static punycode_uint adapt (punycode_uint delta, punycode_uint numpoints,
-				 int firsttime)
-{
-  punycode_uint k;
-
-  delta = firsttime ? delta / damp : delta >> 1;
-  /* delta >> 1 is a faster way of doing delta / 2 */
-  delta += delta / numpoints;
-
-  for (k = 0; delta > ((base - tmin) * tmax) / 2; k += base)
-    {
-      delta /= base - tmin;
-    }
-
-  return k + (base - tmin + 1) * delta / (delta + skew);
-}
-
-/*** Main decode function ***/
-
-int
-punycode_decode (size_t input_length,
-		 const char input,
-		 size_t *output_length, punycode_uint output)
-{
-  punycode_uint n, out = 0, i, max_out, bias, oldi, w, k, digit, t;
-  size_t b = 0, j, in;
-
-  if (!input_length)
-    return punycode_bad_input;
-
-  /* Check that all chars are basic */
-  for (j = 0; j < input_length; ++j)
-    {
-      if (!basic (inputj))
-	return punycode_bad_input;
-      if (inputj == delimiter)
-	b = j;
-    }
-
-  max_out =
-    *output_length > maxint ? maxint : (punycode_uint) * output_length;
-
-  if (inputb == delimiter)
-    {
-      /* do not accept leading or trailing delimiter
-       *   - leading delim must be omitted if there is no ASCII char in u-label
-       *   - trailing delim means there where no non-ASCII chars in u-label
-       */
-      if (!b || b == input_length - 1)
-	return punycode_bad_input;
-
-      if (b >= max_out)
-	return punycode_big_output;
-
-      /* Check that all chars before last delimiter are basic chars */
-      /* and copy the first b code points to the output. */
-      for (j = 0; j < b; j++)
-	outputout++ = inputj;
-
-      b += 1;			/* advance to non-basic char encoding */
-    }
-
-  /* Initialize the state: */
-  n = initial_n;
-  i = 0;
-  bias = initial_bias;
-
-  /* Main decoding loop:  Start just after the last delimiter if any  */
-  /* basic code points were copied; start at the beginning otherwise. */
-  for (in = b; in < input_length; ++out)
-    {
-
-      /* in is the index of the next ASCII code point to be consumed, */
-      /* and out is the number of code points in the output array.    */
-
-      /* Decode a generalized variable-length integer into delta,  */
-      /* which gets added to i.  The overflow checking is easier   */
-      /* if we increase i as we go, then subtract off its starting */
-      /* value at the end to obtain delta.                         */
-      for (oldi = i, w = 1, k = base;; k += base)
-	{
-	  if (in >= input_length)
-	    return punycode_bad_input;
-	  digit = decode_digit (inputin++);
-	  if (digit >= base)
-	    return punycode_bad_input;
-	  if (digit > (maxint - i) / w)
-	    return punycode_overflow;
-	  i += digit * w;
-	  t = k <= bias /* + tmin */ ? tmin :	/* +tmin not needed */
-	    k >= bias + tmax ? tmax : k - bias;
-	  if (digit < t)
-	    break;
-	  if (w > maxint / (base - t))
-	    return punycode_overflow;
-	  w *= (base - t);
-	}
-
-      bias = adapt (i - oldi, out + 1, oldi == 0);
-
-      /* i was supposed to wrap around from out+1 to 0,   */
-      /* incrementing n each time, so we'll fix that now: */
-      if (i / (out + 1) > maxint - n)
-	return punycode_overflow;
-      n += i / (out + 1);
-      if (n > 0x10FFFF || (n >= 0xD800 && n <= 0xDBFF))
-	return punycode_bad_input;
-      i %= (out + 1);
-
-      /* Insert n at position i of the output: */
-
-      /* not needed for Punycode: */
-      /* if (basic(n)) return punycode_bad_input; */
-      if (out >= max_out)
-	return punycode_big_output;
-
-      memmove (output + i + 1, output + i, (out - i) * sizeof *output);
-      outputi++ = n;
-    }
-
-  *output_length = (size_t) out;
-  /* cannot overflow because out <= old value of *output_length */
-  return punycode_success;
-}
-
-/* Create a compatibility symbol if supported.  Hidden references make
-   the target symbol hidden, hence the alias.  */
-#ifdef HAVE_SYMVER_ALIAS_SUPPORT
-__typeof__ (_idn2_punycode_decode_internal) _idn2_punycode_decode
-  __attribute__((visibility ("default"),
-		 alias ("_idn2_punycode_decode_internal")));
-__asm__ (".symver _idn2_punycode_decode, _idn2_punycode_decode@IDN2_0.0.0");
-#endif

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/puny_encode.c Deleted

@@ -1,254 +0,0 @@
-/* punycode.c - punycode encoding/decoding
-   Copyright (C) 2011-2022 Simon Josefsson
-
-   Libidn2 is free software: you can redistribute it and/or modify it
-   under the terms of either:
-
-     * 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.
-
-   or
-
-     * the GNU General Public License as published by the Free
-       Software Foundation; either version 2 of the License, or (at
-       your option) any later version.
-
-   or both in parallel, as here.
-
-   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 General Public License for more details.
-
-   You should have received copies of the GNU General Public License and
-   the GNU Lesser General Public License along with this program.  If
-   not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*
-  Code copied from http://www.nicemice.net/idn/punycode-spec.gz on
-  2011-01-04 with SHA-1 a966a8017f6be579d74a50a226accc7607c40133
-  labeled punycode-spec 1.0.3 (2006-Mar-23-Thu).  It is modified for
-  Libidn2 by Simon Josefsson.  License on the original code:
-
-  punycode-spec 1.0.3 (2006-Mar-23-Thu)
-  http://www.nicemice.net/idn/
-  Adam M. Costello
-  http://www.nicemice.net/amc/
-
-  B. Disclaimer and license
-
-    Regarding this entire document or any portion of it (including
-    the pseudocode and C code), the author makes no guarantees and
-    is not responsible for any damage resulting from its use.  The
-    author grants irrevocable permission to anyone to use, modify,
-    and distribute it in any way that does not diminish the rights
-    of anyone else to use, modify, and distribute it, provided that
-    redistributed derivative works do not contain misleading author or
-    version information.  Derivative works need not be licensed under
-    similar terms.
-
-  C. Punycode sample implementation
-
-  punycode-sample.c 2.0.0 (2004-Mar-21-Sun)
-  http://www.nicemice.net/idn/
-  Adam M. Costello
-  http://www.nicemice.net/amc/
-
-  This is ANSI C code (C89) implementing Punycode 1.0.x.
-*/
-
-#include <config.h>
-
-#include "idn2.h"		/* IDN2_OK, ... */
-
-/* Re-definitions to avoid modifying code below too much. */
-#define punycode_uint uint32_t
-#define punycode_success IDN2_OK
-#define punycode_overflow IDN2_PUNYCODE_OVERFLOW
-#define punycode_big_output IDN2_PUNYCODE_BIG_OUTPUT
-#define punycode_bad_input IDN2_PUNYCODE_BAD_INPUT
-#define punycode_encode _idn2_punycode_encode_internal
-
-/**********************************************************/
-/* Implementation (would normally go in its own .c file): */
-
-#include <string.h>
-
-#include "punycode.h"
-
-/*** Bootstring parameters for Punycode ***/
-
-enum
-{ base = 36, tmin = 1, tmax = 26, skew = 38, damp = 700,
-  initial_bias = 72, initial_n = 0x80, delimiter = 0x2D
-};
-
-/* basic(cp) tests whether cp is a basic code point: */
-#define basic(cp) ((punycode_uint)(cp) < 0x80)
-
-/* encode_digit(d,flag) returns the basic code point whose value      */
-/* (when used for representing integers) is d, which needs to be in   */
-/* the range 0 to base-1.  The lowercase form is used unless flag is  */
-/* nonzero, in which case the uppercase form is used.  The behavior   */
-/* is undefined if flag is nonzero and digit d has no uppercase form. */
-
-static char
-encode_digit (punycode_uint d, int flag)
-{
-  return d + 22 + 75 * (d < 26) - ((flag != 0) << 5);
-  /*  0..25 map to ASCII a..z or A..Z */
-  /* 26..35 map to ASCII 0..9         */
-}
-
-/*** Platform-specific constants ***/
-
-/* maxint is the maximum value of a punycode_uint variable: */
-static const punycode_uint maxint = -1;
-/* Because maxint is unsigned, -1 becomes the maximum value. */
-
-/*** Bias adaptation function ***/
-
-static punycode_uint
-adapt (punycode_uint delta, punycode_uint numpoints, int firsttime)
-  _GL_ATTRIBUTE_CONST;
-
-     static punycode_uint adapt (punycode_uint delta, punycode_uint numpoints,
-				 int firsttime)
-{
-  punycode_uint k;
-
-  delta = firsttime ? delta / damp : delta >> 1;
-  /* delta >> 1 is a faster way of doing delta / 2 */
-  delta += delta / numpoints;
-
-  for (k = 0; delta > ((base - tmin) * tmax) / 2; k += base)
-    {
-      delta /= base - tmin;
-    }
-
-  return k + (base - tmin + 1) * delta / (delta + skew);
-}
-
-/*** Main encode function ***/
-
-int
-punycode_encode (size_t input_length_orig,
-		 const punycode_uint input,
-		 size_t *output_length, char output)
-{
-  punycode_uint input_length, n, delta, h, b, bias, j, m, q, k, t;
-  size_t out, max_out;
-
-  /* The Punycode spec assumes that the input length is the same type */
-  /* of integer as a code point, so we need to convert the size_t to  */
-  /* a punycode_uint, which could overflow.                           */
-
-  if (input_length_orig > maxint)
-    return punycode_overflow;
-  input_length = (punycode_uint) input_length_orig;
-
-  /* Initialize the state: */
-
-  n = initial_n;
-  delta = 0;
-  out = 0;
-  max_out = *output_length;
-  bias = initial_bias;
-
-  /* Handle the basic code points: */
-
-  for (j = 0; j < input_length; ++j)
-    {
-      if (basic (inputj))
-	{
-	  if (max_out - out < 2)
-	    return punycode_big_output;
-	  outputout++ = (char) inputj;
-	}
-      else if (inputj > 0x10FFFF
-	       || (inputj >= 0xD800 && inputj <= 0xDBFF))
-	return punycode_bad_input;
-    }
-
-  h = b = (punycode_uint) out;
-  /* cannot overflow because out <= input_length <= maxint */
-
-  /* h is the number of code points that have been handled, b is the  */
-  /* number of basic code points, and out is the number of ASCII code */
-  /* points that have been output.                                    */
-
-  if (b > 0)
-    outputout++ = delimiter;
-
-  /* Main encoding loop: */
-
-  while (h < input_length)
-    {
-      /* All non-basic code points < n have been     */
-      /* handled already.  Find the next larger one: */
-
-      for (m = maxint, j = 0; j < input_length; ++j)
-	{
-	  /* if (basic(inputj)) continue; */
-	  /* (not needed for Punycode) */
-	  if (inputj >= n && inputj < m)
-	    m = inputj;
-	}
-
-      /* Increase delta enough to advance the decoder's    */
-      /* <n,i> state to <m,0>, but guard against overflow: */
-
-      if (m - n > (maxint - delta) / (h + 1))
-	return punycode_overflow;
-      delta += (m - n) * (h + 1);
-      n = m;
-
-      for (j = 0; j < input_length; ++j)
-	{
-	  /* Punycode does not need to check whether inputj is basic: */
-	  if (inputj < n /* || basic(inputj) */ )
-	    {
-	      if (++delta == 0)
-		return punycode_overflow;
-	    }
-
-	  if (inputj == n)
-	    {
-	      /* Represent delta as a generalized variable-length integer: */
-
-	      for (q = delta, k = base;; k += base)
-		{
-		  if (out >= max_out)
-		    return punycode_big_output;
-		  t = k <= bias /* + tmin */ ? tmin :	/* +tmin not needed */
-		    k >= bias + tmax ? tmax : k - bias;
-		  if (q < t)
-		    break;
-		  outputout++ = encode_digit (t + (q - t) % (base - t), 0);
-		  q = (q - t) / (base - t);
-		}
-
-	      outputout++ = encode_digit (q, 0);
-	      bias = adapt (delta, h + 1, h == b);
-	      delta = 0;
-	      ++h;
-	    }
-	}
-
-      ++delta, ++n;
-    }
-
-  *output_length = out;
-  return punycode_success;
-}
-
-/* Create a compatibility symbol if supported.  Hidden references make
-   the target symbol hidden, hence the alias.  */
-#ifdef HAVE_SYMVER_ALIAS_SUPPORT
-__typeof__ (_idn2_punycode_encode_internal) _idn2_punycode_encode
-  __attribute__((visibility ("default"),
-		 alias ("_idn2_punycode_encode_internal")));
-__asm__ (".symver _idn2_punycode_encode, _idn2_punycode_encode@IDN2_0.0.0");
-#endif

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/punycode.h Deleted

@@ -1,45 +0,0 @@
-/* punycode.h - prototypes for internal punycode functions
-   Copyright (C) 2011-2022 Simon Josefsson
-
-   Libidn2 is free software: you can redistribute it and/or modify it
-   under the terms of either:
-
-     * 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.
-
-   or
-
-     * the GNU General Public License as published by the Free
-       Software Foundation; either version 2 of the License, or (at
-       your option) any later version.
-
-   or both in parallel, as here.
-
-   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 General Public License for more details.
-
-   You should have received copies of the GNU General Public License and
-   the GNU Lesser General Public License along with this program.  If
-   not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef LIBIDN2_PUNYCODE_H
-# define LIBIDN2_PUNYCODE_H
-
-# include <stddef.h>
-# include <stdint.h>
-
-extern int
-_idn2_punycode_encode_internal (size_t input_length,
-				const uint32_t input,
-				size_t *output_length, char output);
-
-extern int
-_idn2_punycode_decode_internal (size_t input_length,
-				const char input,
-				size_t *output_length, uint32_t output);
-
-#endif /* LIBIDN2_PUNYCODE_H */

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/m4/codeset.m4 Deleted

_service:tar_scm:libidn2-2.3.7.tar.gz.sig Added

_service:tar_scm:libidn2-2.3.4.tar.gz/.tarball-version -> _service:tar_scm:libidn2-2.3.7.tar.gz/.tarball-version Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/.version -> _service:tar_scm:libidn2-2.3.7.tar.gz/.version Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/ABOUT-NLS -> _service:tar_scm:libidn2-2.3.7.tar.gz/ABOUT-NLS Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/CONTRIBUTING.md -> _service:tar_scm:libidn2-2.3.7.tar.gz/CONTRIBUTING.md Changed

@@ -1,5 +1,5 @@
 # Libidn2 CONTRIBUTING -- Information for developers
-Copyright (C) 2011-2022 Simon Josefsson
+Copyright (C) 2011-2024 Simon Josefsson
 See the end for copying conditions.
 
 This file contains instructions for developers and advanced users.
@@ -41,21 +41,27 @@
 The software is typically distributed with your operating system, and
 the instructions for installing them differ.  Here are some hints:
 
-Debian 10.x, Debian 11.x, Ubuntu 20.04:
+APT/DPKG-based distributions:
 ```
 apt-get install make gcc
 apt-get install git autoconf automake libtool gettext autopoint gperf
 apt-get install libunistring-dev valgrind gengetopt help2man
-apt-get install texinfo texlive git2cl gtk-doc-tools
+apt-get install texinfo texlive gtk-doc-tools
 apt-get install abi-compliance-checker abigail-tools
 ```
 
-Fedora 35:
+DNF/RPM-based distributions:
 ```
 dnf install -y make gcc
 dnf install -y git autoconf automake libtool gettext-devel patch gperf
 dnf install -y libunistring-devel valgrind gengetopt help2man
 dnf install -y texinfo texinfo-tex texlive gtk-doc dblatex
+dnf install -y libabigail
+```
+
+On macOS with Xcode and Homebrew:
+```
+brew install autoconf automake libtool gengetopt help2man texinfo
 ```

_service:tar_scm:libidn2-2.3.4.tar.gz/ChangeLog -> _service:tar_scm:libidn2-2.3.7.tar.gz/ChangeLog Changed

@@ -1,5 +1,210 @@
+2024-01-27  Simon Josefsson  <simon@josefsson.org>
+
+	version 2.3.7
+	* NEWS: Record release date.
+
+	Really include standalone.sh in tarball.
+
+	maint: post-release administrivia
+	* NEWS: Add header line for next release.
+	* .prev-version: Record previous version.
+	* cfg.mk (old_NEWS_hash): Auto-update.
+
+	version 2.3.6
+	* NEWS: Record release date.
+
+	cicd: Improve how debci scripts are invoked.
+
+	Fix gnu-web-doc-update for libidn vs libidn2 path.
+
+	Include tests/standalone.sh in tarball.
+
+	Bump libtool versions reflecting ABI addition.
+
+	cicd: Fix macOS; gnulib-tool needs working join.
+
+	maint: post-release administrivia
+	* NEWS: Add header line for next release.
+	* .prev-version: Record previous version.
+	* cfg.mk (old_NEWS_hash): Auto-update.
+
+	version 2.3.5
+	* NEWS: Record release date.
+
+	Fix nl_langinfo AC_MSG_NOTICE output.
+
+	Bump gnulib version.
+
+2024-01-26  Simon Josefsson  <simon@josefsson.org>
+
+	tests: Add standalone.sh, fix things and use it.  Seperation of IdnaTest.txt.
+
+2024-01-25  Simon Josefsson  <simon@josefsson.org>
+
+	Really fix symbol export for macOS.
+
+2024-01-22  Simon Josefsson  <simon@josefsson.org>
+
+	Fix symbol export for macOS.
+
+2024-01-21  Simon Josefsson  <simon@josefsson.org>
+
+	Export punycode APIs.
+
+2024-01-13  Simon Josefsson  <simon@josefsson.org>
+
+	maint: Improve compiler warning handling.
+
+	Un-deprecate idn2_to_ascii_4i and make it NUL terminate output.
+	The API idn2_to_ascii_4i was deprecated in version 2.1.1 released in
+	2019-02-08.  In that release, the API was also modified to not
+	NUL-terminate the output.  That is contrary to the old libidn2
+	behaviour, the behaviour of libidn's API idna_to_ascii_4i, and the API
+	documentation for the function.  Since we are not likely to ever break
+	backwards API/ABI compatibility in libidn2, and the deprecated gaurds
+	leads to some trouble (see report in
+	<https://gitlab.com/libidn/libidn2/-/merge_requests/93>) we decided to
+	un-deprecate this function, as supporting it is not costly and the
+	majority of code that cares about conformance has likely been
+	modified.  This will fix the error code and NUL termination report by
+	Yegor Bychin in <https://gitlab.com/libidn/libidn2/-/issues/100>.  We
+	still encourage you to use the replacement API/ABI idn2_to_ascii_4i2
+	instead, when appropriate.
+
+	cicd: Fix UCRT job, quote character causes infinite stalls.
+
+	cicd: Add arm64/ppc64 jobs.  Workflow rule fixes.
+
+2024-01-03  Simon Josefsson  <simon@josefsson.org>
+
+	Re-enable immutable_NEWS syntax-check.
+
+	Update copyright years, and enable copyright-check to notice it in the future.
+
+	Make test-version.c work standalone.
+
+2024-01-03  alittle  <zhuofeng1107@qq.com>
+
+	change IDN2_TOO_BIG_DOMAIN to IDN2_TOO_BIG_LABEL
+
+2024-01-03  Simon Josefsson  <simon@josefsson.org>
+
+	cicd: Assume build images has GNULIB_REFDIR.
+
+	Run ./bootstrap --bootstrap-sync.
+
+	Update gnulib submodule.
+
+	Add more complete idn2_check_version test.
+
+	cicd: Add Windows/macOS jobs.  Use standard stage names.  Various cleanups.
+
+2023-11-25  Tim Rühsen  <tim.ruehsen@gmx.de>
+
+	Avoid unused assignment
+
+	Drop unused assignment
+
+2023-11-12  Simon Josefsson  <simon@josefsson.org>
+
+	cicd: Naming fixes.
+
+	cicd: Add MacOS build.
+
+	cicd: Fix Alpine image name.
+
+	cicd: Simplify via default rule.  Enable interruptible.
+
+	cicd: Fix ASAN build.
+
+2023-11-11  Simon Josefsson  <simon@josefsson.org>
+
+	cicd: Use new fedora/mingw64 build image.
+
+	doc: Add libabigail to RPM packages.
+
+	cicd: Fix B-Debian-testing build-deps.
+
+	Doc fix.
+
+	Bump generated ABI files.  Closes: #102.
+
+	cicd: Add binfmt-support as new build-dependency for arm cross-compilation.
+
+	cicd: Add Trisquel jobs, and use its tarball output.
+
+	cicd: Update build-image names.
+
+	Don't mention no longer used git2cl.
+
+2023-11-10  Simon Josefsson  <simon@josefsson.org>
+
+	cicd: Fail on build errors.
+
+	Fix typos.
+
+	Update copyright years.
+
+	doc: Typo fix.
+
+2023-11-10  zhuofeng  <zhuofeng2@huawei.com>
+
+	Increase the coverage of abnormal branches
+
+2023-11-10  Simon Josefsson  <simon@josefsson.org>
+
+	Drop autogen/autopull scripts (use bootstrap --gen/--pull).
+
+	cicd: Use stable clang and log version info.
+
+	Bump required gettext version to 0.19.8 for musl-libc.
+	Reported by Helmut Grohne in
+	<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=999510>.
+
+	Update bootstrap scripts.
+
+	Update gnulib submodule.
+
+	cicd: Don't check indentation in too old Debian11.
+
+2023-11-06  Simon Josefsson  <simon@josefsson.org>
+
+	Indent code.
+
+2023-05-28  Tim Rühsen  <tim.ruehsen@gmx.de>
+
+	Fix make syntax-check
+
+	Fix B-clang CI runner
+
+	Fix package repository for Debian-9
+
+	Include config.h in lib/gentr46map.c
+
+	Fix codespell issues
+
+	Include config.h in lib/gendata.c
+
+	Fix gl/build-aux/gnu-web-doc-update.diff
+
+2023-01-16  Fangrui Song  <i@maskray.me>
+
+	Remove non-existent idn2_decode_ul to fix -Wl,--no-undefined-version
+	--no-undefined-version reports errors for non-existent symbols.
+
+	Fixes: 54b3527398396bcfa0a8c6382a86f31fb1d39c9f
+
+2022-10-24  Simon Josefsson  <simon@josefsson.org>
+
+	cicd: Drop tags/except marks.
+
 2022-10-23  Simon Josefsson  <simon@josefsson.org>
 
+	maint: post-release administrivia
+	* NEWS: Add header line for next release.
+	* .prev-version: Record previous version.
+	* cfg.mk (old_NEWS_hash): Auto-update.
+
 	version 2.3.4
 	* NEWS: Record release date.

_service:tar_scm:libidn2-2.3.4.tar.gz/GNUmakefile -> _service:tar_scm:libidn2-2.3.7.tar.gz/GNUmakefile Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/INSTALL -> _service:tar_scm:libidn2-2.3.7.tar.gz/INSTALL Changed

@@ -1,177 +1,177 @@
 Installation Instructions
 *************************
 
-   Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2022 Free
-Software Foundation, Inc.
-
-   Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.  This file is offered as-is,
-without warranty of any kind.
-
 Basic Installation
 ==================
 
-   Briefly, the shell command './configure && make && make install'
-should configure, build, and install this package.  The following
-more-detailed instructions are generic; see the 'README' file for
-instructions specific to this package.  Some packages provide this
-'INSTALL' file but do not implement all of the features documented
-below.  The lack of an optional feature in a given package is not
-necessarily a bug.  More recommendations for GNU packages can be found
-in *note Makefile Conventions: (standards)Makefile Conventions.
-
-   The 'configure' shell script attempts to guess correct values for
+   The following shell commands:
+
+     test -f configure || ./bootstrap
+     ./configure
+     make
+     make install
+
+should configure, build, and install this package.  The first line,
+which bootstraps, is intended for developers; when building from
+distribution tarballs it does nothing and can be skipped.
+
+   The following more-detailed instructions are generic; see the
+‘README’ file for instructions specific to this package.  Some packages
+provide this ‘INSTALL’ file but do not implement all of the features
+documented below.  The lack of an optional feature in a given package is
+not necessarily a bug.  More recommendations for GNU packages can be
+found in the GNU Coding Standards.
+
+   Many packages have scripts meant for developers instead of ordinary
+builders, as they may use developer tools that are less commonly
+installed, or they may access the network, which has privacy
+implications.  If the ‘bootstrap’ shell script exists, it attempts to
+build the ‘configure’ shell script and related files, possibly using
+developer tools or the network.  Because the output of ‘bootstrap’ is
+system-independent, it is normally run by a package developer so that
+its output can be put into the distribution tarball and ordinary
+builders and users need not run ‘bootstrap’.  Some packages have
+commands like ‘./autopull.sh’ and ‘./autogen.sh’ that you can run
+instead of ‘./bootstrap’, for more fine-grained control over
+bootstrapping.
+
+   The ‘configure’ shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
-those values to create a 'Makefile' in each directory of the package.
-It may also create one or more '.h' files containing system-dependent
-definitions.  Finally, it creates a shell script 'config.status' that
+those values to create a ‘Makefile’ in each directory of the package.
+It may also create one or more ‘.h’ files containing system-dependent
+definitions.  Finally, it creates a shell script ‘config.status’ that
 you can run in the future to recreate the current configuration, and a
-file 'config.log' containing compiler output (useful mainly for
-debugging 'configure').
+file ‘config.log’ containing output useful for debugging ‘configure’.
 
-   It can also use an optional file (typically called 'config.cache' and
-enabled with '--cache-file=config.cache' or simply '-C') that saves the
+   It can also use an optional file (typically called ‘config.cache’ and
+enabled with ‘--cache-file=config.cache’ or simply ‘-C’) that saves the
 results of its tests to speed up reconfiguring.  Caching is disabled by
 default to prevent problems with accidental use of stale cache files.
 
    If you need to do unusual things to compile the package, please try
-to figure out how 'configure' could check whether to do them, and mail
-diffs or instructions to the address given in the 'README' so they can
+to figure out how ‘configure’ could check whether to do them, and mail
+diffs or instructions to the address given in the ‘README’ so they can
 be considered for the next release.  If you are using the cache, and at
-some point 'config.cache' contains results you don't want to keep, you
+some point ‘config.cache’ contains results you don’t want to keep, you
 may remove or edit it.
 
-   The file 'configure.ac' (or 'configure.in') is used to create
-'configure' by a program called 'autoconf'.  You need 'configure.ac' if
-you want to change it or regenerate 'configure' using a newer version of
-'autoconf'.
+   The ‘autoconf’ program generates ‘configure’ from the file
+‘configure.ac’.  Normally you should edit ‘configure.ac’ instead of
+editing ‘configure’ directly.
 
    The simplest way to compile this package is:
 
-  1. 'cd' to the directory containing the package's source code and type
-     './configure' to configure the package for your system.
+  1. ‘cd’ to the directory containing the package’s source code.
+
+  2. If this is a developer checkout and file ‘configure’ does not yet
+     exist, type ‘./bootstrap’ to create it.  You may need special
+     developer tools and network access to bootstrap, and the network
+     access may have privacy implications.
 
-     Running 'configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
+  3. Type ‘./configure’ to configure the package for your system.  This
+     might take a while.  While running, ‘configure’ prints messages
+     telling which features it is checking for.
 
-  2. Type 'make' to compile the package.
+  4. Type ‘make’ to compile the package.
 
-  3. Optionally, type 'make check' to run any self-tests that come with
+  5. Optionally, type ‘make check’ to run any self-tests that come with
      the package, generally using the just-built uninstalled binaries.
 
-  4. Type 'make install' to install the programs and any data files and
+  6. Type ‘make install’ to install the programs and any data files and
      documentation.  When installing into a prefix owned by root, it is
      recommended that the package be configured and built as a regular
-     user, and only the 'make install' phase executed with root
+     user, and only the ‘make install’ phase executed with root
      privileges.
 
-  5. Optionally, type 'make installcheck' to repeat any self-tests, but
+  7. Optionally, type ‘make installcheck’ to repeat any self-tests, but
      this time using the binaries in their final installed location.
      This target does not install anything.  Running this target as a
-     regular user, particularly if the prior 'make install' required
+     regular user, particularly if the prior ‘make install’ required
      root privileges, verifies that the installation completed
      correctly.
 
-  6. You can remove the program binaries and object files from the
-     source code directory by typing 'make clean'.  To also remove the
-     files that 'configure' created (so you can compile the package for
-     a different kind of computer), type 'make distclean'.  There is
-     also a 'make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  7. Often, you can also type 'make uninstall' to remove the installed
-     files again.  In practice, not all packages have tested that
-     uninstallation works correctly, even though it is required by the
-     GNU Coding Standards.
-
-  8. Some packages, particularly those that use Automake, provide 'make
-     distcheck', which can by used by developers to test that all other
-     targets like 'make install' and 'make uninstall' work correctly.
-     This target is generally not run by end users.
+  8. You can remove the program binaries and object files from the
+     source code directory by typing ‘make clean’.  To also remove the
+     files that ‘configure’ created (so you can compile the package for
+     a different kind of computer), type ‘make distclean’.  There is
+     also a ‘make maintainer-clean’ target, but that is intended mainly
+     for the package’s developers.  If you use it, you may have to
+     bootstrap again.
+
+  9. If the package follows the GNU Coding Standards, you can type ‘make
+     uninstall’ to remove the installed files.
 
 Compilers and Options
 =====================
 
    Some systems require unusual options for compilation or linking that
-the 'configure' script does not know about.  Run './configure --help'
+the ‘configure’ script does not know about.  Run ‘./configure --help’
 for details on some of the pertinent environment variables.
 
-   You can give 'configure' initial values for configuration parameters
+   You can give ‘configure’ initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here is
 an example:
 
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+     ./configure CC=gcc CFLAGS=-g LIBS=-lposix
 
-   *Note Defining Variables::, for more details.
+   See “Defining Variables” for more details.
 
 Compiling For Multiple Architectures
 ====================================
 
    You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU 'make'.  'cd' to the
-directory where you want the object files and executables to go and run
-the 'configure' script.  'configure' automatically checks for the source
-code in the directory that 'configure' is in and in '..'.  This is known
-as a "VPATH" build.
-
-   With a non-GNU 'make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use 'make distclean' before
-reconfiguring for another architecture.
-
-   On MacOS X 10.5 and later systems, you 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"
-
-   This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the 'lipo' tool if you have problems.
+same time, by placing the object files for each system in their own
+directory.  To do this, you can use GNU ‘make’.  ‘cd’ to the directory
+where you want the object files and executables to go and run the
+‘configure’ script.  ‘configure’ automatically checks for the source
+code in the directory that ‘configure’ is in and in ‘..’.  This is known
+as a “VPATH” build.
+
+   With a non-GNU ‘make’, it is safer to compile the package for one
+system at a time in the source code directory.  After you have installed
+the package for one system, use ‘make distclean’ before reconfiguring
+for another system.
+
+   Some platforms, notably macOS, support “fat” or “universal” binaries,
+where a single binary can execute on different architectures.  On these
+platforms you can configure and compile just once, with options specific
+to that platform.
 
 Installation Names
 ==================
 
-   By default, 'make install' installs the package's commands under
-'/usr/local/bin', include files under '/usr/local/include', etc.  You
-can specify an installation prefix other than '/usr/local' by giving
-'configure' the option '--prefix=PREFIX', where PREFIX must be an
+   By default, ‘make install’ installs the package’s commands under
+‘/usr/local/bin’, include files under ‘/usr/local/include’, etc.  You
+can specify an installation prefix other than ‘/usr/local’ by giving
+‘configure’ the option ‘--prefix=PREFIX’, where PREFIX must be an
 absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-pass the option '--exec-prefix=PREFIX' to 'configure', the package uses
+pass the option ‘--exec-prefix=PREFIX’ to ‘configure’, the package uses
 PREFIX as the prefix for installing programs and libraries.
 Documentation and other data files still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like '--bindir=DIR' to specify different values for particular
-kinds of files.  Run 'configure --help' for a list of the directories
+options like ‘--bindir=DIR’ to specify different values for particular
+kinds of files.  Run ‘configure --help’ for a list of the directories
 you can set and what kinds of files go in them.  In general, the default
-for these options is expressed in terms of '${prefix}', so that
-specifying just '--prefix' will affect all of the other directory
+for these options is expressed in terms of ‘${prefix}’, so that
+specifying just ‘--prefix’ will affect all of the other directory
 specifications that were not explicitly provided.
 
    The most portable way to affect installation locations is to pass the
-correct locations to 'configure'; however, many packages provide one or
+correct locations to ‘configure’; however, many packages provide one or
 both of the following shortcuts of passing variable assignments to the
-'make install' command line to change installation locations without
+‘make install’ command line to change installation locations without
 having to reconfigure or recompile.
 
    The first method involves providing an override variable for each
-affected directory.  For example, 'make install
-prefix=/alternate/directory' will choose an alternate location for all
+affected directory.  For example, ‘make install
+prefix=/alternate/directory’ will choose an alternate location for all
 directory configuration variables that were expressed in terms of
-'${prefix}'.  Any directories that were specified during 'configure',
-but not in terms of '${prefix}', must each be overridden at install time
+‘${prefix}’.  Any directories that were specified during ‘configure’,
+but not in terms of ‘${prefix}’, must each be overridden at install time
 for the entire installation to be relocated.  The approach of makefile
 variable overrides for each directory variable is required by the GNU
 Coding Standards, and ideally causes no recompilation.  However, some
@@ -179,190 +179,187 @@
 that end up requiring recompilation when using this method, particularly
 noticeable in packages that use GNU Libtool.
 
-   The second method involves providing the 'DESTDIR' variable.  For
-example, 'make install DESTDIR=/alternate/directory' will prepend
-'/alternate/directory' before all installation names.  The approach of
-'DESTDIR' overrides is not required by the GNU Coding Standards, and
+   The second method involves providing the ‘DESTDIR’ variable.  For
+example, ‘make install DESTDIR=/alternate/directory’ will prepend
+‘/alternate/directory’ before all installation names.  The approach of
+‘DESTDIR’ overrides is not required by the GNU Coding Standards, and
 does not work on platforms that have drive letters.  On the other hand,
 it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of '${prefix}'
-at 'configure' time.
+when some directory options were not specified in terms of ‘${prefix}’
+at ‘configure’ time.
 
 Optional Features
 =================
 
    If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving 'configure' the
-option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'.
+with an extra prefix or suffix on their names by giving ‘configure’ the
+option ‘--program-prefix=PREFIX’ or ‘--program-suffix=SUFFIX’.
 
-   Some packages pay attention to '--enable-FEATURE' options to
-'configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to '--with-PACKAGE' options, where PACKAGE
-is something like 'gnu-as' or 'x' (for the X Window System).  The
-'README' should mention any '--enable-' and '--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, 'configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the 'configure' options '--x-includes=DIR' and
-'--x-libraries=DIR' to specify their locations.
+   Some packages pay attention to ‘--enable-FEATURE’ and
+‘--disable-FEATURE’ options to ‘configure’, where FEATURE indicates an
+optional part of the package.  They may also pay attention to
+‘--with-PACKAGE’ and ‘--without-PACKAGE’ options, where PACKAGE is
+something like ‘gnu-ld’.  ‘./configure --help’ should mention the
+‘--enable-...’ and ‘--with-...’ options that the package recognizes.
 
    Some packages offer the ability to configure how verbose the
-execution of 'make' will be.  For these packages, running './configure
---enable-silent-rules' sets the default to minimal output, which can be
-overridden with 'make V=1'; while running './configure
---disable-silent-rules' sets the default to verbose, which can be
-overridden with 'make V=0'.
-
-Particular systems
-==================
-
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU CC
-is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
-     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-   HP-UX 'make' updates targets which have the same timestamps as their
-prerequisites, which makes it generally unusable when shipped generated
-files such as 'configure' are involved.  Use GNU 'make' instead.
-
-   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its '<wchar.h>' header file.  The option '-nodtk' can be used as a
-workaround.  If GNU CC is not installed, it is therefore recommended to
-try
-
-     ./configure CC="cc"
-
-and if that doesn't work, try
-
-     ./configure CC="cc -nodtk"
-
-   On Solaris, don't put '/usr/ucb' early in your 'PATH'.  This
-directory contains several dysfunctional programs; working variants of
-these programs are available in '/usr/bin'.  So, if you need '/usr/ucb'
-in your 'PATH', put it _after_ '/usr/bin'.
-
-   On Haiku, software installed for all users goes in '/boot/common',
-not '/usr/local'.  It is recommended to use the following options:
-
-     ./configure --prefix=/boot/common
-
-Specifying the System Type
-==========================
-
-   There may be some features 'configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, 'configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
-'--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as 'sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS
-     KERNEL-OS
-
-   See the file 'config.sub' for the possible values of each field.  If
-'config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option '--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with '--host=TYPE'.
+execution of ‘make’ will be.  For these packages, running ‘./configure
+--enable-silent-rules’ sets the default to minimal output, which can be
+overridden with ‘make V=1’; while running ‘./configure
+--disable-silent-rules’ sets the default to verbose, which can be
+overridden with ‘make V=0’.
+
+Specifying a System Type
+========================
+
+   By default ‘configure’ builds for the current system.  To create
+binaries that can run on a different system type, specify a
+‘--host=TYPE’ option along with compiler variables that specify how to
+generate object code for TYPE.  For example, to create binaries intended
+to run on a 64-bit ARM processor:
+
+     ./configure --host=aarch64-linux-gnu \
+        CC=aarch64-linux-gnu-gcc \
+        CXX=aarch64-linux-gnu-g++
+
+If done on a machine that can execute these binaries (e.g., via
+‘qemu-aarch64’, ‘$QEMU_LD_PREFIX’, and Linux’s ‘binfmt_misc’
+capability), the build behaves like a native build.  Otherwise it is a
+cross-build: ‘configure’ will make cross-compilation guesses instead of
+running test programs, and ‘make check’ will not work.
+
+   A system type can either be a short name like ‘mingw64’, or a
+canonical name like ‘x86_64-pc-linux-gnu’.  Canonical names have the
+form CPU-COMPANY-SYSTEM where SYSTEM is either OS or KERNEL-OS.  To
+canonicalize and validate a system type, you can run the command
+‘config.sub’, which is often squirreled away in a subdirectory like
+‘build-aux’.  For example:
+
+     $ build-aux/config.sub arm64-linux
+     aarch64-unknown-linux-gnu
+     $ build-aux/config.sub riscv-lnx
+     Invalid configuration 'riscv-lnx': OS 'lnx' not recognized
+
+You can look at the ‘config.sub’ file to see which types are recognized.
+If the file is absent, this package does not need the system type.
+
+   If ‘configure’ fails with the diagnostic “cannot guess build type”.
+‘config.sub’ did not recognize your system’s type.  In this case, first
+fetch the newest versions of these files from the GNU config package
+(https://savannah.gnu.org/projects/config).  If that fixes things,
+please report it to the maintainers of the package containing
+‘configure’.  Otherwise, you can try the configure option ‘--build=TYPE’
+where TYPE comes close to your system type; also, please report the
+problem to <config-patches@gnu.org>.
+
+   For more details about configuring system types, see the Autoconf
+documentation.
 
 Sharing Defaults
 ================
 
-   If you want to set default values for 'configure' scripts to share,
-you can create a site shell script called 'config.site' that gives
-default values for variables like 'CC', 'cache_file', and 'prefix'.
-'configure' looks for 'PREFIX/share/config.site' if it exists, then
-'PREFIX/etc/config.site' if it exists.  Or, you can set the
-'CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all 'configure' scripts look for a site script.
+   If you want to set default values for ‘configure’ scripts to share,
+you can create a site shell script called ‘config.site’ that gives
+default values for variables like ‘CC’, ‘cache_file’, and ‘prefix’.
+‘configure’ looks for ‘PREFIX/share/config.site’ if it exists, then
+‘PREFIX/etc/config.site’ if it exists.  Or, you can set the
+‘CONFIG_SITE’ environment variable to the location of the site script.
+A warning: not all ‘configure’ scripts look for a site script.
 
 Defining Variables
 ==================
 
    Variables not defined in a site shell script can be set in the
-environment passed to 'configure'.  However, some packages may run
+environment passed to ‘configure’.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
-them in the 'configure' command line, using 'VAR=value'.  For example:
+them in the ‘configure’ command line, using ‘VAR=value’.  For example:
 
      ./configure CC=/usr/local2/bin/gcc
 
-causes the specified 'gcc' to be used as the C compiler (unless it is
+causes the specified ‘gcc’ to be used as the C compiler (unless it is
 overridden in the site shell script).
 
-Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an
+Unfortunately, this technique does not work for ‘CONFIG_SHELL’ due to an
 Autoconf limitation.  Until the limitation is lifted, you can use this
 workaround:
 
      CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
-'configure' Invocation
+‘configure’ Invocation
 ======================
 
-   'configure' recognizes the following options to control how it
+   ‘configure’ recognizes the following options to control how it
 operates.
 
-'--help'
-'-h'
-     Print a summary of all of the options to 'configure', and exit.
+‘--help’
+‘-h’
+     Print a summary of all of the options to ‘configure’, and exit.
 
-'--help=short'
-'--help=recursive'
-     Print a summary of the options unique to this package's
-     'configure', and exit.  The 'short' variant lists options used only
-     in the top level, while the 'recursive' variant lists options also
+‘--help=short’
+‘--help=recursive’
+     Print a summary of the options unique to this package’s
+     ‘configure’, and exit.  The ‘short’ variant lists options used only
+     in the top level, while the ‘recursive’ variant lists options also
      present in any nested packages.
 
-'--version'
-'-V'
-     Print the version of Autoconf used to generate the 'configure'
+‘--version’
+‘-V’
+     Print the version of Autoconf used to generate the ‘configure’
      script, and exit.
 
-'--cache-file=FILE'
+‘--cache-file=FILE’
      Enable the cache: use and save the results of the tests in FILE,
-     traditionally 'config.cache'.  FILE defaults to '/dev/null' to
+     traditionally ‘config.cache’.  FILE defaults to ‘/dev/null’ to
      disable caching.
 
-'--config-cache'
-'-C'
-     Alias for '--cache-file=config.cache'.
-
-'--quiet'
-'--silent'
-'-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to '/dev/null' (any error
-     messages will still be shown).
+‘--config-cache’
+‘-C’
+     Alias for ‘--cache-file=config.cache’.
 
-'--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     'configure' can determine that directory automatically.
+‘--srcdir=DIR’
+     Look for the package’s source code in directory DIR.  Usually
+     ‘configure’ can determine that directory automatically.
 
-'--prefix=DIR'
-     Use DIR as the installation prefix.  *note Installation Names:: for
+‘--prefix=DIR’
+     Use DIR as the installation prefix.  See “Installation Names” for
      more details, including other options available for fine-tuning the
      installation locations.
 
-'--no-create'
-'-n'
+‘--host=TYPE’
+     Build binaries for system TYPE.  See “Specifying a System Type”.
+
+‘--enable-FEATURE’
+‘--disable-FEATURE’
+     Enable or disable the optional FEATURE.  See “Optional Features”.
+
+‘--with-PACKAGE’
+‘--without-PACKAGE’
+     Use or omit PACKAGE when building.  See “Optional Features”.
+
+‘--quiet’
+‘--silent’
+‘-q’
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to ‘/dev/null’ (any error
+     messages will still be shown).
+
+‘--no-create’
+‘-n’
      Run the configure checks, but stop before creating any output
      files.
 
-'configure' also accepts some other, not widely useful, options.  Run
-'configure --help' for more details.
+‘configure’ also recognizes several environment variables, and accepts
+some other, less widely useful, options.  Run ‘configure --help’ for
+more details.
+
+Copyright notice
+================
+
+   Copyright © 1994–1996, 1999–2002, 2004–2017, 2020–2024 Free Software
+Foundation, Inc.
+
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.

_service:tar_scm:libidn2-2.3.4.tar.gz/Makefile.am -> _service:tar_scm:libidn2-2.3.7.tar.gz/Makefile.am Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/Makefile.in -> _service:tar_scm:libidn2-2.3.7.tar.gz/Makefile.in Changed

@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2011-2022 Simon Josefsson
+# Copyright (C) 2011-2024 Simon Josefsson
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # aminclude_static.am generated automatically by Autoconf
-# from AX_AM_MACROS_STATIC on Sun Oct 23 15:43:13 CEST 2022
+# from AX_AM_MACROS_STATIC on Sat Jan 27 12:28:51 CET 2024
 
 VPATH = @srcdir@
 am__is_gnu_make = { \
@@ -109,8 +109,7 @@
 @ENABLE_DOC_TRUE@am__append_1 = doc
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/unistring/m4/codeset.m4 \
-	$(top_srcdir)/unistring/m4/free.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/unistring/m4/free.m4 \
 	$(top_srcdir)/unistring/m4/gnulib-comp.m4 \
 	$(top_srcdir)/unistring/m4/host-cpu-c-abi.m4 \
 	$(top_srcdir)/unistring/m4/iconv.m4 \
@@ -124,15 +123,19 @@
 	$(top_srcdir)/unistring/m4/libunistring-optional.m4 \
 	$(top_srcdir)/unistring/m4/libunistring.m4 \
 	$(top_srcdir)/unistring/m4/localcharset.m4 \
+	$(top_srcdir)/unistring/m4/unictype_h.m4 \
+	$(top_srcdir)/unistring/m4/uninorm_h.m4 \
 	$(top_srcdir)/unistring/m4/wchar_h.m4 \
 	$(top_srcdir)/gl/m4/00gnulib.m4 \
 	$(top_srcdir)/gl/m4/__inline.m4 \
 	$(top_srcdir)/gl/m4/absolute-header.m4 \
 	$(top_srcdir)/gl/m4/alloca.m4 $(top_srcdir)/gl/m4/assert_h.m4 \
 	$(top_srcdir)/gl/m4/c-bool.m4 $(top_srcdir)/gl/m4/close.m4 \
+	$(top_srcdir)/gl/m4/codeset.m4 \
 	$(top_srcdir)/gl/m4/double-slash-root.m4 \
 	$(top_srcdir)/gl/m4/dup2.m4 $(top_srcdir)/gl/m4/eealloc.m4 \
 	$(top_srcdir)/gl/m4/errno_h.m4 $(top_srcdir)/gl/m4/error.m4 \
+	$(top_srcdir)/gl/m4/error_h.m4 \
 	$(top_srcdir)/gl/m4/extensions.m4 \
 	$(top_srcdir)/gl/m4/extern-inline.m4 \
 	$(top_srcdir)/gl/m4/fcntl-o.m4 $(top_srcdir)/gl/m4/fcntl.m4 \
@@ -147,12 +150,14 @@
 	$(top_srcdir)/gl/m4/inline.m4 $(top_srcdir)/gl/m4/largefile.m4 \
 	$(top_srcdir)/gl/m4/ld-output-def.m4 \
 	$(top_srcdir)/gl/m4/ld-version-script.m4 \
-	$(top_srcdir)/gl/m4/limits-h.m4 $(top_srcdir)/gl/m4/malloca.m4 \
+	$(top_srcdir)/gl/m4/limits-h.m4 \
+	$(top_srcdir)/gl/m4/locale-fr.m4 \
+	$(top_srcdir)/gl/m4/malloca.m4 \
 	$(top_srcdir)/gl/m4/manywarnings.m4 \
 	$(top_srcdir)/gl/m4/mode_t.m4 \
 	$(top_srcdir)/gl/m4/msvc-inval.m4 \
 	$(top_srcdir)/gl/m4/msvc-nothrow.m4 \
-	$(top_srcdir)/gl/m4/multiarch.m4 \
+	$(top_srcdir)/gl/m4/multiarch.m4 $(top_srcdir)/gl/m4/musl.m4 \
 	$(top_srcdir)/gl/m4/nocrash.m4 $(top_srcdir)/gl/m4/off_t.m4 \
 	$(top_srcdir)/gl/m4/open-cloexec.m4 \
 	$(top_srcdir)/gl/m4/open-slash.m4 $(top_srcdir)/gl/m4/open.m4 \
@@ -160,9 +165,9 @@
 	$(top_srcdir)/gl/m4/rawmemchr.m4 \
 	$(top_srcdir)/gl/m4/ssize_t.m4 \
 	$(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \
-	$(top_srcdir)/gl/m4/stdalign.m4 $(top_srcdir)/gl/m4/stdarg.m4 \
-	$(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \
-	$(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \
+	$(top_srcdir)/gl/m4/stdarg.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \
+	$(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \
+	$(top_srcdir)/gl/m4/stdlib_h.m4 \
 	$(top_srcdir)/gl/m4/strchrnul.m4 \
 	$(top_srcdir)/gl/m4/strerror.m4 \
 	$(top_srcdir)/gl/m4/string_h.m4 \
@@ -176,8 +181,7 @@
 	$(top_srcdir)/gl/m4/visibility.m4 \
 	$(top_srcdir)/gl/m4/warn-on-use.m4 \
 	$(top_srcdir)/gl/m4/warnings.m4 $(top_srcdir)/gl/m4/wchar_t.m4 \
-	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/year2038.m4 \
-	$(top_srcdir)/gl/m4/zzgnulib.m4 \
+	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/zzgnulib.m4 \
 	$(top_srcdir)/m4/ax_ac_append_to_file.m4 \
 	$(top_srcdir)/m4/ax_ac_print_to_file.m4 \
 	$(top_srcdir)/m4/ax_add_am_macro_static.m4 \
@@ -284,7 +288,7 @@
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-DIST_SUBDIRS = gl unistring lib src examples tests fuzz po doc
+DIST_SUBDIRS = gl unistring lib src examples fuzz po doc tests
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(srcdir)/libidn2.pc.in $(top_srcdir)/aminclude_static.am \
 	$(top_srcdir)/build-aux/compile \
@@ -485,6 +489,7 @@
 GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@
 GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@
 GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@
+GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@
 GL_GNULIB_GETSUBOPT = @GL_GNULIB_GETSUBOPT@
 GL_GNULIB_GETUMASK = @GL_GNULIB_GETUMASK@
 GL_GNULIB_GETUSERSHELL = @GL_GNULIB_GETUSERSHELL@
@@ -514,6 +519,7 @@
 GL_GNULIB_MBSSPN = @GL_GNULIB_MBSSPN@
 GL_GNULIB_MBSSTR = @GL_GNULIB_MBSSTR@
 GL_GNULIB_MBSTOK_R = @GL_GNULIB_MBSTOK_R@
+GL_GNULIB_MBSTOWCS = @GL_GNULIB_MBSTOWCS@
 GL_GNULIB_MBTOWC = @GL_GNULIB_MBTOWC@
 GL_GNULIB_MDA_ACCESS = @GL_GNULIB_MDA_ACCESS@
 GL_GNULIB_MDA_CHDIR = @GL_GNULIB_MDA_CHDIR@
@@ -559,6 +565,7 @@
 GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@
 GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@
 GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@
+GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@
 GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@
 GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@
 GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@
@@ -596,6 +603,7 @@
 GL_GNULIB_PUTS = @GL_GNULIB_PUTS@
 GL_GNULIB_PWRITE = @GL_GNULIB_PWRITE@
 GL_GNULIB_QSORT_R = @GL_GNULIB_QSORT_R@
+GL_GNULIB_RAND = @GL_GNULIB_RAND@
 GL_GNULIB_RANDOM = @GL_GNULIB_RANDOM@
 GL_GNULIB_RANDOM_R = @GL_GNULIB_RANDOM_R@
 GL_GNULIB_RAWMEMCHR = @GL_GNULIB_RAWMEMCHR@
@@ -651,6 +659,7 @@
 GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@
 GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@
 GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@
+GL_GNULIB_TIME = @GL_GNULIB_TIME@
 GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@
 GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@
 GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@
@@ -728,6 +737,7 @@
 GL_UNISTRING_GNULIB_GETPAGESIZE = @GL_UNISTRING_GNULIB_GETPAGESIZE@
 GL_UNISTRING_GNULIB_GETPASS = @GL_UNISTRING_GNULIB_GETPASS@
 GL_UNISTRING_GNULIB_GETPASS_GNU = @GL_UNISTRING_GNULIB_GETPASS_GNU@
+GL_UNISTRING_GNULIB_GETPROGNAME = @GL_UNISTRING_GNULIB_GETPROGNAME@
 GL_UNISTRING_GNULIB_GETSUBOPT = @GL_UNISTRING_GNULIB_GETSUBOPT@
 GL_UNISTRING_GNULIB_GETUSERSHELL = @GL_UNISTRING_GNULIB_GETUSERSHELL@
 GL_UNISTRING_GNULIB_GRANTPT = @GL_UNISTRING_GNULIB_GRANTPT@
@@ -761,6 +771,8 @@
 GL_UNISTRING_GNULIB_MBSSPN = @GL_UNISTRING_GNULIB_MBSSPN@
 GL_UNISTRING_GNULIB_MBSSTR = @GL_UNISTRING_GNULIB_MBSSTR@
 GL_UNISTRING_GNULIB_MBSTOK_R = @GL_UNISTRING_GNULIB_MBSTOK_R@
+GL_UNISTRING_GNULIB_MBSTOWCS = @GL_UNISTRING_GNULIB_MBSTOWCS@
+GL_UNISTRING_GNULIB_MBSZERO = @GL_UNISTRING_GNULIB_MBSZERO@
 GL_UNISTRING_GNULIB_MBTOWC = @GL_UNISTRING_GNULIB_MBTOWC@
 GL_UNISTRING_GNULIB_MDA_ACCESS = @GL_UNISTRING_GNULIB_MDA_ACCESS@
 GL_UNISTRING_GNULIB_MDA_CHDIR = @GL_UNISTRING_GNULIB_MDA_CHDIR@
@@ -795,6 +807,7 @@
 GL_UNISTRING_GNULIB_MEMMEM = @GL_UNISTRING_GNULIB_MEMMEM@
 GL_UNISTRING_GNULIB_MEMPCPY = @GL_UNISTRING_GNULIB_MEMPCPY@
 GL_UNISTRING_GNULIB_MEMRCHR = @GL_UNISTRING_GNULIB_MEMRCHR@
+GL_UNISTRING_GNULIB_MEMSET_EXPLICIT = @GL_UNISTRING_GNULIB_MEMSET_EXPLICIT@
 GL_UNISTRING_GNULIB_MKDTEMP = @GL_UNISTRING_GNULIB_MKDTEMP@
 GL_UNISTRING_GNULIB_MKOSTEMP = @GL_UNISTRING_GNULIB_MKOSTEMP@
 GL_UNISTRING_GNULIB_MKOSTEMPS = @GL_UNISTRING_GNULIB_MKOSTEMPS@
@@ -810,6 +823,7 @@
 GL_UNISTRING_GNULIB_PUTENV = @GL_UNISTRING_GNULIB_PUTENV@
 GL_UNISTRING_GNULIB_PWRITE = @GL_UNISTRING_GNULIB_PWRITE@
 GL_UNISTRING_GNULIB_QSORT_R = @GL_UNISTRING_GNULIB_QSORT_R@
+GL_UNISTRING_GNULIB_RAND = @GL_UNISTRING_GNULIB_RAND@
 GL_UNISTRING_GNULIB_RANDOM = @GL_UNISTRING_GNULIB_RANDOM@
 GL_UNISTRING_GNULIB_RANDOM_R = @GL_UNISTRING_GNULIB_RANDOM_R@
 GL_UNISTRING_GNULIB_RAWMEMCHR = @GL_UNISTRING_GNULIB_RAWMEMCHR@
@@ -858,6 +872,141 @@
 GL_UNISTRING_GNULIB_SYSTEM_POSIX = @GL_UNISTRING_GNULIB_SYSTEM_POSIX@
 GL_UNISTRING_GNULIB_TRUNCATE = @GL_UNISTRING_GNULIB_TRUNCATE@
 GL_UNISTRING_GNULIB_TTYNAME_R = @GL_UNISTRING_GNULIB_TTYNAME_R@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE@
 GL_UNISTRING_GNULIB_UNISTD_H_GETOPT = @GL_UNISTRING_GNULIB_UNISTD_H_GETOPT@
 GL_UNISTRING_GNULIB_UNISTD_H_NONBLOCKING = @GL_UNISTRING_GNULIB_UNISTD_H_NONBLOCKING@
 GL_UNISTRING_GNULIB_UNISTD_H_SIGPIPE = @GL_UNISTRING_GNULIB_UNISTD_H_SIGPIPE@
@@ -896,6 +1045,7 @@
 GL_UNISTRING_GNULIB_WCTOB = @GL_UNISTRING_GNULIB_WCTOB@
 GL_UNISTRING_GNULIB_WCTOMB = @GL_UNISTRING_GNULIB_WCTOMB@
 GL_UNISTRING_GNULIB_WCWIDTH = @GL_UNISTRING_GNULIB_WCWIDTH@
+GL_UNISTRING_GNULIB_WGETCWD = @GL_UNISTRING_GNULIB_WGETCWD@
 GL_UNISTRING_GNULIB_WMEMCHR = @GL_UNISTRING_GNULIB_WMEMCHR@
 GL_UNISTRING_GNULIB_WMEMCMP = @GL_UNISTRING_GNULIB_WMEMCMP@
 GL_UNISTRING_GNULIB_WMEMCPY = @GL_UNISTRING_GNULIB_WMEMCPY@
@@ -907,7 +1057,6 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@
-GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
@@ -943,6 +1092,7 @@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
+HAVE_DECL_GETW = @HAVE_DECL_GETW@
 HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
 HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
 HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@
@@ -950,6 +1100,8 @@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
+HAVE_DECL_PROGRAM_INVOCATION_NAME = @HAVE_DECL_PROGRAM_INVOCATION_NAME@
+HAVE_DECL_PUTW = @HAVE_DECL_PUTW@
 HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
 HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@
@@ -971,6 +1123,9 @@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP3 = @HAVE_DUP3@
+HAVE_ERROR = @HAVE_ERROR@
+HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@
+HAVE_ERROR_H = @HAVE_ERROR_H@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
 HAVE_EXECVPE = @HAVE_EXECVPE@
 HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@
@@ -997,10 +1152,13 @@
 HAVE_GETOPT_H = @HAVE_GETOPT_H@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETPASS = @HAVE_GETPASS@
+HAVE_GETPROGNAME = @HAVE_GETPROGNAME@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
 HAVE_GETUMASK = @HAVE_GETUMASK@
 HAVE_GRANTPT = @HAVE_GRANTPT@
 HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_IMAXABS = @HAVE_IMAXABS@
+HAVE_IMAXDIV = @HAVE_IMAXDIV@
 HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@
 HAVE_INITSTATE = @HAVE_INITSTATE@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -1019,6 +1177,7 @@
 HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
 HAVE_MBTOWC = @HAVE_MBTOWC@
 HAVE_MEMPCPY = @HAVE_MEMPCPY@
+HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@
 HAVE_MKDIRAT = @HAVE_MKDIRAT@
 HAVE_MKDTEMP = @HAVE_MKDTEMP@
 HAVE_MKFIFO = @HAVE_MKFIFO@
@@ -1094,6 +1253,7 @@
 HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@
 HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNISTRING_WOE32DLL_H = @HAVE_UNISTRING_WOE32DLL_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
 HAVE_USLEEP = @HAVE_USLEEP@
@@ -1155,6 +1315,10 @@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LCOV = @LCOV@
+LC_COLLATE_IMPLEMENTED = @LC_COLLATE_IMPLEMENTED@
+LC_MONETARY_IMPLEMENTED = @LC_MONETARY_IMPLEMENTED@
+LC_NUMERIC_IMPLEMENTED = @LC_NUMERIC_IMPLEMENTED@
+LC_TIME_IMPLEMENTED = @LC_TIME_IMPLEMENTED@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -1174,6 +1338,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
 LOG_VALGRIND = @LOG_VALGRIND@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
@@ -1194,6 +1359,7 @@
 NEXT_ASSERT_H = @NEXT_ASSERT_H@
 NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
+NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
@@ -1211,6 +1377,7 @@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
+NEXT_ERROR_H = @NEXT_ERROR_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
@@ -1266,6 +1433,9 @@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
+REPLACE_DUP3 = @REPLACE_DUP3@
+REPLACE_ERROR = @REPLACE_ERROR@
+REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@
 REPLACE_EXECL = @REPLACE_EXECL@
 REPLACE_EXECLE = @REPLACE_EXECLE@
 REPLACE_EXECLP = @REPLACE_EXECLP@
@@ -1274,10 +1444,12 @@
 REPLACE_EXECVP = @REPLACE_EXECVP@
 REPLACE_EXECVPE = @REPLACE_EXECVPE@
 REPLACE_FACCESSAT = @REPLACE_FACCESSAT@
+REPLACE_FCHDIR = @REPLACE_FCHDIR@
 REPLACE_FCHMODAT = @REPLACE_FCHMODAT@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
+REPLACE_FDATASYNC = @REPLACE_FDATASYNC@
 REPLACE_FDOPEN = @REPLACE_FDOPEN@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FFSLL = @REPLACE_FFSLL@
@@ -1299,16 +1471,22 @@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
 REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
 REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
+REPLACE_GETENTROPY = @REPLACE_GETENTROPY@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
+REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@
 REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETPASS = @REPLACE_GETPASS@
 REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@
+REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@
+REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@
 REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
+REPLACE_IMAXABS = @REPLACE_IMAXABS@
+REPLACE_IMAXDIV = @REPLACE_IMAXDIV@
 REPLACE_INITSTATE = @REPLACE_INITSTATE@
 REPLACE_ISATTY = @REPLACE_ISATTY@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
@@ -1326,14 +1504,20 @@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_MBSTOWCS = @REPLACE_MBSTOWCS@
 REPLACE_MBTOWC = @REPLACE_MBTOWC@
+REPLACE_MB_CUR_MAX = @REPLACE_MB_CUR_MAX@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
+REPLACE_MEMPCPY = @REPLACE_MEMPCPY@
+REPLACE_MEMSET_EXPLICIT = @REPLACE_MEMSET_EXPLICIT@
 REPLACE_MKDIR = @REPLACE_MKDIR@
 REPLACE_MKFIFO = @REPLACE_MKFIFO@
 REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@
 REPLACE_MKNOD = @REPLACE_MKNOD@
 REPLACE_MKNODAT = @REPLACE_MKNODAT@
+REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@
+REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@
 REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
 REPLACE_MKTIME = @REPLACE_MKTIME@
 REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
@@ -1342,8 +1526,10 @@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
 REPLACE_PERROR = @REPLACE_PERROR@
+REPLACE_PIPE2 = @REPLACE_PIPE2@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@
+REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
 REPLACE_PTSNAME = @REPLACE_PTSNAME@
@@ -1351,6 +1537,7 @@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
 REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RAND = @REPLACE_RAND@
 REPLACE_RANDOM = @REPLACE_RANDOM@
 REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
 REPLACE_READ = @REPLACE_READ@
@@ -1365,6 +1552,7 @@
 REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SETENV = @REPLACE_SETENV@
+REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@
 REPLACE_SETSTATE = @REPLACE_SETSTATE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
@@ -1372,6 +1560,7 @@
 REPLACE_STAT = @REPLACE_STAT@
 REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
+REPLACE_STPCPY = @REPLACE_STPCPY@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
 REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
@@ -1394,9 +1583,13 @@
 REPLACE_STRTOUL = @REPLACE_STRTOUL@
 REPLACE_STRTOULL = @REPLACE_STRTOULL@
 REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
+REPLACE_STRVERSCMP = @REPLACE_STRVERSCMP@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
+REPLACE_TIME = @REPLACE_TIME@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
+REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@
+REPLACE_TIMESPEC_GETRES = @REPLACE_TIMESPEC_GETRES@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
 REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
@@ -1413,21 +1606,26 @@
 REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@
 REPLACE_VSPRINTF = @REPLACE_VSPRINTF@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSCMP = @REPLACE_WCSCMP@
 REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
+REPLACE_WCSNCMP = @REPLACE_WCSNCMP@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
+REPLACE_WCSSTR = @REPLACE_WCSSTR@
 REPLACE_WCSTOK = @REPLACE_WCSTOK@
 REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
 REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+REPLACE_WMEMCMP = @REPLACE_WMEMCMP@
+REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@
 REPLACE_WRITE = @REPLACE_WRITE@
+REPLACE__EXIT = @REPLACE__EXIT@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
-STDALIGN_H = @STDALIGN_H@
 STDARG_H = @STDARG_H@
 STDCKDINT_H = @STDCKDINT_H@
 STDDEF_H = @STDDEF_H@
@@ -1450,6 +1648,8 @@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WERROR_CFLAGS = @WERROR_CFLAGS@
+WERROR_TESTS_CFLAGS = @WERROR_TESTS_CFLAGS@
 WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
 WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
@@ -1527,7 +1727,7 @@
 unistringtests_LIBOBJS = @unistringtests_LIBOBJS@
 unistringtests_LTLIBOBJS = @unistringtests_LTLIBOBJS@
 unistringtests_WITNESS = @unistringtests_WITNESS@
-SUBDIRS = gl unistring lib src examples tests fuzz po $(am__append_1)
+SUBDIRS = gl unistring lib src examples fuzz po $(am__append_1) tests
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I unistring/m4
 
 # git-version-gen

_service:tar_scm:libidn2-2.3.4.tar.gz/NEWS -> _service:tar_scm:libidn2-2.3.7.tar.gz/NEWS Changed

@@ -1,5 +1,90 @@
 Libidn2 NEWS -- History of user-visible changes.                -*- outline -*-
 
+* Noteworthy changes in release 2.3.7 (2024-01-27) stable
+
+** Really include tests/standalone.sh in tarball.
+
+* Noteworthy changes in release 2.3.6 (2024-01-27) stable
+
+** Bump libtool version numbers to reflect API/ABI addition.
+
+** Include tests/standalone.sh in tarball.
+
+* Noteworthy changes in release 2.3.5 (2024-01-27) stable
+
+** Declaration of future API/ABI backwards compatibility stability.
+GNU libc dlopen libidn2 and use the name libidn2.so.0 for this.  We
+believe that it will be too challenging to ever do hard ABI break that
+for normal libraries is justified to remove deprecated APIs.  Thus we
+decided that we will support the current ABI for a long time.  Of
+course, if really convincing arguments for doing a ABI break appears
+in the future we may re-consider, but take this as a declaration of
+intent of will and that future ABI breaks should be discussed and
+co-ordinated with the glibc team first.
+
+** Add public APIs for raw Punycode encoding/decoding.
+Normal applications rarely need this, but it cleans up the code and
+allow for external testing of the APIs, and resolve
+<https://gitlab.com/libidn/libidn2/-/issues/80> due to earlier use of
+weak symbols for internal symbols _idn2_punycode_encode and
+_idn2_punycode_decode.  We will support these internal symbols for
+backwards compatibility.  This allows a clean migration path for code
+that is still using the internal names.
+
+** Bump required gettext version to 0.19.8 for musl-libc.
+Reported by Helmut Grohne in
+<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=999510>.
+
+** Un-deprecate idn2_to_ascii_4i and make it NUL terminate output.
+The API idn2_to_ascii_4i was deprecated in version 2.1.1 released in
+2019-02-08.  In that release, the API was also modified to not
+NUL-terminate the output.  That is contrary to the old libidn2
+behaviour, the behaviour of libidn's API idna_to_ascii_4i, and the API
+documentation for the function.  Since we are not likely to ever break
+backwards API/ABI compatibility in libidn2, and the deprecated gaurds
+leads to some trouble (see report in
+<https://gitlab.com/libidn/libidn2/-/merge_requests/93>) we decided to
+un-deprecate this function, as supporting it is not costly and the
+majority of code that cares about conformance has likely been
+modified.  This will fix the error code and NUL termination report by
+Yegor Bychin in <https://gitlab.com/libidn/libidn2/-/issues/100>.  We
+still encourage you to use the replacement API/ABI idn2_to_ascii_4i2
+instead, when appropriate.
+
+** Compiler warning improvements.
+As before, compiler warnings are enabled by default.  You may disable
+them using ./configure --disable-gcc-warnings or turn them into fatal
+errors using ./configure --enable-gcc-warnings=error to add -Werror
+and sensible -Wno-error='s.  Based on gnulib's manywarnings, see
+<https://www.gnu.org/software/gnulib//manual/html_node/manywarnings.html>.
+
+** tests: Added script tests/standalone.sh suitable for integrators.
+The main purpose is to test a system-installed libidn2 library and
+idn2 tool, suitable for distributor checking (a'la Debian's
+autopkgtest/debci).  It may also be used to test a newly built libidn2
+outside the usual 'make check' infrastructure.  To check that your
+system libidn2 library and idn2 tool is working, invoke the script
+with `srcdir` as an environment variable indicating where it can be
+find the source code for libidn2's tests/ directory (it will use the
+directory name where the script is by default):
+
+tests/standalone.sh
+
+If your system libidn2 is too old to pass certain tests, disable them
+using STANDALONE_DISABLE like this:
+
+STANDALONE_DISABLE='*punycode*' tests/standalone.sh
+
+See the script for more parameters.  If the libidn2 under testing is
+too old and has known bugs, that should cause tests to fail, which is
+intentional.
+
+** Various minor build fixes and translation updates.
+
+** API and ABI is backwards compatible with the previous version.
+idn2_punycode_decode: ADD.
+idn2_punycode_encode: ADD.
+
 * Noteworthy changes in release 2.3.4 (2022-10-23) stable
 
 ** Support for Unicode 15.0.0.  Closes: #112.
@@ -426,8 +511,8 @@
 internal implementation.
 
 ----------------------------------------------------------------------
-Copyright (C) 2011-2022 Simon Josefsson
-Copyright (C) 2018-2022 Tim Ruehsen
+Copyright (C) 2011-2024 Simon Josefsson
+Copyright (C) 2018-2024 Tim Ruehsen
 
 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 the

_service:tar_scm:libidn2-2.3.4.tar.gz/aclocal.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/aclocal.m4 Changed

@@ -14,8 +14,8 @@
 m4_ifndef(AC_CONFIG_MACRO_DIRS, m4_defun(_AM_CONFIG_MACRO_DIRS, )m4_defun(AC_CONFIG_MACRO_DIRS, _AM_CONFIG_MACRO_DIRS($@)))
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
-m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.71,,
-m4_warning(this file was generated for autoconf 2.71.
+m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.72,,
+m4_warning(this file was generated for autoconf 2.72.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.))
@@ -1185,7 +1185,6 @@
 AC_SUBST(am__untar)
 ) # _AM_PROG_TAR
 
-m4_include(unistring/m4/codeset.m4)
 m4_include(unistring/m4/free.m4)
 m4_include(unistring/m4/gnulib-comp.m4)
 m4_include(unistring/m4/host-cpu-c-abi.m4)
@@ -1200,6 +1199,8 @@
 m4_include(unistring/m4/libunistring-optional.m4)
 m4_include(unistring/m4/libunistring.m4)
 m4_include(unistring/m4/localcharset.m4)
+m4_include(unistring/m4/unictype_h.m4)
+m4_include(unistring/m4/uninorm_h.m4)
 m4_include(unistring/m4/wchar_h.m4)
 m4_include(gl/m4/00gnulib.m4)
 m4_include(gl/m4/__inline.m4)
@@ -1208,11 +1209,13 @@
 m4_include(gl/m4/assert_h.m4)
 m4_include(gl/m4/c-bool.m4)
 m4_include(gl/m4/close.m4)
+m4_include(gl/m4/codeset.m4)
 m4_include(gl/m4/double-slash-root.m4)
 m4_include(gl/m4/dup2.m4)
 m4_include(gl/m4/eealloc.m4)
 m4_include(gl/m4/errno_h.m4)
 m4_include(gl/m4/error.m4)
+m4_include(gl/m4/error_h.m4)
 m4_include(gl/m4/extensions.m4)
 m4_include(gl/m4/extern-inline.m4)
 m4_include(gl/m4/fcntl-o.m4)
@@ -1232,12 +1235,14 @@
 m4_include(gl/m4/ld-output-def.m4)
 m4_include(gl/m4/ld-version-script.m4)
 m4_include(gl/m4/limits-h.m4)
+m4_include(gl/m4/locale-fr.m4)
 m4_include(gl/m4/malloca.m4)
 m4_include(gl/m4/manywarnings.m4)
 m4_include(gl/m4/mode_t.m4)
 m4_include(gl/m4/msvc-inval.m4)
 m4_include(gl/m4/msvc-nothrow.m4)
 m4_include(gl/m4/multiarch.m4)
+m4_include(gl/m4/musl.m4)
 m4_include(gl/m4/nocrash.m4)
 m4_include(gl/m4/off_t.m4)
 m4_include(gl/m4/open-cloexec.m4)
@@ -1248,7 +1253,6 @@
 m4_include(gl/m4/ssize_t.m4)
 m4_include(gl/m4/stat-time.m4)
 m4_include(gl/m4/stat.m4)
-m4_include(gl/m4/stdalign.m4)
 m4_include(gl/m4/stdarg.m4)
 m4_include(gl/m4/stddef_h.m4)
 m4_include(gl/m4/stdint.m4)
@@ -1270,7 +1274,6 @@
 m4_include(gl/m4/warnings.m4)
 m4_include(gl/m4/wchar_t.m4)
 m4_include(gl/m4/wint_t.m4)
-m4_include(gl/m4/year2038.m4)
 m4_include(gl/m4/zzgnulib.m4)
 m4_include(m4/ax_ac_append_to_file.m4)
 m4_include(m4/ax_ac_print_to_file.m4)

_service:tar_scm:libidn2-2.3.4.tar.gz/aminclude_static.am -> _service:tar_scm:libidn2-2.3.7.tar.gz/aminclude_static.am Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/build-aux/announce-gen -> _service:tar_scm:libidn2-2.3.7.tar.gz/build-aux/announce-gen Changed

@@ -3,7 +3,7 @@
 
 # Generate a release announcement message.
 
-# Copyright (C) 2002-2022 Free Software Foundation, Inc.
+# Copyright (C) 2002-2024 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@
 eval 'exec perl -wSx "$0" "$@"'
      if 0;
 
-my $VERSION = '2022-07-10 01:47'; # UTC
+my $VERSION = '2023-12-29 18:26'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -165,6 +165,17 @@
 
 =cut
 
+# This digest function omits the "=" padding that is required by cksum,
+# so add the 0..2 bytes of padding required for each of Digest's algorithms.
+sub digest_file_base64_wrap ($$)
+{
+  my ($file, $alg) = @_;
+  my $h = digest_file_base64($file, $alg);
+  $alg =~ tr{-}{}d;
+  my %pad = (MD5 => 2, SHA1 => 1, SHA256 => 1, SHA384 => 0, SHA512 => 2);
+  return $h . '=' x $pad{$alg};
+}
+
 sub print_checksums (@)
 {
   my (@file) = @_;
@@ -176,11 +187,11 @@
 
   foreach my $f (@file)
     {
-      print digest_file_hex($f, "SHA-1"), "  $f\n";
-      print digest_file_base64($f, "SHA-256"), "  $f\n";
+      print '  ', digest_file_hex ($f, "SHA-1"), "  $f\n";
+      print '  ', digest_file_base64_wrap ($f, "SHA-256"), "  $f\n";
     }
-  print "\nThe SHA256 checksum is base64 encoded, instead of the\n";
-  print "hexadecimal encoding that most checksum tools default to.\n\n";
+  print "\nVerify the base64 SHA256 checksum with cksum -a sha256 --check\n";
+  print "from coreutils-9.2 or OpenBSD's cksum since 2007.\n\n";
 }
 
 =item C<print_news_deltas ($news_file, $prev_version, $curr_version)
@@ -365,6 +376,38 @@
   return @tool_version_pair;
 }
 
+# Print a more human-friendly representation of $SEC seconds.
+sub readable_interval0($)
+{
+  my $sec = shift;
+  $sec < 60 and return "$sec seconds";
+
+  my $min = int($sec / 60); $sec %= 60;
+  30 < $sec and $min++;
+  $min < 60 and return "$min minutes";
+
+  my $hr = int($min / 60); $min %= 60;
+  30 < $min and $hr++;
+  $hr < 24 and return "$hr hours";
+
+  my $day = int($hr / 24); $hr %= 24;
+  12 < $hr and $day++;
+  $day < 50 and return "$day days";
+
+  my $wk = int($day / 7); $day %= 7;
+  4 < $day and $wk++;
+  return "$wk weeks";
+}
+
+# Convert e.g., "1 weeks", to "1 week".
+sub readable_interval($)
+{
+  my $interval_str = shift;
+  my $i = readable_interval0 $interval_str;
+  $i =~ m{^1 \w+s$} and chop $i;
+  return $i;
+}
+
 {
   # Use the C locale so that, for instance, "du" does not
   # print "1,2" instead of "1.2", which would confuse our regexps.
@@ -493,11 +536,49 @@
 ${headers}Subject: $my_distdir released $release_type
 
 <\#secure method=pgpmime mode=sign>
+This is to announce $package_name-$curr_version, a $release_type release.
 
 FIXME: put comments here
 
 EOF
 
+  my $v0 = $prev_version;
+  my $v1 = $curr_version;
+
+  (my $first_name = `git config user.name|cut -d' ' -f1`)
+    =~ m{\S} or die "no name? set user.name in ~/.gitconfig\n";
+
+  chomp (my $n_ci = `git rev-list "v$v0..v$v1" | wc -l`);
+  chomp (my $n_p = `git shortlog "v$v0..v$v1" | grep -c '^^ '`);
+
+  my $prev_release_date = `git log --pretty=%ct -1 "v$v0"`;
+  my $this_release_date = `git log --pretty=%ct -1 "v$v1"`;
+  my $n_seconds = $this_release_date - $prev_release_date;
+  my $time_since_prev = readable_interval $n_seconds;
+  my $names = `git shortlog "v$v0..v$v1"|perl -lne '/^(\\w.*):/ and print "  ".\$1'`;
+
+  print <<EOF;
+There have been $n_ci commits by $n_p people in the $time_since_prev since $v0.
+
+See the NEWS below for a brief summary.
+
+Thanks to everyone who has contributed!
+The following people contributed changes to this release:
+
+$names
+$first_name on behalf of the $package_name maintainers
+==================================================================
+
+Here is the GNU $package_name home page:
+    https://gnu.org/s/$package_name/
+
+For a summary of changes and contributors, see:
+  https://git.sv.gnu.org/gitweb/?p=$package_name.git;a=shortlog;h=v$v1
+or run this command from a git-cloned $package_name directory:
+  git shortlog v$v0..v$v1
+
+EOF
+
   if (@url_dir_list == 1 && @tarballs == 1)
     {
       # When there's only one tarball and one URL, use a more concise form.
@@ -587,7 +668,6 @@
 
   wget -q https://ftp.gnu.org/gnu/gnu-keyring.gpg
   gpg --keyring gnu-keyring.gpg --verify $tarballs0.sig
-
 EOF
 
   my @tool_versions = get_tool_versions (\@tool_list, $gnulib_version);

_service:tar_scm:libidn2-2.3.4.tar.gz/build-aux/config.guess -> _service:tar_scm:libidn2-2.3.7.tar.gz/build-aux/config.guess Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2022 Free Software Foundation, Inc.
+#   Copyright 1992-2024 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2022-09-17'
+timestamp='2024-01-01'
 
 # 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
@@ -47,7 +47,7 @@
 usage="\
 Usage: $0 OPTION
 
-Output the configuration name of the system \`$me' is run on.
+Output the configuration name of the system '$me' is run on.
 
 Options:
   -h, --help         print this help, then exit
@@ -60,13 +60,13 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2022 Free Software Foundation, Inc.
+Copyright 1992-2024 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 
 help="
-Try \`$me --help' for more information."
+Try '$me --help' for more information."
 
 # Parse command line
 while test $# -gt 0 ; do
@@ -102,8 +102,8 @@
 # temporary files to be created and, as you can see below, it is a
 # headache to deal with in a portable fashion.
 
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
+# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still
+# use 'HOST_CC' if defined, but it is deprecated.
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
@@ -155,6 +155,9 @@
 
 	set_cc_for_build
 	cat <<-EOF > "$dummy.c"
+	#if defined(__ANDROID__)
+	LIBC=android
+	#else
 	#include <features.h>
 	#if defined(__UCLIBC__)
 	LIBC=uclibc
@@ -162,6 +165,8 @@
 	LIBC=dietlibc
 	#elif defined(__GLIBC__)
 	LIBC=gnu
+	#elif defined(__LLVM_LIBC__)
+	LIBC=llvm
 	#else
 	#include <stdarg.h>
 	/* First heuristic to detect musl libc.  */
@@ -169,6 +174,7 @@
 	LIBC=musl
 	#endif
 	#endif
+	#endif
 	EOF
 	cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
 	eval "$cc_set_libc"
@@ -459,7 +465,7 @@
 		UNAME_RELEASE=`uname -v`
 		;;
 	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
+	# Japanese Language versions have a version number like '4.1.3-JL'.
 	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
 	GUESS=sparc-sun-sunos$SUN_REL
 	;;
@@ -904,7 +910,7 @@
 	fi
 	;;
     *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	UNAME_PROCESSOR=`uname -p`
 	case $UNAME_PROCESSOR in
 	    amd64)
 		UNAME_PROCESSOR=x86_64 ;;
@@ -976,7 +982,27 @@
 	GUESS=$UNAME_MACHINE-unknown-minix
 	;;
     aarch64:Linux:*:*)
-	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	set_cc_for_build
+	CPU=$UNAME_MACHINE
+	LIBCABI=$LIBC
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
+	    ABI=64
+	    sed 's/^	    //' << EOF > "$dummy.c"
+	    #ifdef __ARM_EABI__
+	    #ifdef __ARM_PCS_VFP
+	    ABI=eabihf
+	    #else
+	    ABI=eabi
+	    #endif
+	    #endif
+EOF
+	    cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
+	    eval "$cc_set_abi"
+	    case $ABI in
+		eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;;
+	    esac
+	fi
+	GUESS=$CPU-unknown-linux-$LIBCABI
 	;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
@@ -1042,6 +1068,15 @@
     k1om:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
+    kvx:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    kvx:cos:*:*)
+	GUESS=$UNAME_MACHINE-unknown-cos
+	;;
+    kvx:mbr:*:*)
+	GUESS=$UNAME_MACHINE-unknown-mbr
+	;;
     loongarch32:Linux:*:* | loongarch64:Linux:*:*)
 	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
@@ -1197,7 +1232,7 @@
 	GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
 	;;
     i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
+	# If we were able to find 'uname', then EMX Unix compatibility
 	# is probably installed.
 	GUESS=$UNAME_MACHINE-pc-os2-emx
 	;;
@@ -1338,7 +1373,7 @@
 		GUESS=ns32k-sni-sysv
 	fi
 	;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+    PENTIUM:*:4.0*:*)	# Unisys 'ClearPath HMP IX 4000' SVR4/MP effort
 			# says <Richard.M.Bartel@ccMail.Census.GOV>
 	GUESS=i586-unisys-sysv4
 	;;
@@ -1560,6 +1595,9 @@
     *:Unleashed:*:*)
 	GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
 	;;
+    *:Ironclad:*:*)
+	GUESS=$UNAME_MACHINE-unknown-ironclad
+	;;
 esac
 
 # Do we have a guess based on uname results?

_service:tar_scm:libidn2-2.3.4.tar.gz/build-aux/config.rpath -> _service:tar_scm:libidn2-2.3.7.tar.gz/build-aux/config.rpath Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/build-aux/config.sub -> _service:tar_scm:libidn2-2.3.7.tar.gz/build-aux/config.sub Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2022 Free Software Foundation, Inc.
+#   Copyright 1992-2024 Free Software Foundation, Inc.
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2022-09-17'
+timestamp='2024-01-01'
 
 # 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
@@ -76,13 +76,13 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2022 Free Software Foundation, Inc.
+Copyright 1992-2024 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 
 help="
-Try \`$me --help' for more information."
+Try '$me --help' for more information."
 
 # Parse command line
 while test $# -gt 0 ; do
@@ -130,7 +130,7 @@
 # Separate into logical components for further validation
 case $1 in
 	*-*-*-*-*)
-		echo Invalid configuration \`"$1"\': more than four components >&2
+		echo "Invalid configuration '$1': more than four components" >&2
 		exit 1
 		;;
 	*-*-*-*)
@@ -145,7 +145,8 @@
 			nto-qnx* | linux-* | uclinux-uclibc* \
 			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
 			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
-			| storm-chaos* | os2-emx* | rtmk-nova* | managarm-*)
+			| storm-chaos* | os2-emx* | rtmk-nova* | managarm-* \
+			| windows-* )
 				basic_machine=$field1
 				basic_os=$maybe_os
 				;;
@@ -943,7 +944,7 @@
 EOF
 		IFS=$saved_IFS
 		;;
-	# We use `pc' rather than `unknown'
+	# We use 'pc' rather than 'unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
 	i*86 | x86_64)
@@ -1075,7 +1076,7 @@
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		cpu=i586
 		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+	pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*)
 		cpu=i686
 		;;
 	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
@@ -1180,7 +1181,7 @@
 		case $cpu in
 			1750a | 580 \
 			| a29k \
-			| aarch64 | aarch64_be \
+			| aarch64 | aarch64_be | aarch64c | arm64ec \
 			| abacus \
 			| alpha | alphaev4-8 | alphaev56 | alphaev678 \
 			| alpha64 | alpha64ev4-8 | alpha64ev56 | alpha64ev678 \
@@ -1199,12 +1200,14 @@
 			| d10v | d30v | dlx | dsp16xx \
 			| e2k | elxsi | epiphany \
 			| f3001 | f700 | fido | fr30 | frv | ft32 | fx80 \
+			| javascript \
 			| h8300 | h8500 \
 			| hppa | hppa1.01 | hppa2.0 | hppa2.0nw | hppa64 \
 			| hexagon \
 			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
 			| ip2k | iq2000 \
 			| k1om \
+			| kvx \
 			| le32 | le64 \
 			| lm32 \
 			| loongarch32 | loongarch64 \
@@ -1213,36 +1216,13 @@
 			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
 			| m88110 | m88k | maxq | mb | mcore | mep | metag \
 			| microblaze | microblazeel \
-			| mips | mipsbe | mipseb | mipsel | mipsle \
-			| mips16 \
-			| mips64 | mips64eb | mips64el \
-			| mips64octeon | mips64octeonel \
-			| mips64orion | mips64orionel \
-			| mips64r5900 | mips64r5900el \
-			| mips64vr | mips64vrel \
-			| mips64vr4100 | mips64vr4100el \
-			| mips64vr4300 | mips64vr4300el \
-			| mips64vr5000 | mips64vr5000el \
-			| mips64vr5900 | mips64vr5900el \
-			| mipsisa32 | mipsisa32el \
-			| mipsisa32r2 | mipsisa32r2el \
-			| mipsisa32r3 | mipsisa32r3el \
-			| mipsisa32r5 | mipsisa32r5el \
-			| mipsisa32r6 | mipsisa32r6el \
-			| mipsisa64 | mipsisa64el \
-			| mipsisa64r2 | mipsisa64r2el \
-			| mipsisa64r3 | mipsisa64r3el \
-			| mipsisa64r5 | mipsisa64r5el \
-			| mipsisa64r6 | mipsisa64r6el \
-			| mipsisa64sb1 | mipsisa64sb1el \
-			| mipsisa64sr71k | mipsisa64sr71kel \
-			| mipsr5900 | mipsr5900el \
-			| mipstx39 | mipstx39el \
+			| mips* \
 			| mmix \
 			| mn10200 | mn10300 \
 			| moxie \
 			| mt \
 			| msp430 \
+			| nanomips* \
 			| nds32 | nds32le | nds32be \
 			| nfp \
 			| nios | nios2 | nios2eb | nios2el \
@@ -1274,6 +1254,7 @@
 			| ubicom32 \
 			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
 			| vax \
+			| vc4 \
 			| visium \
 			| w65 \
 			| wasm32 | wasm64 \
@@ -1285,7 +1266,7 @@
 				;;
 
 			*)
-				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+				echo "Invalid configuration '$1': machine '$cpu-$vendor' not recognized" 1>&2
 				exit 1
 				;;
 		esac
@@ -1306,11 +1287,12 @@
 
 # Decode manufacturer-specific aliases for certain operating systems.
 
-if test x$basic_os != x
+if test x"$basic_os" != x
 then
 
 # First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
 # set os.
+obj=
 case $basic_os in
 	gnu/linux*)
 		kernel=linux
@@ -1510,10 +1492,16 @@
 			os=eabi
 			;;
 		    *)
-			os=elf
+			os=
+			obj=elf
 			;;
 		esac
 		;;
+	aout* | coff* | elf* | pe*)
+		# These are machine code file formats, not OSes
+		obj=$os
+		os=
+		;;
 	*)
 		# No normalization, but not necessarily accepted, that comes below.
 		;;
@@ -1532,12 +1520,15 @@
 # system, and we'll never get to this point.
 
 kernel=
+obj=
 case $cpu-$vendor in
 	score-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	spu-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	*-acorn)
 		os=riscix1.2
@@ -1547,28 +1538,35 @@
 		os=gnu
 		;;
 	arm*-semi)
-		os=aout
+		os=
+		obj=aout
 		;;
 	c4x-* | tic4x-*)
-		os=coff
+		os=
+		obj=coff
 		;;
 	c8051-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	clipper-intergraph)
 		os=clix
 		;;
 	hexagon-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	tic54x-*)
-		os=coff
+		os=
+		obj=coff
 		;;
 	tic55x-*)
-		os=coff
+		os=
+		obj=coff
 		;;
 	tic6x-*)
-		os=coff
+		os=
+		obj=coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1590,19 +1588,24 @@
 		os=sunos3
 		;;
 	m68*-cisco)
-		os=aout
+		os=
+		obj=aout
 		;;
 	mep-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	mips*-cisco)
-		os=elf
+		os=
+		obj=elf
 		;;
-	mips*-*)
-		os=elf
+	mips*-*|nanomips*-*)
+		os=
+		obj=elf
 		;;
 	or32-*)
-		os=coff
+		os=
+		obj=coff
 		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=sysv3
@@ -1611,7 +1614,8 @@
 		os=sunos4.1.1
 		;;
 	pru-*)
-		os=elf
+		os=
+		obj=elf
 		;;
 	*-be)
 		os=beos
@@ -1692,10 +1696,12 @@
 		os=uxpv
 		;;
 	*-rom68k)
-		os=coff
+		os=
+		obj=coff
 		;;
 	*-*bug)
-		os=coff
+		os=
+		obj=coff
 		;;
 	*-apple)
 		os=macos
@@ -1713,10 +1719,11 @@
 
 fi
 
-# Now, validate our (potentially fixed-up) OS.
+# Now, validate our (potentially fixed-up) individual pieces (OS, OBJ).
+
 case $os in
 	# Sometimes we do "kernel-libc", so those need to count as OSes.
-	musl* | newlib* | relibc* | uclibc*)
+	llvm* | musl* | newlib* | relibc* | uclibc*)
 		;;
 	# Likewise for "kernel-abi"
 	eabi* | gnueabi*)
@@ -1724,6 +1731,9 @@
 	# VxWorks passes extra cpu info in the 4th filed.
 	simlinux | simwindows | spe)
 		;;
+	# See `case $cpu-$os` validation below
+	ghcjs)
+		;;
 	# Now accept the basic system types.
 	# The portable systems comes first.
 	# Each alternative MUST end in a * to match a version number.
@@ -1732,7 +1742,7 @@
 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
 	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
 	     | hiux* | abug | nacl* | netware* | windows* \
-	     | os9* | macos* | osx* | ios* \
+	     | os9* | macos* | osx* | ios* | tvos* | watchos* \
 	     | mpw* | magic* | mmixware* | mon960* | lnews* \
 	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
 	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
@@ -1741,11 +1751,11 @@
 	     | mirbsd* | netbsd* | dicos* | openedition* | ose* \
 	     | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
 	     | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
-	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
-	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+	     | bosx* | nextstep* | cxux* | oabi* \
+	     | ptx* | ecoff* | winnt* | domain* | vsta* \
 	     | udi* | lites* | ieee* | go32* | aux* | hcos* \
 	     | chorusrdb* | cegcc* | glidix* | serenity* \
-	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+	     | cygwin* | msys* | moss* | proelf* | rtems* \
 	     | midipix* | mingw32* | mingw64* | mint* \
 	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
 	     | interix* | uwin* | mks* | rhapsody* | darwin* \
@@ -1758,62 +1768,116 @@
 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
 	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
-	     | fiwix* | mlibc* )
+	     | fiwix* | mlibc* | cos* | mbr* | ironclad* )
 		;;
 	# This one is extra strict with allowed versions
 	sco3.2v2 | sco3.2v4-9* | sco5v6*)
 		# Don't forget version if it is 3.2v4 or newer.
 		;;
+	# This refers to builds using the UEFI calling convention
+	# (which depends on the architecture) and PE file format.
+	# Note that this is both a different calling convention and
+	# different file format than that of GNU-EFI
+	# (x86_64-w64-mingw32).
+	uefi)
+		;;
 	none)
 		;;
-	kernel* )
+	kernel* | msvc* )
 		# Restricted further below
 		;;
+	'')
+		if test x"$obj" = x
+		then
+			echo "Invalid configuration '$1': Blank OS only allowed with explicit machine code file format" 1>&2
+		fi
+		;;
 	*)
-		echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
+		echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2
+		exit 1
+		;;
+esac
+
+case $obj in
+	aout* | coff* | elf* | pe*)
+		;;
+	'')
+		# empty is fine
+		;;
+	*)
+		echo "Invalid configuration '$1': Machine code format '$obj' not recognized" 1>&2
+		exit 1
+		;;
+esac
+
+# Here we handle the constraint that a (synthetic) cpu and os are
+# valid only in combination with each other and nowhere else.
+case $cpu-$os in
+	# The "javascript-unknown-ghcjs" triple is used by GHC; we
+	# accept it here in order to tolerate that, but reject any
+	# variations.
+	javascript-ghcjs)
+		;;
+	javascript-* | *-ghcjs)
+		echo "Invalid configuration '$1': cpu '$cpu' is not valid with os '$os$obj'" 1>&2
 		exit 1
 		;;
 esac
 
 # As a final step for OS-related things, validate the OS-kernel combination
 # (given a valid OS), if there is a kernel.
-case $kernel-$os in
-	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
-		   | linux-musl* | linux-relibc* | linux-uclibc* | linux-mlibc* )
+case $kernel-$os-$obj in
+	linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \
+		    | linux-mlibc*- | linux-musl*- | linux-newlib*- \
+		    | linux-relibc*- | linux-uclibc*- )
 		;;
-	uclinux-uclibc* )
+	uclinux-uclibc*- )
 		;;
-	managarm-mlibc* | managarm-kernel* )
+	managarm-mlibc*- | managarm-kernel*- )
 		;;
-	-dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* )
+	windows*-msvc*-)
+		;;
+	-dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -relibc*- \
+		    | -uclibc*- )
 		# These are just libc implementations, not actual OSes, and thus
 		# require a kernel.
-		echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
+		echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2
 		exit 1
 		;;
-	-kernel* )
-		echo "Invalid configuration \`$1': \`$os' needs explicit kernel." 1>&2
+	-kernel*- )
+		echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2
 		exit 1
 		;;
-	*-kernel* )
-		echo "Invalid configuration \`$1': \`$kernel' does not support \`$os'." 1>&2
+	*-kernel*- )
+		echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2
 		exit 1
 		;;
-	kfreebsd*-gnu* | kopensolaris*-gnu*)
+	*-msvc*- )
+		echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2
+		exit 1
 		;;
-	vxworks-simlinux | vxworks-simwindows | vxworks-spe)
+	kfreebsd*-gnu*- | kopensolaris*-gnu*-)
 		;;
-	nto-qnx*)
+	vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-)
 		;;
-	os2-emx)
+	nto-qnx*-)
+		;;
+	os2-emx-)
+		;;
+	*-eabi*- | *-gnueabi*-)
 		;;
-	*-eabi* | *-gnueabi*)
+	none--*)
+		# None (no kernel, i.e. freestanding / bare metal),
+		# can be paired with an machine code file format
 		;;
-	-*)
+	-*-)
 		# Blank kernel with real OS is always fine.
 		;;
-	*-*)
-		echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
+	--*)
+		# Blank kernel and OS with real machine code file format is always fine.
+		;;
+	*-*-*)
+		echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2
 		exit 1
 		;;
 esac
@@ -1896,7 +1960,7 @@
 		;;
 esac
 
-echo "$cpu-$vendor-${kernel:+$kernel-}$os"
+echo "$cpu-$vendor${kernel:+-$kernel}${os:+-$os}${obj:+-$obj}"
 exit
 
 # Local variables:

_service:tar_scm:libidn2-2.3.4.tar.gz/build-aux/depcomp -> _service:tar_scm:libidn2-2.3.7.tar.gz/build-aux/depcomp Changed

@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2023-11-23.18; # UTC
 
-# Copyright (C) 1999-2022 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -47,6 +47,8 @@
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
+GNU Automake home page: <https://www.gnu.org/software/automake/>.
+General help using GNU software: <https://www.gnu.org/gethelp/>.
 EOF
     exit $?
     ;;
@@ -197,8 +199,8 @@
   ;;
 
 gcc)
-## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
-## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## Note that this doesn't just cater to obsolete pre-3.x GCC compilers.
+## but also to in-use compilers like IBM xlc/xlC and the HP C compiler.
 ## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:

_service:tar_scm:libidn2-2.3.4.tar.gz/build-aux/do-release-commit-and-tag -> _service:tar_scm:libidn2-2.3.7.tar.gz/build-aux/do-release-commit-and-tag Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/build-aux/gendocs.sh -> _service:tar_scm:libidn2-2.3.7.tar.gz/build-aux/gendocs.sh Changed

@@ -2,9 +2,9 @@
 # gendocs.sh -- generate a GNU manual in many formats.  This script is
 #   mentioned in maintain.texi.  See the help message below for usage details.
 
-scriptversion=2022-01-01.00
+scriptversion=2024-01-01.00
 
-# Copyright 2003-2022 Free Software Foundation, Inc.
+# Copyright 2003-2024 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@
 scripturl="https://git.savannah.gnu.org/cgit/gnulib.git/plain/build-aux/gendocs.sh"
 templateurl="https://git.savannah.gnu.org/cgit/gnulib.git/plain/doc/gendocs_template"
 
-: "${SETLANG="env LANG= LC_MESSAGES= LC_ALL= LANGUAGE="}"
+: "${SETLANG="env LANG= LC_TIME= LC_MESSAGES= LC_ALL= LANGUAGE="}"
 : "${MAKEINFO="makeinfo"}"
 : "${TEXI2DVI="texi2dvi"}"
 : "${DOCBOOK2HTML="docbook2html"}"
@@ -55,7 +55,7 @@
 MANUAL_TITLE=
 PACKAGE=
 EMAIL=webmasters@gnu.org  # please override with --email
-commonarg= # passed to all makeinfo/texi2html invcations.
+commonarg= # passed to all makeinfo/texi2html invocations.
 dirargs=   # passed to all tools (-I dir).
 dirs=      # -I directories.
 htmlarg="--css-ref=https://www.gnu.org/software/gnulib/manual.css -c TOP_NODE_UP_URL=/manual"
@@ -73,7 +73,7 @@
 
 version="gendocs.sh $scriptversion
 
-Copyright 2022 Free Software Foundation, Inc.
+Copyright 2024 Free Software Foundation, Inc.
 There is NO warranty.  You may redistribute this software
 under the terms of the GNU General Public License.
 For more information about these matters, see the files named COPYING."
@@ -466,11 +466,25 @@
 # &#xc;
 printf "\nMaking index.html for %s...\n" "$PACKAGE"
 if test -z "$use_texi2html"; then
-  CONDS="/%%IF  *HTML_SECTION%%/,/%%ENDIF  *HTML_SECTION%%/d;\
-         /%%IF  *HTML_CHAPTER%%/,/%%ENDIF  *HTML_CHAPTER%%/d"
+  if test x$split = xnode; then
+    CONDS="/%%IF  *HTML_NODE%%/d;/%%ENDIF  *HTML_NODE%%/d;\
+           /%%IF  *HTML_CHAPTER%%/,/%%ENDIF  *HTML_CHAPTER%%/d;\
+           /%%IF  *HTML_SECTION%%/,/%%ENDIF  *HTML_SECTION%%/d;"
+  elif test x$split = xchapter; then
+    CONDS="/%%IF  *HTML_CHAPTER%%/d;/%%ENDIF  *HTML_CHAPTER%%/d;\
+           /%%IF  *HTML_SECTION%%/,/%%ENDIF  *HTML_SECTION%%/d;\
+           /%%IF  *HTML_NODE%%/,/%%ENDIF  *HTML_NODE%%/d;"
+  elif test x$split = xsection; then
+    CONDS="/%%IF  *HTML_SECTION%%/d;/%%ENDIF  *HTML_SECTION%%/d;\
+           /%%IF  *HTML_CHAPTER%%/,/%%ENDIF  *HTML_CHAPTER%%/d;\
+           /%%IF  *HTML_NODE%%/,/%%ENDIF  *HTML_NODE%%/d;"
+  else
+    CONDS="/%%IF.*%%/d;/%%ENDIF.*%%/d;" # invalid split argument
+  fi
 else
-  # should take account of --split here.
-  CONDS="/%%ENDIF.*%%/d;/%%IF  *HTML_SECTION%%/d;/%%IF  *HTML_CHAPTER%%/d"
+  # for texi2html, we do not take account of --split and simply output
+  # all variants
+  CONDS="/%%IF.*%%/d;/%%ENDIF.*%%/d;"
 fi
 
 curdate=`$SETLANG date '+%B %d, %Y'`

_service:tar_scm:libidn2-2.3.4.tar.gz/build-aux/git-version-gen -> _service:tar_scm:libidn2-2.3.7.tar.gz/build-aux/git-version-gen Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/build-aux/gitlog-to-changelog -> _service:tar_scm:libidn2-2.3.7.tar.gz/build-aux/gitlog-to-changelog Changed

@@ -3,7 +3,7 @@
 
 # Convert git log output to ChangeLog format.
 
-# Copyright (C) 2008-2022 Free Software Foundation, Inc.
+# Copyright (C) 2008-2024 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #
 # Written by Jim Meyering
 
-# This is a prologue that allows to run a perl script as an executable
+# This is a prologue that allows running a perl script as an executable
 # on systems that are compliant to a POSIX version before POSIX:2017.
 # On such systems, the usual invocation of an executable through execlp()
 # or execvp() fails with ENOEXEC if it is a script that does not start
@@ -35,7 +35,7 @@
 eval 'exec perl -wSx "$0" "$@"'
      if 0;
 
-my $VERSION = '2022-01-27 18:49'; # UTC
+my $VERSION = '2023-06-24 21:59'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -355,7 +355,7 @@
           . "(expected date/author/email):\n$author_line\n";
 
       # Format 'Copyright-paperwork-exempt: Yes' as a standard ChangeLog
-      # `(tiny change)' annotation.
+      # '(tiny change)' annotation.
       my $tiny = (grep (/^(?:Copyright-paperwork-exempt|Tiny-change):\s+Yyes$/, @line)
                   ? '  (tiny change)' : '');

_service:tar_scm:libidn2-2.3.4.tar.gz/build-aux/gnu-web-doc-update -> _service:tar_scm:libidn2-2.3.7.tar.gz/build-aux/gnu-web-doc-update Changed

@@ -1,10 +1,10 @@
 #!/bin/sh
 # Run this after each non-alpha release, to update the web documentation at
-# https://www.gnu.org/software/libidn/libidn2/manual/
+# https://www.gnu.org/software/$pkg/manual/
 
-VERSION=2022-01-27.18; # UTC
+VERSION=2023-09-11.20; # UTC
 
-# Copyright (C) 2009-2022 Free Software Foundation, Inc.
+# Copyright (C) 2009-2024 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
 
 Run this script from top_srcdir (no arguments) after each non-alpha
 release, to update the web documentation at
-https://www.gnu.org/software/libidn/libidn2/manual/
+https://www.gnu.org/software/\$pkg/manual/
 
 This script assumes you're using git for revision control, and
 requires a .prev-version file as well as a Makefile, from which it
@@ -139,6 +139,7 @@
 
 prev=.prev-version
 version=$(cat $prev) || die "no $prev file?"
+pkg=libidn/libidn2
 tmp_branch=web-doc-$version-$$
 current_branch=$($GIT branch | sed -ne '/^\* /{s///;p;q;}')
 
@@ -151,8 +152,8 @@
   $GIT branch -d $tmp_branch
   exit $__st
 }
-trap cleanup 0
-trap 'exit $?' 1 2 13 15
+trap cleanup EXIT
+trap 'exit $?' HUP INT PIPE TERM
 
 # We must build using sources for which --version reports the
 # just-released version number, not some string like 7.6.18-20761.
@@ -173,11 +174,14 @@
 
 tmp=$(mktemp -d web-doc-update.XXXXXX) || exit 1
 ( cd $tmp \
-    && $CVS -d $cvs_user@cvs.sv.gnu.org:/webcvs/libidn co libidn )
-$RSYNC -avP "$builddir"/doc/manual/ $tmp/libidn/libidn2/manual
+    && $CVS -d $cvs_user@cvs.savannah.gnu.org:/webcvs/libidn co libidn )
+$RSYNC -avP "$builddir"/doc/manual/ $tmp/$pkg/manual
 
 (
-  cd $tmp/libidn/libidn2/manual
+  cd $tmp/$pkg
+  test -d manual/CVS || $dryrun $CVS add -ko manual
+
+  cd manual
 
   # Add all the files.  This is simpler than trying to add only the
   # new ones because of new directories

_service:tar_scm:libidn2-2.3.4.tar.gz/build-aux/gnupload -> _service:tar_scm:libidn2-2.3.7.tar.gz/build-aux/gnupload Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/build-aux/install-sh -> _service:tar_scm:libidn2-2.3.7.tar.gz/build-aux/install-sh Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/build-aux/ltmain.sh -> _service:tar_scm:libidn2-2.3.7.tar.gz/build-aux/ltmain.sh Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/build-aux/mdate-sh -> _service:tar_scm:libidn2-2.3.7.tar.gz/build-aux/mdate-sh Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/build-aux/texinfo.tex -> _service:tar_scm:libidn2-2.3.7.tar.gz/build-aux/texinfo.tex Changed

@@ -3,9 +3,9 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2022-10-01.15}
+\def\texinfoversion{2023-09-19.19}
 %
-% Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
+% Copyright 1985, 1986, 1988, 1990-2023 Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software: you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
@@ -58,12 +58,6 @@
 
 \message{Loading texinfo version \texinfoversion:}
 
-% If in a .fmt file, print the version number
-% and turn on active characters that we couldn't do earlier because
-% they might have appeared in the input file name.
-\everyjob{\message{Texinfo version \texinfoversion}%
-  \catcode`+=\active \catcode`\_=\active}
-
 % LaTeX's \typeout.  This ensures that the messages it is used for
 % are identical in format to the corresponding ones from latex/pdflatex.
 \def\typeout{\immediate\write17}%
@@ -281,8 +275,7 @@
 % \topmark doesn't work for the very first chapter (after the title
 % page or the contents), so we use \firstmark there -- this gets us
 % the mark with the chapter defs, unless the user sneaks in, e.g.,
-% @setcolor (or @url, or @link, etc.) between @contents and the very
-% first @chapter.
+% @setcolor (or @url etc.) between @contents and the very first @chapter.
 \def\gettopheadingmarks{%
   \ifcase0\the\savedtopmark\fi
   \ifx\thischapter\empty \ifcase0\firstmark\fi \fi
@@ -433,42 +426,21 @@
 }
 
 % First remove any @comment, then any @c comment.  Pass the result on to
-% \argcheckspaces.
+% \argremovespace.
 \def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm}
-\def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm}
-
-% Each occurrence of `\^^M' or `<space>\^^M' is replaced by a single space.
-%
-% \argremovec might leave us with trailing space, e.g.,
+\def\argremovec#1\c#2\ArgTerm{\argremovespace#1$ $\ArgTerm}
+% \argremovec might leave us with trailing space, though; e.g.,
 %    @end itemize  @c foo
-% This space token undergoes the same procedure and is eventually removed
-% by \finishparsearg.
-%
-\def\argcheckspaces#1\^^M{\argcheckspacesX#1\^^M \^^M}
-\def\argcheckspacesX#1 \^^M{\argcheckspacesY#1\^^M}
-\def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{%
-  \def\temp{#3}%
-  \ifx\temp\empty
-    % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp:
-    \let\temp\finishparsearg
-  \else
-    \let\temp\argcheckspaces
-  \fi
-  % Put the space token in:
-  \temp#1 #3\ArgTerm
-}
+% Note that the argument cannot contain the TeX $, as its catcode is
+% changed to \other when Texinfo source is read.
+\def\argremovespace#1 $#2\ArgTerm{\finishparsearg#1$\ArgTerm}
 
 % If a _delimited_ argument is enclosed in braces, they get stripped; so
 % to get _exactly_ the rest of the line, we had to prevent such situation.
-% We prepended an \empty token at the very beginning and we expand it now,
-% just before passing the control to \argtorun.
-% (Similarly, we have to think about #3 of \argcheckspacesY above: it is
-% either the null string, or it ends with \^^M---thus there is no danger
-% that a pair of braces would be stripped.
-%
-% But first, we have to remove the trailing space token.
-%
-\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}}
+% We prepended an \empty token at the very beginning and we expand it
+% just before passing the control to \next.
+% (But first, we have to remove the remaining $ or two.)
+\def\finishparsearg#1$#2\ArgTerm{\expandafter\argtorun\expandafter{#1}}
 
 
 % \parseargdef - define a command taking an argument on the line
@@ -530,7 +502,7 @@
 
 % ... but they get defined via ``\envdef\foo{...}'':
 \long\def\envdef#1#2{\def#1{\startenvironment#1#2}}
-\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}}
+\long\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}}
 
 % Check whether we're in the right environment:
 \def\checkenv#1{%
@@ -591,6 +563,9 @@
 % @/ allows a line break.
 \let\/=\allowbreak
 
+% @- allows explicit insertion of hyphenation points
+\def\-{\discretionary{\normaldash}{}{}}%
+
 % @. is an end-of-sentence period.
 \def\.{.\spacefactor=\endofsentencespacefactor\space}
 
@@ -1105,27 +1080,33 @@
 
 % Output page labels information.
 % See PDF reference v.1.7 p.594, section 8.3.1.
+% Page label ranges must be increasing.
 \ifpdf
 \def\pagelabels{%
   \def\title{0 << /P (T-) /S /D >>}%
-  \edef\roman{\the\romancount << /S /r >>}%
-  \edef\arabic{\the\arabiccount << /S /D >>}%
-  %
-  % Page label ranges must be increasing.  Remove any duplicates.
-  % (There is a slight chance of this being wrong if e.g. there is
-  % a @contents but no @titlepage, etc.)
-  %
-  \ifnum\romancount=0 \def\roman{}\fi
-  \ifnum\arabiccount=0 \def\title{}%
-  \else
-    \ifnum\romancount=\arabiccount \def\roman{}\fi
-  \fi
   %
-  \ifnum\romancount<\arabiccount
-    \pdfcatalog{/PageLabels << /Nums \title \roman \arabic  >> }\relax
-  \else
-    \pdfcatalog{/PageLabels << /Nums \title \arabic \roman  >> }\relax
-  \fi
+  % support @contents at very end of document
+  \ifnum\contentsendcount=\pagecount
+    \ifnum\arabiccount<\romancount
+      \pdfcatalog{/PageLabels << /Nums
+                  \title
+                   \the\arabiccount << /S /D >>
+                   \the\romancount << /S /r >>
+                   >> }\relax
+    \fi
+  % no contents in document
+  \else\ifnum\contentsendcount=0
+    \pdfcatalog{/PageLabels << /Nums
+                \title
+                 \the\arabiccount << /S /D >>
+                 >> }\relax
+  \else
+    \pdfcatalog{/PageLabels << /Nums
+                \title
+                 \the\romancount << /S /r >>
+                 \the\contentsendcount << /S /D >>
+                 >> }\relax
+  \fi\fi
 }
 \else
   \let\pagelabels\relax
@@ -1134,6 +1115,8 @@
 \newcount\pagecount \pagecount=0
 \newcount\romancount \romancount=0
 \newcount\arabiccount \arabiccount=0
+\newcount\contentsendcount \contentsendcount=0
+
 \ifpdf
   \let\ptxadvancepageno\advancepageno
   \def\advancepageno{%
@@ -1197,13 +1180,17 @@
   %
   % Set color, and create a mark which defines \thiscolor accordingly,
   % so that \makeheadline knows which color to restore.
+  \def\curcolor{0 0 0}%
   \def\setcolor#1{%
-    \xdef\currentcolordefs{\gdef\noexpand\thiscolor{#1}}%
-    \domark
-    \pdfsetcolor{#1}%
+    \ifx#1\curcolor\else
+      \xdef\currentcolordefs{\gdef\noexpand\thiscolor{#1}}%
+      \domark
+      \pdfsetcolor{#1}%
+      \xdef\curcolor{#1}%
+    \fi
   }
   %
-  \def\maincolor{\rgbBlack}
+  \let\maincolor\rgbBlack
   \pdfsetcolor{\maincolor}
   \edef\thiscolor{\maincolor}
   \def\currentcolordefs{}
@@ -1359,7 +1346,7 @@
   %
   % by default, use black for everything.
   \def\urlcolor{\rgbBlack}
-  \def\linkcolor{\rgbBlack}
+  \let\linkcolor\rgbBlack
   \def\endlink{\setcolor{\maincolor}\pdfendlink}
   %
   % Adding outlines to PDF; macros for calculating structure of outlines
@@ -1537,9 +1524,10 @@
     \next}
   \def\makelink{\addtokens{\toksB}%
     {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0}
-  \def\pdflink#1{%
+  \def\pdflink#1{\pdflinkpage{#1}{#1}}%
+  \def\pdflinkpage#1#2{%
     \startlink attr{/Border 0 0 0} goto name{\pdfmkpgn{#1}}
-    \setcolor{\linkcolor}#1\endlink}
+    \setcolor{\linkcolor}#2\endlink}
   \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
 \else
   % non-pdf mode
@@ -1786,10 +1774,11 @@
     \next}
   \def\makelink{\addtokens{\toksB}%
     {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0}
-  \def\pdflink#1{%
+  \def\pdflink#1{\pdflinkpage{#1}{#1}}%
+  \def\pdflinkpage#1#2{%
     \special{pdf:bann << /Border 0 0 0
       /Type /Annot /Subtype /Link /A << /S /GoTo /D (#1) >> >>}%
-    \setcolor{\linkcolor}#1\endlink}
+    \setcolor{\linkcolor}#2\endlink}
   \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
 %
   %
@@ -2134,6 +2123,11 @@
     \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
   }%
 \fi\fi
+%
+% This is what gets called when #5 of \setfont is empty.
+\let\cmap\gobble
+%
+% (end of cmaps)
 
 
 % Set the font macro #1 to the font named \fontprefix#2.
@@ -2149,11 +2143,10 @@
 \def\setfont#1#2#3#4#5{%
   \font#1=\fontprefix#2#3 scaled #4
   \csname cmap#5\endcsname#1%
+  \ifx#2\ttshape\hyphenchar#1=-1 \fi
+  \ifx#2\ttbshape\hyphenchar#1=-1 \fi
+  \ifx#2\ttslshape\hyphenchar#1=-1 \fi
 }
-% This is what gets called when #5 of \setfont is empty.
-\let\cmap\gobble
-%
-% (end of cmaps)
 
 % Use cm as the default font prefix.
 % To specify the font prefix, you must define \fontprefix
@@ -2674,26 +2667,23 @@
 \gdef\setcodequotes{\let`\codequoteleft \let'\codequoteright}
 \gdef\setregularquotes{\let`\lq \let'\rq}
 }
+\setregularquotes
 
-% Allow an option to not use regular directed right quote/apostrophe
-% (char 0x27), but instead the undirected quote from cmtt (char 0x0d).
-% The undirected quote is ugly, so don't make it the default, but it
-% works for pasting with more pdf viewers (at least evince), the
-% lilypond developers report.  xpdf does work with the regular 0x27.
+% output for ' in @code
+% in tt font hex 0D (undirected) or 27 (curly right quote)
 %
 \def\codequoteright{%
   \ifusingtt
       {\ifflagclear{txicodequoteundirected}%
           {\ifflagclear{codequoteundirected}%
               {'}%
-              {\char'15 }}%
-          {\char'15 }}%
+              {\char"0D }}%
+          {\char"0D }}%
       {'}%
 }
 
-% and a similar option for the left quote char vs. a grave accent.
-% Modern fonts display ASCII 0x60 as a grave accent, so some people like
-% the code environments to do likewise.
+% output for ` in @code
+% in tt font hex 12 (grave accent) or 60 (curly left quote)
 % \relax disables Spanish ligatures ?` and !` of \tt font.
 %
 \def\codequoteleft{%
@@ -2701,8 +2691,8 @@
       {\ifflagclear{txicodequotebacktick}%
           {\ifflagclear{codequotebacktick}%
               {\relax`}%
-              {\char'22 }}%
-          {\char'22 }}%
+              {\char"12 }}%
+          {\char"12 }}%
       {\relax`}%
 }
 
@@ -2721,7 +2711,7 @@
     \errmessage{Unknown @codequoteundirected value `\temp', must be on|off}%
   \fi\fi
 }
-%
+
 \parseargdef\codequotebacktick{%
   \def\temp{#1}%
   \ifx\temp\onword
@@ -2736,6 +2726,11 @@
   \fi\fi
 }
 
+% Turn them on by default
+\let\SETtxicodequoteundirected = t
+\let\SETtxicodequotebacktick = t
+
+
 % Knuth pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font.
 \def\noligaturesquoteleft{\relax\lq}
 
@@ -2815,13 +2810,6 @@
 % @sansserif, explicit sans.
 \def\sansserif#1{{\sf #1}}
 
-% We can't just use \exhyphenpenalty, because that only has effect at
-% the end of a paragraph.  Restore normal hyphenation at the end of the
-% group within which \nohyphenation is presumably called.
-%
-\def\nohyphenation{\hyphenchar\font = -1  \aftergroup\restorehyphenation}
-\def\restorehyphenation{\hyphenchar\font = `- }
-
 \newif\iffrenchspacing
 \frenchspacingfalse
 
@@ -2890,27 +2878,29 @@
     % Switch to typewriter.
     \tt
     %
-    % But `\ ' produces the large typewriter interword space.
+    % `\ ' produces the large typewriter interword space.
     \def\ {{\spaceskip = 0pt{} }}%
     %
-    % Turn off hyphenation.
-    \nohyphenation
-    %
     \plainfrenchspacing
     #1%
   }%
   \null % reset spacefactor to 1000
 }
 
-% We *must* turn on hyphenation at `-' and `_' in @code.
-% (But see \codedashfinish below.)
+% This is for LuaTeX: It is not sufficient to disable hyphenation at
+% explicit dashes by setting `\hyphenchar` to -1.
+\def\dashnobreak{%
+  \normaldash
+  \penalty 10000 }
+
+% We must turn on hyphenation at `-' and `_' in @code.
 % Otherwise, it is too hard to avoid overfull hboxes
 % in the Emacs manual, the Library manual, etc.
+% We explicitly allow hyphenation at these characters
+% using \discretionary.
 %
-% Unfortunately, TeX uses one parameter (\hyphenchar) to control
-% both hyphenation at - and hyphenation within words.
-% We must therefore turn them both off (\tclose does that)
-% and arrange explicitly to hyphenate at a dash. -- rms.
+% Hyphenation at - and hyphenation within words was turned off
+% by default for the tt fonts using the \hyphenchar parameter of TeX.
 {
   \catcode`\-=\active \catcode`\_=\active
   \catcode`\'=\active \catcode`\`=\active
@@ -2923,13 +2913,9 @@
      \let-\codedash
      \let_\codeunder
     \else
-     \let-\normaldash
+     \let-\dashnobreak
      \let_\realunder
     \fi
-    % Given -foo (with a single dash), we do not want to allow a break
-    % after the hyphen.
-    \global\let\codedashprev=\codedash
-    %
     \codex
   }
   %
@@ -2939,21 +2925,30 @@
     %
     % Now, output a discretionary to allow a line break, unless
     % (a) the next character is a -, or
-    % (b) the preceding character is a -.
+    % (b) the preceding character is a -, or
+    % (c) we are at the start of the string.
+    % In both cases (b) and (c), \codedashnobreak should be set to \codedash.
+    %
     % E.g., given --posix, we do not want to allow a break after either -.
     % Given --foo-bar, we do want to allow a break between the - and the b.
     \ifx\next\codedash \else
-      \ifx\codedashprev\codedash
+      \ifx\codedashnobreak\codedash
       \else \discretionary{}{}{}\fi
     \fi
     % we need the space after the = for the case when \next itself is a
     % space token; it would get swallowed otherwise.  As in @code{- a}.
-    \global\let\codedashprev= \next
+    \global\let\codedashnobreak= \next
   }
 }
 \def\normaldash{-}
 %
-\def\codex #1{\tclose{#1}\endgroup}
+\def\codex #1{\tclose{%
+  % Given -foo (with a single dash), we do not want to allow a break
+  % after the -.  \codedashnobreak is set to the first character in
+  % @code.
+  \futurelet\codedashnobreak\relax
+  #1%
+}\endgroup}
 
 \def\codeunder{%
   % this is all so @math{@code{var_name}+1} can work.  In math mode, _
@@ -3200,7 +3195,7 @@
 
 % definition of @key with no lozenge.
 %
-\def\key#1{{\setregularquotes \nohyphenation \tt #1}\null}
+\def\key#1{{\setregularquotes \tt #1}\null}
 
 % @clicksequence{File @click{} Open ...}
 \def\clicksequence#1{\begingroup #1\endgroup}
@@ -3691,7 +3686,10 @@
 
 % @textdegree - the normal degrees sign.
 %
-\def\textdegree{$^\circ$}
+\def\textdegree{%
+   \ifmmode ^\circ
+   \else {\tcfont \char 176}%
+   \fi}
 
 % Laurent Siebenmann reports \Orb undefined with:
 %  Textures 1.7.7 (preloaded format=plain 93.10.14)  (68K)  16 APR 2004 02:38
@@ -3737,13 +3735,14 @@
               want the contents after the title page.}}%
 
 \parseargdef\shorttitlepage{%
-  \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}%
-  \endgroup\page\hbox{}\page}
+  {\headingsoff \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}%
+  \endgroup\page\hbox{}\page}\pageone}
 
 \envdef\titlepage{%
   % Open one extra group, as we want to close it in the middle of \Etitlepage.
   \begingroup
     \parindent=0pt \textfonts
+    \headingsoff
     % Leave some space at the very top of the page.
     \vglue\titlepagetopglue
     % No rule at page bottom unless we print one at the top with @title.
@@ -3771,11 +3770,9 @@
     % If we use the new definition of \page, we always get a blank page
     % after the title page, which we certainly don't want.
     \oldpage
+    \pageone
   \endgroup
   %
-  % Need this before the \...aftertitlepage checks so that if they are
-  % in effect the toc pages will come out with page numbers.
-  \HEADINGSon
 }
 
 \def\finishtitlepage{%
@@ -3944,35 +3941,24 @@
 }
 
 \def\HEADINGSoff{{\globaldefs=1 \headingsoff}} % global setting
-\HEADINGSoff  % it's the default
 
-% When we turn headings on, set the page number to 1.
+% Set the page number to 1.
 \def\pageone{
   \global\pageno=1
   \global\arabiccount = \pagecount
 }
 
+\let\contentsalignmacro = \chappager
+
+% \def\HEADINGSon{\HEADINGSdouble} % defined by \CHAPPAGon
+
 % For double-sided printing, put current file name in lower left corner,
 % chapter name on inside top of right hand pages, document
 % title on inside top of left hand pages, and page numbers on outside top
 % edge of all pages.
-\def\HEADINGSdouble{%
-\pageone
-\HEADINGSdoublex
-}
-\let\contentsalignmacro = \chappager
-
-% For single-sided printing, chapter title goes across top left of page,
-% page number on top right.
-\def\HEADINGSsingle{%
-\pageone
-\HEADINGSsinglex
-}
-\def\HEADINGSon{\HEADINGSdouble}
-
-\def\HEADINGSafter{\let\HEADINGShook=\HEADINGSdoublex}
+\def\HEADINGSafter{\let\HEADINGShook=\HEADINGSdouble}
 \let\HEADINGSdoubleafter=\HEADINGSafter
-\def\HEADINGSdoublex{%
+\def\HEADINGSdouble{%
 \global\evenfootline={\hfil}
 \global\oddfootline={\hfil}
 \global\evenheadline={\line{\folio\hfil\thistitle}}
@@ -3982,8 +3968,10 @@
 \global\let\contentsalignmacro = \chapoddpage
 }
 
-\def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsinglex}
-\def\HEADINGSsinglex{%
+% For single-sided printing, chapter title goes across top left of page,
+% page number on top right.
+\def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsingle}
+\def\HEADINGSsingle{%
 \global\evenfootline={\hfil}
 \global\oddfootline={\hfil}
 \global\evenheadline={\line{\thischapter\hfil\folio}}
@@ -3995,7 +3983,6 @@
 
 % for @setchapternewpage off
 \def\HEADINGSsinglechapoff{%
-\pageone
 \global\evenfootline={\hfil}
 \global\oddfootline={\hfil}
 \global\evenheadline={\line{\thischapter\hfil\folio}}
@@ -4721,13 +4708,11 @@
 % except not \outer, so it can be used within macros and \if's.
 \edef\newwrite{\makecsname{ptexnewwrite}}
 
-% \newindex {foo} defines an index named IX.
+% \newindex {IX} defines an index named IX.
 % It automatically defines \IXindex such that
 % \IXindex ...rest of line... puts an entry in the index IX.
 % It also defines \IXindfile to be the number of the output channel for
 % the file that accumulates this index.  The file's extension is IX.
-% The name of an index should be no more than 2 characters long
-% for the sake of vms.
 %
 \def\newindex#1{%
   \expandafter\chardef\csname#1indfile\endcsname=0
@@ -4790,21 +4775,6 @@
 \def\docodeindexxxx #1{\docind{\indexname}{#1}}
 
 
-% Used for the aux, toc and index files to prevent expansion of Texinfo
-% commands.
-%
-\def\atdummies{%
-  \definedummyletter\@%
-  \definedummyletter\ %
-  \definedummyletter\{%
-  \definedummyletter\}%
-  \definedummyletter\&%
-  %
-  % Do the redefinitions.
-  \definedummies
-  \otherbackslash
-}
-
 % \definedummyword defines \#1 as \string\#1\space, thus effectively
 % preventing its expansion.  This is used only for control words,
 % not control letters, because the \space would be incorrect for
@@ -4820,110 +4790,91 @@
 %
 \def\definedummyword  #1{\def#1{\string#1\space}}%
 \def\definedummyletter#1{\def#1{\string#1}}%
-\let\definedummyaccent\definedummyletter
 
-% Called from \atdummies to prevent the expansion of commands.
+% Used for the aux, toc and index files to prevent expansion of Texinfo
+% commands.  Most of the commands are controlled through the
+% \ifdummies conditional.
 %
-\def\definedummies{%
+\def\atdummies{%
+  \dummiestrue
   %
-  \let\commondummyword\definedummyword
-  \let\commondummyletter\definedummyletter
-  \let\commondummyaccent\definedummyaccent
-  \commondummiesnofonts
+  \definedummyletter\@%
+  \definedummyletter\ %
+  \definedummyletter\{%
+  \definedummyletter\}%
+  \definedummyletter\&%
   %
   \definedummyletter\_%
   \definedummyletter\-%
   %
-  % Non-English letters.
-  \definedummyword\AA
-  \definedummyword\AE
-  \definedummyword\DH
-  \definedummyword\L
-  \definedummyword\O
-  \definedummyword\OE
-  \definedummyword\TH
-  \definedummyword\aa
-  \definedummyword\ae
-  \definedummyword\dh
-  \definedummyword\exclamdown
-  \definedummyword\l
-  \definedummyword\o
-  \definedummyword\oe
-  \definedummyword\ordf
-  \definedummyword\ordm
-  \definedummyword\questiondown
-  \definedummyword\ss
-  \definedummyword\th
-  %
-  % Although these internal commands shouldn't show up, sometimes they do.
-  \definedummyword\bf
-  \definedummyword\gtr
-  \definedummyword\hat
-  \definedummyword\less
-  \definedummyword\sf
-  \definedummyword\sl
-  \definedummyword\tclose
-  \definedummyword\tt
-  %
-  \definedummyword\LaTeX
-  \definedummyword\TeX
-  %
-  % Assorted special characters.
-  \definedummyword\ampchar
-  \definedummyword\atchar
-  \definedummyword\arrow
-  \definedummyword\backslashchar
-  \definedummyword\bullet
-  \definedummyword\comma
-  \definedummyword\copyright
-  \definedummyword\registeredsymbol
-  \definedummyword\dots
-  \definedummyword\enddots
-  \definedummyword\entrybreak
-  \definedummyword\equiv
-  \definedummyword\error
-  \definedummyword\euro
-  \definedummyword\expansion
-  \definedummyword\geq
-  \definedummyword\guillemetleft
-  \definedummyword\guillemetright
-  \definedummyword\guilsinglleft
-  \definedummyword\guilsinglright
-  \definedummyword\lbracechar
-  \definedummyword\leq
-  \definedummyword\mathopsup
-  \definedummyword\minus
-  \definedummyword\ogonek
-  \definedummyword\pounds
-  \definedummyword\point
-  \definedummyword\print
-  \definedummyword\quotedblbase
-  \definedummyword\quotedblleft
-  \definedummyword\quotedblright
-  \definedummyword\quoteleft
-  \definedummyword\quoteright
-  \definedummyword\quotesinglbase
-  \definedummyword\rbracechar
-  \definedummyword\result
-  \definedummyword\sub
-  \definedummyword\sup
-  \definedummyword\textdegree
-  %
   \definedummyword\subentry
   %
   % We want to disable all macros so that they are not expanded by \write.
+  \let\commondummyword\definedummyword
   \macrolist
   \let\value\dummyvalue
   %
-  \normalturnoffactive
+  \turnoffactive
 }
 
-% \commondummiesnofonts: common to \definedummies and \indexnofonts.
-% Define \commondummyletter, \commondummyaccent and \commondummyword before
-% using.  Used for accents, font commands, and various control letters.
-%
-\def\commondummiesnofonts{%
-  % Control letters and accents.
+\newif\ifdummies
+\newif\ifindexnofonts
+
+\def\commondummyletter#1{%
+  \expandafter\let\csname\string#1:impl\endcsname#1%
+  \edef#1{%
+    \noexpand\ifindexnofonts
+      % empty expansion
+    \noexpand\else
+      \noexpand\ifdummies\string#1%
+      \noexpand\else
+        \noexpand\jumptwofi % dispose of the \fi
+        \expandafter\noexpand\csname\string#1:impl\endcsname
+      \noexpand\fi
+    \noexpand\fi}%
+}
+
+\def\commondummyaccent#1{%
+  \expandafter\let\csname\string#1:impl\endcsname#1%
+  \edef#1{%
+    \noexpand\ifindexnofonts
+      \noexpand\expandafter % dispose of \else ... \fi
+      \noexpand\asis
+    \noexpand\else
+      \noexpand\ifdummies\string#1%
+      \noexpand\else
+        \noexpand\jumptwofi % dispose of the \fi
+        \expandafter\noexpand\csname\string#1:impl\endcsname
+      \noexpand\fi
+    \noexpand\fi}%
+}
+
+% Like \commondummyaccent but add a \space at the end of the dummy expansion
+% #2 is the expansion used for \indexnofonts.  #2 is always followed by
+% \asis to remove a pair of following braces.
+\def\commondummyword#1#2{%
+  \expandafter\let\csname\string#1:impl\endcsname#1%
+  \expandafter\def\csname\string#1:ixnf\endcsname{#2\asis}%
+  \edef#1{%
+    \noexpand\ifindexnofonts
+      \noexpand\expandafter % dispose of \else ... \fi
+      \expandafter\noexpand\csname\string#1:ixnf\endcsname
+    \noexpand\else
+      \noexpand\ifdummies\string#1\space
+      \noexpand\else
+        \noexpand\jumptwofi % dispose of the \fi \fi
+        \expandafter\noexpand\csname\string#1:impl\endcsname
+      \noexpand\fi
+    \noexpand\fi}%
+}
+\def\jumptwofi#1\fi\fi{\fi\fi#1}
+
+% For \atdummies and \indexnofonts.  \atdummies sets
+% \dummiestrue and \indexnofonts sets \indexnofontstrue.
+\def\definedummies{
+  % @-sign is always an escape character when reading auxiliary files
+  \escapechar = `\@
+  %
   \commondummyletter\!%
   \commondummyaccent\"%
   \commondummyaccent\'%
@@ -4937,58 +4888,124 @@
   \commondummyaccent\^%
   \commondummyaccent\`%
   \commondummyaccent\~%
-  \commondummyword\u
-  \commondummyword\v
-  \commondummyword\H
-  \commondummyword\dotaccent
-  \commondummyword\ogonek
-  \commondummyword\ringaccent
-  \commondummyword\tieaccent
-  \commondummyword\ubaraccent
-  \commondummyword\udotaccent
-  \commondummyword\dotless
+  %
+  % Control letters and accents.
+  \commondummyword\u          {}%
+  \commondummyword\v          {}%
+  \commondummyword\H          {}%
+  \commondummyword\dotaccent  {}%
+  \commondummyword\ogonek     {}%
+  \commondummyword\ringaccent {}%
+  \commondummyword\tieaccent  {}%
+  \commondummyword\ubaraccent {}%
+  \commondummyword\udotaccent {}%
+  \commondummyword\dotless    {}%
   %
   % Texinfo font commands.
-  \commondummyword\b
-  \commondummyword\i
-  \commondummyword\r
-  \commondummyword\sansserif
-  \commondummyword\sc
-  \commondummyword\slanted
-  \commondummyword\t
+  \commondummyword\b          {}%
+  \commondummyword\i          {}%
+  \commondummyword\r          {}%
+  \commondummyword\sansserif  {}%
+  \commondummyword\sc         {}%
+  \commondummyword\slanted    {}%
+  \commondummyword\t          {}%
   %
   % Commands that take arguments.
-  \commondummyword\abbr
-  \commondummyword\acronym
-  \commondummyword\anchor
-  \commondummyword\cite
-  \commondummyword\code
-  \commondummyword\command
-  \commondummyword\dfn
-  \commondummyword\dmn
-  \commondummyword\email
-  \commondummyword\emph
-  \commondummyword\env
-  \commondummyword\file
-  \commondummyword\image
-  \commondummyword\indicateurl
-  \commondummyword\inforef
-  \commondummyword\kbd
-  \commondummyword\key
-  \commondummyword\math
-  \commondummyword\option
-  \commondummyword\pxref
-  \commondummyword\ref
-  \commondummyword\samp
-  \commondummyword\strong
-  \commondummyword\tie
-  \commondummyword\U
-  \commondummyword\uref
-  \commondummyword\url
-  \commondummyword\var
-  \commondummyword\verb
-  \commondummyword\w
-  \commondummyword\xref
+  \commondummyword\abbr       {}%
+  \commondummyword\acronym    {}%
+  \commondummyword\anchor     {}%
+  \commondummyword\cite       {}%
+  \commondummyword\code       {}%
+  \commondummyword\command    {}%
+  \commondummyword\dfn        {}%
+  \commondummyword\dmn        {}%
+  \commondummyword\email      {}%
+  \commondummyword\emph       {}%
+  \commondummyword\env        {}%
+  \commondummyword\file       {}%
+  \commondummyword\image      {}%
+  \commondummyword\indicateurl{}%
+  \commondummyword\inforef    {}%
+  \commondummyword\kbd        {}%
+  \commondummyword\key        {}%
+  \commondummyword\link       {}%
+  \commondummyword\math       {}%
+  \commondummyword\option     {}%
+  \commondummyword\pxref      {}%
+  \commondummyword\ref        {}%
+  \commondummyword\samp       {}%
+  \commondummyword\strong     {}%
+  \commondummyword\tie        {}%
+  \commondummyword\U          {}%
+  \commondummyword\uref       {}%
+  \commondummyword\url        {}%
+  \commondummyword\var        {}%
+  \commondummyword\verb       {}%
+  \commondummyword\w          {}%
+  \commondummyword\xref       {}%
+  %
+  \commondummyword\AA               {AA}%
+  \commondummyword\AE               {AE}%
+  \commondummyword\DH               {DZZ}%
+  \commondummyword\L                {L}%
+  \commondummyword\O                {O}%
+  \commondummyword\OE               {OE}%
+  \commondummyword\TH               {TH}%
+  \commondummyword\aa               {aa}%
+  \commondummyword\ae               {ae}%
+  \commondummyword\dh               {dzz}%
+  \commondummyword\exclamdown       {!}%
+  \commondummyword\l                {l}%
+  \commondummyword\o                {o}%
+  \commondummyword\oe               {oe}%
+  \commondummyword\ordf             {a}%
+  \commondummyword\ordm             {o}%
+  \commondummyword\questiondown     {?}%
+  \commondummyword\ss               {ss}%
+  \commondummyword\th               {th}%
+  %
+  \commondummyword\LaTeX            {LaTeX}%
+  \commondummyword\TeX              {TeX}%
+  %
+  % Assorted special characters.
+  \commondummyword\ampchar          {\normalamp}%
+  \commondummyword\atchar           {\@}%
+  \commondummyword\arrow            {->}%
+  \commondummyword\backslashchar    {\realbackslash}%
+  \commondummyword\bullet           {bullet}%
+  \commondummyword\comma            {,}%
+  \commondummyword\copyright        {copyright}%
+  \commondummyword\dots             {...}%
+  \commondummyword\enddots          {...}%
+  \commondummyword\entrybreak       {}%
+  \commondummyword\equiv            {===}%
+  \commondummyword\error            {error}%
+  \commondummyword\euro             {euro}%
+  \commondummyword\expansion        {==>}%
+  \commondummyword\geq              {>=}%
+  \commondummyword\guillemetleft    {<<}%
+  \commondummyword\guillemetright   {>>}%
+  \commondummyword\guilsinglleft    {<}%
+  \commondummyword\guilsinglright   {>}%
+  \commondummyword\lbracechar       {\{}%
+  \commondummyword\leq              {<=}%
+  \commondummyword\mathopsup        {sup}%
+  \commondummyword\minus            {-}%
+  \commondummyword\pounds           {pounds}%
+  \commondummyword\point            {.}%
+  \commondummyword\print            {-|}%
+  \commondummyword\quotedblbase     {"}%
+  \commondummyword\quotedblleft     {"}%
+  \commondummyword\quotedblright    {"}%
+  \commondummyword\quoteleft        {`}%
+  \commondummyword\quoteright       {'}%
+  \commondummyword\quotesinglbase   {,}%
+  \commondummyword\rbracechar       {\}}%
+  \commondummyword\registeredsymbol {R}%
+  \commondummyword\result           {=>}%
+  \commondummyword\sub              {}%
+  \commondummyword\sup              {}%
+  \commondummyword\textdegree       {o}%
 }
 
 \let\indexlbrace\relax
@@ -5039,18 +5056,7 @@
 % would be for a given command (usually its argument).
 %
 \def\indexnofonts{%
-  % Accent commands should become @asis.
-  \def\commondummyaccent##1{\let##1\asis}%
-  % We can just ignore other control letters.
-  \def\commondummyletter##1{\let##1\empty}%
-  % All control words become @asis by default; overrides below.
-  \let\commondummyword\commondummyaccent
-  \commondummiesnofonts
-  %
-  % Don't no-op \tt, since it isn't a user-level command
-  % and is used in the definitions of the active chars like <, >, |, etc.
-  % Likewise with the other plain tex font commands.
-  %\let\tt=\asis
+  \indexnofontstrue
   %
   \def\ { }%
   \def\@{@}%
@@ -5062,84 +5068,19 @@
   \let\lbracechar\{%
   \let\rbracechar\}%
   %
-  % Non-English letters.
-  \def\AA{AA}%
-  \def\AE{AE}%
-  \def\DH{DZZ}%
-  \def\L{L}%
-  \def\OE{OE}%
-  \def\O{O}%
-  \def\TH{TH}%
-  \def\aa{aa}%
-  \def\ae{ae}%
-  \def\dh{dzz}%
-  \def\exclamdown{!}%
-  \def\l{l}%
-  \def\oe{oe}%
-  \def\ordf{a}%
-  \def\ordm{o}%
-  \def\o{o}%
-  \def\questiondown{?}%
-  \def\ss{ss}%
-  \def\th{th}%
-  %
-  \let\do\indexnofontsdef
-  %
-  \do\LaTeX{LaTeX}%
-  \do\TeX{TeX}%
-  %
-  % Assorted special characters.
-  \do\atchar{@}%
-  \do\arrow{->}%
-  \do\bullet{bullet}%
-  \do\comma{,}%
-  \do\copyright{copyright}%
-  \do\dots{...}%
-  \do\enddots{...}%
-  \do\equiv{==}%
-  \do\error{error}%
-  \do\euro{euro}%
-  \do\expansion{==>}%
-  \do\geq{>=}%
-  \do\guillemetleft{<<}%
-  \do\guillemetright{>>}%
-  \do\guilsinglleft{<}%
-  \do\guilsinglright{>}%
-  \do\leq{<=}%
-  \do\lbracechar{\{}%
-  \do\minus{-}%
-  \do\point{.}%
-  \do\pounds{pounds}%
-  \do\print{-|}%
-  \do\quotedblbase{"}%
-  \do\quotedblleft{"}%
-  \do\quotedblright{"}%
-  \do\quoteleft{`}%
-  \do\quoteright{'}%
-  \do\quotesinglbase{,}%
-  \do\rbracechar{\}}%
-  \do\registeredsymbol{R}%
-  \do\result{=>}%
-  \do\textdegree{o}%
   %
   % We need to get rid of all macros, leaving only the arguments (if present).
   % Of course this is not nearly correct, but it is the best we can do for now.
-  % makeinfo does not expand macros in the argument to @deffn, which ends up
-  % writing an index entry, and texindex isn't prepared for an index sort entry
-  % that starts with \.
   %
   % Since macro invocations are followed by braces, we can just redefine them
   % to take a single TeX argument.  The case of a macro invocation that
   % goes to end-of-line is not handled.
   %
+  \def\commondummyword##1{\let##1\asis}%
   \macrolist
   \let\value\indexnofontsvalue
 }
 
-% Give the control sequence a definition that removes the {} that follows
-% its use, e.g. @AA{} -> AA
-\def\indexnofontsdef#1#2{\def#1##1{#2}}%
-
 
 
 
@@ -5270,7 +5211,10 @@
         \xdef\trimmed{\segment}%
         \xdef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}%
         \xdef\indexsortkey{\trimmed}%
-        \ifx\indexsortkey\empty\xdef\indexsortkey{ }\fi
+        \ifx\indexsortkey\empty
+          \message{Empty index sort key near line \the\inputlineno}%
+          \xdef\indexsortkey{ }%
+        \fi
       }\fi
       %
       % Append to \fullindexsortkey.
@@ -5610,6 +5554,16 @@
 \newdimen\entryrightmargin
 \entryrightmargin=0pt
 
+% amount to indent subsequent lines in an entry when it spans more than
+% one line.
+\newdimen\entrycontskip
+\entrycontskip=1em
+
+% for PDF output, whether to make the text of the entry a link to the page
+% number.  set for @contents and @shortcontents where there is only one
+% page number.
+\newif\iflinkentrytext
+
 % \entry typesets a paragraph consisting of the text (#1), dot leaders, and
 % then page number (#2) flushed to the right margin.  It is used for index
 % and table of contents entries.  The paragraph is indented by \leftskip.
@@ -5636,7 +5590,7 @@
 }
 \def\entrybreak{\unskip\space\ignorespaces}%
 \def\doentry{%
-    % Save the text of the entry
+    % Save the text of the entry in \boxA
     \global\setbox\boxA=\hbox\bgroup
     \bgroup % Instead of the swallowed brace.
       \noindent
@@ -5646,12 +5600,21 @@
       % with catcodes occurring.
 }
 {\catcode`\@=11
+% #1 is the page number
 \gdef\finishentry#1{%
-    \egroup % end box A
+    \egroup % end \boxA
     \dimen@ = \wd\boxA % Length of text of entry
+    % add any leaders and page number to \boxA.
     \global\setbox\boxA=\hbox\bgroup
-      \unhbox\boxA
-      % #1 is the page number.
+      \ifpdforxetex
+        \iflinkentrytext
+          \pdflinkpage{#1}{\unhbox\boxA}%
+        \else
+          \unhbox\boxA
+        \fi
+      \else
+        \unhbox\boxA
+      \fi
       %
       % Get the width of the page numbers, and only use
       % leaders if they are present.
@@ -5670,6 +5633,8 @@
         \fi
       \fi
     \egroup % end \boxA
+    %
+    % now output
     \ifdim\wd\boxB = 0pt
       \noindent\unhbox\boxA\par
       \nobreak
@@ -5687,41 +5652,17 @@
       \parfillskip=0pt plus -1fill
       %
       \advance\rightskip by \entryrightmargin
-      % Determine how far we can stretch into the margin.
-      % This allows, e.g., "Appendix H  GNU Free Documentation License" to
-      % fit on one line in @letterpaper format.
-      \ifdim\entryrightmargin>2.1em
-        \dimen@i=2.1em
-      \else
-        \dimen@i=0em
-      \fi
-      \advance \parfillskip by 0pt minus 1\dimen@i
       %
       \dimen@ii = \hsize
       \advance\dimen@ii by -1\leftskip
       \advance\dimen@ii by -1\entryrightmargin
-      \advance\dimen@ii by 1\dimen@i
       \ifdim\wd\boxA > \dimen@ii % If the entry doesn't fit in one line
       \ifdim\dimen@ > 0.8\dimen@ii   % due to long index text
-        % Try to split the text roughly evenly.  \dimen@ will be the length of
-        % the first line.
-        \dimen@ = 0.7\dimen@
-        \dimen@ii = \hsize
-        \ifnum\dimen@>\dimen@ii
-          % If the entry is too long (for example, if it needs more than
-          % two lines), use all the space in the first line.
-          \dimen@ = \dimen@ii
-        \fi
         \advance\leftskip by 0pt plus 1fill % ragged right
-        \advance \dimen@ by 1\rightskip
-        \parshape = 2 0pt \dimen@ 0em \dimen@ii
-        % Ideally we'd add a finite glue at the end of the first line only,
-        % instead of using \parshape with explicit line lengths, but TeX
-        % doesn't seem to provide a way to do such a thing.
         %
         % Indent all lines but the first one.
-        \advance\leftskip by 1em
-        \advance\parindent by -1em
+        \advance\leftskip by \entrycontskip
+        \advance\parindent by -\entrycontskip
       \fi\fi
       \indent % start paragraph
       \unhbox\boxA
@@ -5744,12 +5685,11 @@
 \newskip\thinshrinkable
 \skip\thinshrinkable=.15em minus .15em
 
-% Like plain.tex's \dotfill, except uses up at least 1 em.
+% Like plain.tex's \dotfill, except uses up at least 0.5 em.
 % The filll stretch here overpowers both the fil and fill stretch to push
 % the page number to the right.
 \def\indexdotfill{\cleaders
-  \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1filll}
-
+  \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 0.5em plus 1filll}
 
 \def\primary #1{\line{#1\hfil}}
 
@@ -5802,7 +5742,7 @@
   % below is chosen so that the gutter has the same value (well, +-<1pt)
   % as it did when we hard-coded it.
   %
-  % We put the result in a separate register, \doublecolumhsize, so we
+  % We put the result in a separate register, \doublecolumnhsize, so we
   % can restore it in \pagesofar, after \hsize itself has (potentially)
   % been clobbered.
   %
@@ -6369,7 +6309,7 @@
   \fi
 }
 
-\parseargdef\setchapternewpage{\csname CHAPPAG#1\endcsname}
+\parseargdef\setchapternewpage{\csname CHAPPAG#1\endcsname\HEADINGSon}
 
 \def\CHAPPAGoff{%
 \global\let\contentsalignmacro = \chappager
@@ -6386,7 +6326,7 @@
 \global\let\pchapsepmacro=\chapoddpage
 \global\def\HEADINGSon{\HEADINGSdouble}}
 
-\CHAPPAGon
+\setchapternewpage on
 
 % \chapmacro - Chapter opening.
 %
@@ -6399,6 +6339,16 @@
 \def\Yappendixkeyword{Yappendix}
 \def\Yomitfromtockeyword{Yomitfromtoc}
 %
+%
+% Definitions for @thischapter. These can be overridden in translation
+% files.
+\def\thischapterAppendix{%
+  \putwordAppendix{} \thischapternum: \thischaptername}
+
+\def\thischapterChapter{%
+  \putwordChapter{} \thischapternum: \thischaptername}
+%
+%
 \def\chapmacro#1#2#3{%
   \expandafter\ifx\thisenv\titlepage\else
     \checkenv{}% chapters, etc., should not start inside an environment.
@@ -6421,22 +6371,14 @@
     \xdef\currentchapterdefs{%
       \gdef\noexpand\thischaptername{\the\toks0}%
       \gdef\noexpand\thischapternum{\appendixletter}%
-      % \noexpand\putwordAppendix avoids expanding indigestible
-      % commands in some of the translations.
-      \gdef\noexpand\thischapter{\noexpand\putwordAppendix{}
-                                 \noexpand\thischapternum:
-                                 \noexpand\thischaptername}%
+      \let\noexpand\thischapter\noexpand\thischapterAppendix
     }%
   \else
     \toks0={#1}%
     \xdef\currentchapterdefs{%
       \gdef\noexpand\thischaptername{\the\toks0}%
       \gdef\noexpand\thischapternum{\the\chapno}%
-      % \noexpand\putwordChapter avoids expanding indigestible
-      % commands in some of the translations.
-      \gdef\noexpand\thischapter{\noexpand\putwordChapter{}
-                                 \noexpand\thischapternum:
-                                 \noexpand\thischaptername}%
+      \let\noexpand\thischapter\noexpand\thischapterChapter
     }%
   \fi\fi\fi
   %
@@ -6522,6 +6464,12 @@
 \def\subsubsecheadingskip{\subsecheadingskip}
 \def\subsubsecheadingbreak{\subsecheadingbreak}
 
+% Definition for @thissection. This can be overridden in translation
+% files.
+\def\thissectionDef{%
+  \putwordSection{} \thissectionnum: \thissectionname}
+%
+
 
 % Print any size, any type, section title.
 %
@@ -6563,11 +6511,7 @@
         \xdef\currentsectiondefs{%
           \gdef\noexpand\thissectionname{\the\toks0}%
           \gdef\noexpand\thissectionnum{#4}%
-          % \noexpand\putwordSection avoids expanding indigestible
-          % commands in some of the translations.
-          \gdef\noexpand\thissection{\noexpand\putwordSection{}
-                                     \noexpand\thissectionnum:
-                                     \noexpand\thissectionname}%
+          \let\noexpand\thissection\noexpand\thissectionDef
         }%
       \fi
     \else
@@ -6576,11 +6520,7 @@
         \xdef\currentsectiondefs{%
           \gdef\noexpand\thissectionname{\the\toks0}%
           \gdef\noexpand\thissectionnum{#4}%
-          % \noexpand\putwordSection avoids expanding indigestible
-          % commands in some of the translations.
-          \gdef\noexpand\thissection{\noexpand\putwordSection{}
-                                     \noexpand\thissectionnum:
-                                     \noexpand\thissectionname}%
+          \let\noexpand\thissection\noexpand\thissectionDef
         }%
       \fi
     \fi\fi\fi
@@ -6740,6 +6680,82 @@
   \input \tocreadfilename
 }
 
+% process toc file to find the maximum width of the section numbers for
+% each chapter
+\def\findsecnowidths{%
+  \begingroup
+  \setupdatafile
+  \activecatcodes
+  \secentryfonts
+  % Redefinitions
+  \def\numchapentry##1##2##3##4{%
+    \def\curchapname{secnowidth-##2}%
+    \curchapmax=0pt
+  }%
+  \let\appentry\numchapentry
+  %
+  \def\numsecentry##1##2##3##4{%
+    \def\cursecname{secnowidth-##2}%
+    \cursecmax=0pt
+    %
+    \setbox0=\hbox{##2}%
+    \ifdim\wd0>\curchapmax
+      \curchapmax=\wd0
+      \expandafter\xdef\csname\curchapname\endcsname{\the\wd0}%
+    \fi
+  }%
+  \let\appsecentry\numsecentry
+  %
+  \def\numsubsecentry##1##2##3##4{%
+    \def\curssecname{secnowidth-##2}%
+    \curssecmax=0pt
+    %
+    \setbox0=\hbox{##2}%
+    \ifdim\wd0>\cursecmax
+      \cursecmax=\wd0
+      \expandafter\xdef\csname\cursecname\endcsname{\the\wd0}%
+    \fi
+  }%
+  \let\appsubsecentry\numsubsecentry
+  %
+  \def\numsubsubsecentry##1##2##3##4{%
+    \setbox0=\hbox{##2}%
+    \ifdim\wd0>\curssecmax
+      \curssecmax=\wd0
+      \expandafter\xdef\csname\curssecname\endcsname{\the\wd0}%
+    \fi
+  }%
+  \let\appsubsubsecentry\numsubsubsecentry
+  %
+  % Discard any output by outputting to dummy vbox, in case the toc file
+  % contains macros that we have not redefined above.
+  \setbox\dummybox\vbox\bgroup
+    \input \tocreadfilename\relax
+  \egroup
+  \endgroup
+}
+\newdimen\curchapmax
+\newdimen\cursecmax
+\newdimen\curssecmax
+
+
+% set #1 to the maximum section width for #2
+\def\retrievesecnowidth#1#2{%
+  \expandafter\let\expandafter\savedsecnowidth \csname secnowidth-#2\endcsname
+  \ifx\savedsecnowidth\relax
+    #1=0pt
+  \else
+    #1=\savedsecnowidth
+  \fi
+}
+\newdimen\secnowidthchap
+\secnowidthchap=0pt
+\newdimen\secnowidthsec
+\secnowidthsec=0pt
+\newdimen\secnowidthssec
+\secnowidthssec=0pt
+
+
 \newskip\contentsrightmargin \contentsrightmargin=1in
 \newcount\savepageno
 \newcount\lastnegativepageno \lastnegativepageno = -1
@@ -6766,6 +6782,7 @@
     \def\thistitle{}% no title in double-sided headings
     % Record where the Roman numerals started.
     \ifnum\romancount=0 \global\romancount=\pagecount \fi
+    \linkentrytexttrue
 }
 
 % \raggedbottom in plain.tex hardcodes \topskip so override it
@@ -6784,6 +6801,7 @@
   \startcontents{\putwordTOC}%
     \openin 1 \tocreadfilename\space
     \ifeof 1 \else
+      \findsecnowidths
       \readtocfile
     \fi
     \vfill \eject
@@ -6811,6 +6829,7 @@
     \rm
     \hyphenpenalty = 10000
     \advance\baselineskip by 1pt % Open it up a little.
+    \extrasecnoskip=0.4pt
     \def\numsecentry##1##2##3##4{}
     \let\appsecentry = \numsecentry
     \let\unnsecentry = \numsecentry
@@ -6835,12 +6854,8 @@
 % Get ready to use Arabic numerals again
 \def\contentsendroman{%
   \lastnegativepageno = \pageno
-  \global\pageno = \savepageno
-  %
-  % If \romancount > \arabiccount, the contents are at the end of the
-  % document.  Otherwise, advance where the Arabic numerals start for
-  % the page numbers.
-  \ifnum\romancount>\arabiccount\else\global\arabiccount=\pagecount\fi
+  \global\pageno=1
+  \contentsendcount = \pagecount
 }
 
 % Typeset the label for a chapter or appendix for the short contents.
@@ -6850,8 +6865,6 @@
   % This space should be enough, since a single number is .5em, and the
   % widest letter (M) is 1em, at least in the Computer Modern fonts.
   % But use \hss just in case.
-  % (This space doesn't include the extra space that gets added after
-  % the label; that gets put in by \shortchapentry above.)
   %
   % We'd like to right-justify chapter numbers, but that looks strange
   % with appendix letters.  And right-justifying numbers and
@@ -6861,10 +6874,15 @@
   \hbox to 1em{#1\hss}%
 }
 
-% These macros generate individual entries in the table of contents.
-% The first argument is the chapter or section name.
-% The last argument is the page number.
-% The arguments in between are the chapter number, section number, ...
+% These macros generate individual entries in the table of contents,
+% and are read in from the *.toc file.
+%
+% The arguments are like:
+% \def\numchapentry#1#2#3#4
+%   #1 - the chapter or section name.
+%   #2 - section number
+%   #3 - level of section (e.g "chap", "sec")
+%   #4 - page number
 
 % Parts, in the main contents.  Replace the part number, which doesn't
 % exist, with an empty box.  Let's hope all the numbers have the same width.
@@ -6877,7 +6895,7 @@
   \vskip 0pt plus 5\baselineskip
   \penalty-300
   \vskip 0pt plus -5\baselineskip
-  \dochapentry{\numeralbox\labelspace#1}{}%
+  \dochapentry{#1}{\numeralbox}{}%
 }
 %
 % Parts, in the short toc.
@@ -6888,12 +6906,14 @@
 }
 
 % Chapters, in the main contents.
-\def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}}
+\def\numchapentry#1#2#3#4{%
+  \retrievesecnowidth\secnowidthchap{#2}%
+  \dochapentry{#1}{#2}{#4}%
+}
 
 % Chapters, in the short toc.
-% See comments in \dochapentry re vbox and related settings.
 \def\shortchapentry#1#2#3#4{%
-  \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#4\egroup}%
+  \tocentry{#1}{\shortchaplabel{#2}}{#4}%
 }
 
 % Appendices, in the main contents.
@@ -6904,70 +6924,111 @@
   \setbox0 = \hbox{\putwordAppendix{} M}%
   \hbox to \wd0{\putwordAppendix{} #1\hss}}
 %
-\def\appentry#1#2#3#4{\dochapentry{\appendixbox{#2}\hskip.7em#1}{#4}}
+\def\appentry#1#2#3#4{%
+  \retrievesecnowidth\secnowidthchap{#2}%
+  \dochapentry{\appendixbox{#2}\hskip.7em#1}{}{#4}%
+}
 
 % Unnumbered chapters.
-\def\unnchapentry#1#2#3#4{\dochapentry{#1}{#4}}
-\def\shortunnchapentry#1#2#3#4{\tocentry{#1}{\doshortpageno\bgroup#4\egroup}}
+\def\unnchapentry#1#2#3#4{\dochapentry{#1}{}{#4}}
+\def\shortunnchapentry#1#2#3#4{\tocentry{#1}{}{#4}}
 
 % Sections.
-\def\numsecentry#1#2#3#4{\dosecentry{#2\labelspace#1}{#4}}
+\def\numsecentry#1#2#3#4{\dosecentry{#1}{#2}{#4}}
+
+\def\numsecentry#1#2#3#4{%
+  \retrievesecnowidth\secnowidthsec{#2}%
+  \dosecentry{#1}{#2}{#4}%
+}
 \let\appsecentry=\numsecentry
-\def\unnsecentry#1#2#3#4{\dosecentry{#1}{#4}}
+\def\unnsecentry#1#2#3#4{%
+  \retrievesecnowidth\secnowidthsec{#2}%
+  \dosecentry{#1}{}{#4}%
+}
 
 % Subsections.
-\def\numsubsecentry#1#2#3#4{\dosubsecentry{#2\labelspace#1}{#4}}
+\def\numsubsecentry#1#2#3#4{%
+  \retrievesecnowidth\secnowidthssec{#2}%
+  \dosubsecentry{#1}{#2}{#4}%
+}
 \let\appsubsecentry=\numsubsecentry
-\def\unnsubsecentry#1#2#3#4{\dosubsecentry{#1}{#4}}
+\def\unnsubsecentry#1#2#3#4{%
+  \retrievesecnowidth\secnowidthssec{#2}%
+  \dosubsecentry{#1}{}{#4}%
+}
 
 % And subsubsections.
-\def\numsubsubsecentry#1#2#3#4{\dosubsubsecentry{#2\labelspace#1}{#4}}
+\def\numsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{#2}{#4}}
 \let\appsubsubsecentry=\numsubsubsecentry
-\def\unnsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{#4}}
+\def\unnsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{}{#4}}
 
 % This parameter controls the indentation of the various levels.
 % Same as \defaultparindent.
 \newdimen\tocindent \tocindent = 15pt
 
-% Now for the actual typesetting. In all these, #1 is the text and #2 is the
-% page number.
+% Now for the actual typesetting. In all these, #1 is the text, #2 is
+% a section number if present, and #3 is the page number.
 %
 % If the toc has to be broken over pages, we want it to be at chapters
 % if at all possible; hence the \penalty.
-\def\dochapentry#1#2{%
+\def\dochapentry#1#2#3{%
    \penalty-300 \vskip1\baselineskip plus.33\baselineskip minus.25\baselineskip
    \begingroup
      % Move the page numbers slightly to the right
      \advance\entryrightmargin by -0.05em
      \chapentryfonts
-     \tocentry{#1}{\dopageno\bgroup#2\egroup}%
+     \extrasecnoskip=0.4em % separate chapter number more
+     \tocentry{#1}{#2}{#3}%
    \endgroup
    \nobreak\vskip .25\baselineskip plus.1\baselineskip
 }
 
-\def\dosecentry#1#2{\begingroup
+\def\dosecentry#1#2#3{\begingroup
+  \secnowidth=\secnowidthchap
   \secentryfonts \leftskip=\tocindent
-  \tocentry{#1}{\dopageno\bgroup#2\egroup}%
+  \tocentry{#1}{#2}{#3}%
 \endgroup}
 
-\def\dosubsecentry#1#2{\begingroup
+\def\dosubsecentry#1#2#3{\begingroup
+  \secnowidth=\secnowidthsec
   \subsecentryfonts \leftskip=2\tocindent
-  \tocentry{#1}{\dopageno\bgroup#2\egroup}%
+  \tocentry{#1}{#2}{#3}%
 \endgroup}
 
-\def\dosubsubsecentry#1#2{\begingroup
+\def\dosubsubsecentry#1#2#3{\begingroup
+  \secnowidth=\secnowidthssec
   \subsubsecentryfonts \leftskip=3\tocindent
-  \tocentry{#1}{\dopageno\bgroup#2\egroup}%
+  \tocentry{#1}{#2}{#3}%
 \endgroup}
 
-% We use the same \entry macro as for the index entries.
-\let\tocentry = \entry
-
-% Space between chapter (or whatever) number and the title.
-\def\labelspace{\hskip1em \relax}
-
-\def\dopageno#1{{\rm #1}}
-\def\doshortpageno#1{{\rm #1}}
+% Used for the maximum width of a section number so we can align
+% section titles.
+\newdimen\secnowidth
+\secnowidth=0pt
+\newdimen\extrasecnoskip
+\extrasecnoskip=0pt
+
+% \tocentry{TITLE}{SEC NO}{PAGE}
+%
+\def\tocentry#1#2#3{%
+  \def\secno{#2}%
+  \ifx\empty\secno
+    \entry{#1}{#3}%
+  \else
+    \ifdim 0pt=\secnowidth
+      \setbox0=\hbox{#2\hskip\labelspace\hskip\extrasecnoskip}%
+    \else
+      \advance\secnowidth by \labelspace
+      \advance\secnowidth by \extrasecnoskip
+      \setbox0=\hbox to \secnowidth{%
+        #2\hskip\labelspace\hskip\extrasecnoskip\hfill}%
+    \fi
+    \entrycontskip=\wd0
+    \entry{\box0 #1}{#3}%
+  \fi
+}
+\newdimen\labelspace
+\labelspace=0.6em
 
 \def\chapentryfonts{\secfonts \rm}
 \def\secentryfonts{\textfonts}
@@ -7113,19 +7174,25 @@
 \newdimen\cartouter\newdimen\cartinner
 \newskip\normbskip\newskip\normpskip\newskip\normlskip
 
-
-\envdef\cartouche{%
+\envparseargdef\cartouche{%
   \cartouchefontdefs
   \ifhmode\par\fi  % can't be in the midst of a paragraph.
   \startsavinginserts
   \lskip=\leftskip \rskip=\rightskip
   \leftskip=0pt\rightskip=0pt % we want these *outside*.
+  %
+  % Set paragraph width for text inside cartouche.  There are
+  % left and right margins of 3pt each plus two vrules 0.4pt each.
   \cartinner=\hsize \advance\cartinner by-\lskip
   \advance\cartinner by-\rskip
+  \advance\cartinner by -6.8pt
+  %
+  % For drawing top and bottom of cartouche.  Each corner char
+  % adds 6pt and we take off the width of a rule to line up with the
+  % right boundary perfectly.
   \cartouter=\hsize
-  \advance\cartouter by 18.4pt	% allow for 3pt kerns on either
-				% side, and for 6pt waste from
-				% each corner char, and rule thickness
+  \advance\cartouter by 11.6pt
+  %
   \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
   %
   % If this cartouche directly follows a sectioning command, we need the
@@ -7137,16 +7204,19 @@
       \baselineskip=0pt\parskip=0pt\lineskip=0pt
       \carttop
       \hbox\bgroup
-	  \hskip\lskip
-	  \vrule\kern3pt
-	  \vbox\bgroup
-	      \kern3pt
-	      \hsize=\cartinner
-	      \baselineskip=\normbskip
-	      \lineskip=\normlskip
-	      \parskip=\normpskip
-	      \vskip -\parskip
-	      \comment % For explanation, see the end of def\group.
+          \hskip\lskip
+          \vrule\kern3pt
+          \vbox\bgroup
+              \hsize=\cartinner
+              \baselineskip=\normbskip
+              \lineskip=\normlskip
+              \parskip=\normpskip
+              \def\arg{#1}%
+              \ifx\arg\empty\else
+                \centerV{\hfil \bf #1 \hfil}%
+              \fi
+              \kern3pt
+              \vskip -\parskip
 }
 \def\Ecartouche{%
               \ifhmode\par\fi
@@ -7397,8 +7467,9 @@
 \endgroup
 %
 \def\setupverb{%
-  \tt  % easiest (and conventionally used) font for verbatim
+  \tt
   \def\par{\leavevmode\endgraf}%
+  \parindent = 0pt
   \setcodequotes
   \tabeightspaces
   % Respect line breaks,
@@ -7574,32 +7645,19 @@
   \exdentamount=\defbodyindent
 }
 
-\def\dodefunx#1{%
-  % First, check whether we are in the right environment:
-  \checkenv#1%
-  %
-  % As above, allow line break if we have multiple x headers in a row.
-  % It's not a great place, though.
-  \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi
-  %
-  % And now, it's time to reuse the body of the original defun:
-  \expandafter\gobbledefun#1%
-}
-\def\gobbledefun#1\startdefun{}
-
-% \printdefunline \deffnheader{text}
+% Called as \printdefunline \deffooheader{text}
 %
 \def\printdefunline#1#2{%
   \begingroup
     \plainfrenchspacing
-    % call \deffnheader:
+    % call \deffooheader:
     #1#2 \endheader
     % common ending:
     \interlinepenalty = 10000
     \advance\rightskip by 0pt plus 1fil\relax
     \endgraf
     \nobreak\vskip -\parskip
-    \penalty\defunpenalty  % signal to \startdefun and \dodefunx
+    \penalty\defunpenalty  % signal to \startdefun and \deffoox
     % Some of the @defun-type tags do not enable magic parentheses,
     % rendering the following check redundant.  But we don't optimize.
     \checkparencounts
@@ -7608,7 +7666,29 @@
 
 \def\Edefun{\endgraf\medbreak}
 
-% \makedefun{deffoo}{ (definition of \deffooheader) }
+% @defblock, @defline do not automatically create index entries
+\envdef\defblock{%
+  \startdefun
+}
+\let\Edefblock\Edefun
+
+\def\defline{%
+  \doingtypefnfalse
+  \parseargusing\activeparens{\printdefunline\deflineheader}%
+}
+\def\deflineheader#1 #2 #3\endheader{%
+  \printdefname{#1}{}{#2}\magicamp\defunargs{#3\unskip}%
+}
+
+\def\deftypeline{%
+  \doingtypefntrue
+  \parseargusing\activeparens{\printdefunline\deftypelineheader}%
+}
+\def\deftypelineheader#1 #2 #3 #4\endheader{%
+  \printdefname{#1}{#2}{#3}\magicamp\defunargs{#4\unskip}%
+}
+
+% \makedefun{deffoo} (\deffooheader parameters) { (\deffooheader expansion) }
 %
 % Define \deffoo, \deffoox  \Edeffoo and \deffooheader.
 \def\makedefun#1{%
@@ -7623,8 +7703,18 @@
     \doingtypefnfalse    % distinguish typed functions from all else
     \parseargusing\activeparens{\printdefunline#3}%
   }%
-  \def#2{\dodefunx#1}%
-  \def#3%
+  \def#2{%
+    % First, check whether we are in the right environment:
+    \checkenv#1%
+    %
+    % As in \startdefun, allow line break if we have multiple x headers
+    % in a row.  It's not a great place, though.
+    \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi
+    %
+    \doingtypefnfalse    % distinguish typed functions from all else
+    \parseargusing\activeparens{\printdefunline#3}%
+  }%
+  \def#3% definition of \deffooheader follows
 }
 
 \newif\ifdoingtypefn       % doing typed function?
@@ -7654,14 +7744,14 @@
 % @deffn category name args
 \makedefun{deffn}#1 #2 #3\endheader{%
   \doind{fn}{\code{#2}}%
-  \defname{#1}{}{#2}\magicamp\defunargs{#3\unskip}%
+  \printdefname{#1}{}{#2}\magicamp\defunargs{#3\unskip}%
 }
 
 % @defop category class name args
 \makedefun{defop}#1 {\defopheaderx{#1\ \putwordon}}
 \def\defopheaderx#1#2 #3 #4\endheader{%
   \doind{fn}{\code{#3}\space\putwordon\ \code{#2}}%
-  \defname{#1\ \code{#2}}{}{#3}\magicamp\defunargs{#4\unskip}%
+  \printdefname{#1\ \code{#2}}{}{#3}\magicamp\defunargs{#4\unskip}%
 }
 
 % Typed functions:
@@ -7670,7 +7760,7 @@
 \makedefun{deftypefn}#1 #2 #3 #4\endheader{%
   \doind{fn}{\code{#3}}%
   \doingtypefntrue
-  \defname{#1}{#2}{#3}\defunargs{#4\unskip}%
+  \printdefname{#1}{#2}{#3}\defunargs{#4\unskip}%
 }
 
 % @deftypeop category class type name args
@@ -7678,7 +7768,7 @@
 \def\deftypeopheaderx#1#2 #3 #4 #5\endheader{%
   \doind{fn}{\code{#4}\space\putwordon\ \code{#1\ \code{#2}}}%
   \doingtypefntrue
-  \defname{#1\ \code{#2}}{#3}{#4}\defunargs{#5\unskip}%
+  \printdefname{#1\ \code{#2}}{#3}{#4}\defunargs{#5\unskip}%
 }
 
 % Typed variables:
@@ -7686,14 +7776,14 @@
 % @deftypevr category type var args
 \makedefun{deftypevr}#1 #2 #3 #4\endheader{%
   \doind{vr}{\code{#3}}%
-  \defname{#1}{#2}{#3}\defunargs{#4\unskip}%
+  \printdefname{#1}{#2}{#3}\defunargs{#4\unskip}%
 }
 
 % @deftypecv category class type var args
 \makedefun{deftypecv}#1 {\deftypecvheaderx{#1\ \putwordof}}
 \def\deftypecvheaderx#1#2 #3 #4 #5\endheader{%
   \doind{vr}{\code{#4}\space\putwordof\ \code{#2}}%
-  \defname{#1\ \code{#2}}{#3}{#4}\defunargs{#5\unskip}%
+  \printdefname{#1\ \code{#2}}{#3}{#4}\defunargs{#5\unskip}%
 }
 
 % Untyped variables:
@@ -7710,7 +7800,7 @@
 % @deftp category name args
 \makedefun{deftp}#1 #2 #3\endheader{%
   \doind{tp}{\code{#2}}%
-  \defname{#1}{}{#2}\defunargs{#3\unskip}%
+  \printdefname{#1}{}{#2}\defunargs{#3\unskip}%
 }
 
 % Remaining @defun-like shortcuts:
@@ -7726,14 +7816,14 @@
 \makedefun{defivar}{\defcvheaderx\putwordInstanceVariableof}
 \makedefun{deftypeivar}{\deftypecvheaderx\putwordInstanceVariableof}
 
-% \defname, which formats the name of the @def (not the args).
+% \printdefname, which formats the name of the @def (not the args).
 % #1 is the category, such as "Function".
 % #2 is the return type, if any.
 % #3 is the function name.
 %
 % We are followed by (but not passed) the arguments, if any.
 %
-\def\defname#1#2#3{%
+\def\printdefname#1#2#3{%
   \par
   % Get the values of \leftskip and \rightskip as they were outside the @def...
   \advance\leftskip by -\defbodyindent
@@ -7787,6 +7877,8 @@
   \tolerance=10000 \hbadness=10000
   \exdentamount=\defbodyindent
   {%
+    \def\^^M{}% for line continuation
+    %
     % defun fonts. We use typewriter by default (used to be bold) because:
     % . we're printing identifiers, they should be in tt in principle.
     % . in languages with many accents, such as Czech or French, it's
@@ -7818,10 +7910,13 @@
 
 % Print arguments.  Use slanted for @def*, typewriter for @deftype*.
 \def\defunargs#1{%
-  \df \ifdoingtypefn \tt \else \sl \fi
-  \ifflagclear{txicodevaristt}{}%
-    {\def\var##1{{\setregularquotes \ttsl ##1}}}%
-  #1%
+  \bgroup
+    \def\^^M{}% for line continuation
+    \df \ifdoingtypefn \tt \else \sl \fi
+    \ifflagclear{txicodevaristt}{}%
+       {\def\var##1{{\setregularquotes \ttsl ##1}}}%
+    #1%
+  \egroup
 }
 
 % We want ()& to print specially on the defun line.
@@ -7856,7 +7951,7 @@
 
 % If we encounter &foo, then turn on ()-hacking afterwards
 \newif\ifampseen
-\def\amprm#1 {\ampseentrue{\bf\&#1 }}
+\def\amprm#1 {\ampseentrue{\rm\&#1 }}
 
 \def\parenfont{%
   \ifampseen
@@ -8178,14 +8273,14 @@
 % Read recursive and nonrecursive macro bodies. (They're different since
 % rec and nonrec macros end differently.)
 %
-% We are in \macrobodyctxt, and the \xdef causes backslashshes in the macro
+% We are in \macrobodyctxt, and the \xdef causes backslashes in the macro
 % body to be transformed.
-% Set \macrobody to the body of the macro, and call \defmacro.
+% Set \macrobody to the body of the macro, and call \macrodef.
 %
 {\catcode`\ =\other\long\gdef\parsemacbody#1@end macro{%
-\xdef\macrobody{\eatcr{#1}}\endgroup\defmacro}}%
+\xdef\macrobody{\eatcr{#1}}\endgroup\macrodef}}%
 {\catcode`\ =\other\long\gdef\parsermacbody#1@end rmacro{%
-\xdef\macrobody{\eatcr{#1}}\endgroup\defmacro}}%
+\xdef\macrobody{\eatcr{#1}}\endgroup\macrodef}}%
 
 % Make @ a letter, so that we can make private-to-Texinfo macro names.
 \edef\texiatcatcode{\the\catcode`\@}
@@ -8404,35 +8499,36 @@
 % \xdef is used so that macro definitions will survive the file
 % they're defined in: @include reads the file inside a group.
 %
-\def\defmacro{%
+\def\macrodef{%
   \let\hash=##% convert placeholders to macro parameter chars
   \ifnum\paramno=1
-    \def\xeatspaces##1{##1}%
-    % This removes the pair of braces around the argument.  We don't
-    % use \eatspaces, because this can cause ends of lines to be lost
-    % when the argument to \eatspaces is read, leading to line-based
-    % commands like "@itemize" not being read correctly.
-  \else
-    \let\xeatspaces\relax % suppress expansion
+    \long\def\xeatspaces##1{##1}%
+    % We don't use \xeatspaces for single-argument macros, because we
+    % want to keep ends of lines.  This definition removes \xeatspaces
+    % when \macrobody is expanded below.
+  \else
+    \def\xeatspaces{\string\xeatspaces}%
+    % This expands \xeatspaces as a sequence of character tokens, which
+    % stops \scantokens inserting an extra space after the control sequence.
   \fi
   \ifcase\paramno
   % 0
     \expandafter\xdef\csname\the\macname\endcsname{%
-      \bgroup
+      \begingroup
         \noexpand\spaceisspace
         \noexpand\endlineisspace
         \noexpand\expandafter % skip any whitespace after the macro name.
         \expandafter\noexpand\csname\the\macname @@@\endcsname}%
     \expandafter\xdef\csname\the\macname @@@\endcsname{%
-      \egroup
+      \endgroup
       \noexpand\scanmacro{\macrobody}}%
   \or % 1
     \expandafter\xdef\csname\the\macname\endcsname{%
-       \bgroup
+       \begingroup
        \noexpand\braceorline
        \expandafter\noexpand\csname\the\macname @@@\endcsname}%
     \expandafter\xdef\csname\the\macname @@@\endcsname##1{%
-      \egroup
+      \endgroup
       \noexpand\scanmacro{\macrobody}%
       }%
   \else % at most 9
@@ -8443,7 +8539,7 @@
       % @MACNAME@@@ removes braces surrounding the argument list.
       % @MACNAME@@@@ scans the macro body with arguments substituted.
       \expandafter\xdef\csname\the\macname\endcsname{%
-        \bgroup
+        \begingroup
         \noexpand\expandafter  % This \expandafter skip any spaces after the
         \noexpand\macroargctxt % macro before we change the catcode of space.
         \noexpand\expandafter
@@ -8457,7 +8553,7 @@
       \expandafter\xdef
       \expandafter\expandafter
         \csname\the\macname @@@@\endcsname\paramlist{%
-          \egroup\noexpand\scanmacro{\macrobody}}%
+          \endgroup\noexpand\scanmacro{\macrobody}}%
     \else % 10 or more:
       \expandafter\xdef\csname\the\macname\endcsname{%
         \noexpand\getargvals@{\the\macname}{\argl}%
@@ -8579,6 +8675,75 @@
   \fi \macnamexxx}
 
 
+% @linemacro
+
+\parseargdef\linemacro{%
+  \getargs{#1}% now \macname is the macname and \argl the arglist
+  \ifx\argl\empty
+    \paramno=0
+    \let\hash\relax
+    \def\paramlist{\hash 1\endlinemacro}%
+  \else
+    \expandafter\linegetparamlist\argl;%
+  \fi
+  \begingroup \macrobodyctxt \usembodybackslash
+  \parselinemacrobody
+}
+
+% Build up \paramlist which will be used as the parameter text for the macro.
+% At the end it will be like "#1 #2 #3\endlinemacro".
+\def\linegetparamlist#1;{%
+  \paramno=0\def\paramlist{}%
+  \let\hash\relax
+  \linegetparamlistxxx#1,;,%
+}
+\def\linegetparamlistxxx#1,{%
+  \if#1;\let\next=\linegetparamlistxxxx
+  \else \let\next=\linegetparamlistxxx
+    \advance\paramno by 1
+    \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
+        {\hash\the\paramno}%
+    \edef\paramlist{\paramlist\hash\the\paramno\space}%
+  \fi\next}
+\def\linegetparamlistxxxx{%
+  \expandafter\fixparamlist\paramlist\fixparamlist
+}
+% Replace final space token
+\def\fixparamlist#1 \fixparamlist{%
+  \def\paramlist{#1\endlinemacro}%
+}
+
+% Read the body of the macro, replacing backslash-surrounded variables
+%
+{\catcode`\ =\other\long\gdef\parselinemacrobody#1@end linemacro{%
+\xdef\macrobody{#1}%
+\endgroup
+\linemacrodef
+}}
+
+% Make the definition
+\def\linemacrodef{%
+  \let\hash=##%
+  \expandafter\xdef\csname\the\macname\endcsname{%
+    \bgroup
+    \noexpand\parsearg
+    \expandafter\noexpand\csname\the\macname @@\endcsname
+  }
+  \expandafter\xdef\csname\the\macname @@\endcsname##1{%
+    \egroup
+    \expandafter\noexpand
+    \csname\the\macname @@@\endcsname##1\noexpand\endlinemacro
+  }
+  \expandafter\expandafter
+  \expandafter\xdef
+  \expandafter\expandafter\csname\the\macname @@@\endcsname\paramlist{%
+    \newlinechar=13 % split \macrobody into lines
+    \noexpand\scantokens{\macrobody}%
+  }
+}
+
+
+
 % @alias.
 % We need some trickery to remove the optional spaces around the equal
 % sign.  Make them active and then expand them all to nothing.
@@ -8655,6 +8820,11 @@
   \fi
 }
 
+% @nodedescription, @nodedescriptionblock - do nothing for TeX
+\parseargdef\nodedescription{}
+\def\nodedescriptionblock{\doignore{nodedescriptionblock}}
+
+
 % @anchor{NAME} -- define xref target at arbitrary point.
 %
 \newcount\savesfregister
@@ -8736,109 +8906,11 @@
 \def\xrefX#1,#2,#3,#4,#5,#6{\begingroup
   \unsepspaces
   %
-  % Get args without leading/trailing spaces.
-  \def\printedrefname{\ignorespaces #3}%
-  \setbox\printedrefnamebox = \hbox{\printedrefname\unskip}%
-  %
+  \getprintedrefname{#1}{#3}{#5}%
   \def\infofilename{\ignorespaces #4}%
   \setbox\infofilenamebox = \hbox{\infofilename\unskip}%
   %
-  \def\printedmanual{\ignorespaces #5}%
-  \setbox\printedmanualbox  = \hbox{\printedmanual\unskip}%
-  %
-  % If the printed reference name (arg #3) was not explicitly given in
-  % the @xref, figure out what we want to use.
-  \ifdim \wd\printedrefnamebox = 0pt
-    % No printed node name was explicitly given.
-    \expandafter\ifx\csname SETxref-automatic-section-title\endcsname \relax
-      % Not auto section-title: use node name inside the square brackets.
-      \def\printedrefname{\ignorespaces #1}%
-    \else
-      % Auto section-title: use chapter/section title inside
-      % the square brackets if we have it.
-      \ifdim \wd\printedmanualbox > 0pt
-        % It is in another manual, so we don't have it; use node name.
-        \def\printedrefname{\ignorespaces #1}%
-      \else
-        \ifhavexrefs
-          % We (should) know the real title if we have the xref values.
-          \def\printedrefname{\refx{#1-title}}%
-        \else
-          % Otherwise just copy the Info node name.
-          \def\printedrefname{\ignorespaces #1}%
-        \fi%
-      \fi
-    \fi
-  \fi
-  %
-  % Make link in pdf output.
-  \ifpdf
-    % For pdfTeX and LuaTeX
-    {\indexnofonts
-     \makevalueexpandable
-     \turnoffactive
-     % This expands tokens, so do it after making catcode changes, so _
-     % etc. don't get their TeX definitions.  This ignores all spaces in
-     % #4, including (wrongly) those in the middle of the filename.
-     \getfilename{#4}%
-     %
-     % This (wrongly) does not take account of leading or trailing
-     % spaces in #1, which should be ignored.
-     \setpdfdestname{#1}%
-     %
-     \ifx\pdfdestname\empty
-       \def\pdfdestname{Top}% no empty targets
-     \fi
-     %
-     \leavevmode
-     \startlink attr{/Border 0 0 0}%
-     \ifnum\filenamelength>0
-       goto file{\the\filename.pdf} name{\pdfdestname}%
-     \else
-       goto name{\pdfmkpgn{\pdfdestname}}%
-     \fi
-    }%
-    \setcolor{\linkcolor}%
-  \else
-    \ifx\XeTeXrevision\thisisundefined
-    \else
-      % For XeTeX
-      {\indexnofonts
-       \makevalueexpandable
-       \turnoffactive
-       % This expands tokens, so do it after making catcode changes, so _
-       % etc. don't get their TeX definitions.  This ignores all spaces in
-       % #4, including (wrongly) those in the middle of the filename.
-       \getfilename{#4}%
-       %
-       % This (wrongly) does not take account of leading or trailing
-       % spaces in #1, which should be ignored.
-       \setpdfdestname{#1}%
-       %
-       \ifx\pdfdestname\empty
-         \def\pdfdestname{Top}% no empty targets
-       \fi
-       %
-       \leavevmode
-       \ifnum\filenamelength>0
-         % With default settings,
-         % XeTeX (xdvipdfmx) replaces link destination names with integers.
-         % In this case, the replaced destination names of
-         % remote PDFs are no longer known.  In order to avoid a replacement,
-         % you can use xdvipdfmx's command line option `-C 0x0010'.
-         % If you use XeTeX 0.99996+ (TeX Live 2016+),
-         % this command line option is no longer necessary
-         % because we can use the `dvipdfmx:config' special.
-         \special{pdf:bann << /Border 0 0 0 /Type /Annot /Subtype /Link /A
-           << /S /GoToR /F (\the\filename.pdf) /D (\pdfdestname) >> >>}%
-       \else
-         \special{pdf:bann << /Border 0 0 0 /Type /Annot /Subtype /Link /A
-           << /S /GoTo /D (\pdfdestname) >> >>}%
-       \fi
-      }%
-      \setcolor{\linkcolor}%
-    \fi
-  \fi
+  \startxreflink{#1}{#4}%
   {%
     % Have to otherify everything special to allow the \csname to
     % include an _ in the xref name, etc.
@@ -8900,11 +8972,10 @@
       \xrefprintnodename\printedrefname
       %
       \ifflagclear{txiomitxrefpg}{%
-        % But we always want a comma and a space:
-        ,\space
-        %
+        % We always want a comma
+        ,%
         % output the `page 3'.
-        \turnoffactive \putwordpage\tie\refx{#1-pg}%
+        \turnoffactive \putpageref{#1}%
         % Add a , if xref followed by a space
         \if\space\noexpand\tokenafterxref ,%
         \else\ifx\	\tokenafterxref ,% @TAB
@@ -8920,6 +8991,97 @@
   \endlink
 \endgroup}
 
+% \getprintedrefname{NODE}{LABEL}{MANUAL}
+% - set \printedrefname and \printedmanual
+%
+\def\getprintedrefname#1#2#3{%
+  % Get args without leading/trailing spaces.
+  \def\printedrefname{\ignorespaces #2}%
+  \setbox\printedrefnamebox = \hbox{\printedrefname\unskip}%
+  %
+  \def\printedmanual{\ignorespaces #3}%
+  \setbox\printedmanualbox  = \hbox{\printedmanual\unskip}%
+  %
+  % If the printed reference name (arg #2) was not explicitly given in
+  % the @xref, figure out what we want to use.
+  \ifdim \wd\printedrefnamebox = 0pt
+    % No printed node name was explicitly given.
+    \expandafter\ifx\csname SETxref-automatic-section-title\endcsname \relax
+      % Not auto section-title: use node name inside the square brackets.
+      \def\printedrefname{\ignorespaces #1}%
+    \else
+      % Auto section-title: use chapter/section title inside
+      % the square brackets if we have it.
+      \ifdim \wd\printedmanualbox > 0pt
+        % It is in another manual, so we don't have it; use node name.
+        \def\printedrefname{\ignorespaces #1}%
+      \else
+        \ifhavexrefs
+          % We (should) know the real title if we have the xref values.
+          \def\printedrefname{\refx{#1-title}}%
+        \else
+          % Otherwise just copy the Info node name.
+          \def\printedrefname{\ignorespaces #1}%
+        \fi%
+      \fi
+    \fi
+  \fi
+}
+
+% \startxreflink{NODE}{FILE} - start link in pdf output.
+\def\startxreflink#1#2{%
+  \ifpdforxetex
+    % For pdfTeX and LuaTeX
+    {\indexnofonts
+     \makevalueexpandable
+     \turnoffactive
+     % This expands tokens, so do it after making catcode changes, so _
+     % etc. don't get their TeX definitions.  This ignores all spaces in
+     % #2, including (wrongly) those in the middle of the filename.
+     \getfilename{#2}%
+     %
+     % This (wrongly) does not take account of leading or trailing
+     % spaces in #1, which should be ignored.
+     \setpdfdestname{#1}%
+     %
+     \ifx\pdfdestname\empty
+       \def\pdfdestname{Top}% no empty targets
+     \fi
+     %
+     \leavevmode
+     \ifpdf
+       \startlink attr{/Border 0 0 0}%
+       \ifnum\filenamelength>0
+         goto file{\the\filename.pdf} name{\pdfdestname}%
+       \else
+         goto name{\pdfmkpgn{\pdfdestname}}%
+       \fi
+     \else % XeTeX
+       \ifnum\filenamelength>0
+         % With default settings,
+         % XeTeX (xdvipdfmx) replaces link destination names with integers.
+         % In this case, the replaced destination names of
+         % remote PDFs are no longer known.  In order to avoid a replacement,
+         % you can use xdvipdfmx's command line option `-C 0x0010'.
+         % If you use XeTeX 0.99996+ (TeX Live 2016+),
+         % this command line option is no longer necessary
+         % because we can use the `dvipdfmx:config' special.
+         \special{pdf:bann << /Border 0 0 0 /Type /Annot /Subtype /Link /A
+           << /S /GoToR /F (\the\filename.pdf) /D (\pdfdestname) >> >>}%
+       \else
+         \special{pdf:bann << /Border 0 0 0 /Type /Annot /Subtype /Link /A
+           << /S /GoTo /D (\pdfdestname) >> >>}%
+       \fi
+     \fi
+    }%
+    \setcolor{\linkcolor}%
+  \fi
+}
+
+% can be overridden in translation files
+\def\putpageref#1{%
+  \space\putwordpage\tie\refx{#1-pg}}
+
 % Output a cross-manual xref to #1.  Used just above (twice).
 %
 % Only include the text "Section ``foo'' in" if the foo is neither
@@ -8953,6 +9115,21 @@
 %
 \def\xrefprintnodename#1{#1}
 
+% @link{NODENAME, LABEL, MANUAL} - create a "plain" link, with no
+% page number.  Not useful if printed on paper.
+%
+\def\link#1{\linkX#1,,,}
+\def\linkX#1,#2,#3,#4{%
+  \begingroup
+  \unsepspaces
+  \getprintedrefname{#1}{#2}{#3}%
+  \startxreflink{#1}{#3}%
+  \printedrefname
+  \endlink
+  \endgroup
+}
+
+
 % Things referred to by \setref.
 %
 \def\Ynothing{}
@@ -9567,8 +9744,8 @@
 %
 \def\caption{\docaption\thiscaption}
 \def\shortcaption{\docaption\thisshortcaption}
-\def\docaption{\checkenv\float \bgroup\scanctxt\defcaption}
-\def\defcaption#1#2{\egroup \def#1{#2}}
+\def\docaption{\checkenv\float \bgroup\scanctxt\docaptionz}
+\def\docaptionz#1#2{\egroup \def#1{#2}}
 
 % The parameter is the control sequence identifying the counter we are
 % going to use.  Create it if it doesn't exist and assign it to \floatno.
@@ -9857,12 +10034,10 @@
        % For native Unicode handling (XeTeX and LuaTeX)
        \nativeunicodechardefs
      \else
-       % For treating UTF-8 as byte sequences (TeX, eTeX and pdfTeX)
+       % For treating UTF-8 as byte sequences (TeX, eTeX and pdfTeX).
+       % Since we already invoke \utfeightchardefs at the top level,
+       % making non-ascii chars active is sufficient.
        \setnonasciicharscatcode\active
-       % since we already invoked \utfeightchardefs at the top level
-       % (below), do not re-invoke it, otherwise our check for duplicated
-       % definitions gets triggered.  Making non-ascii chars active is
-       % sufficient.
      \fi
   %
   \else
@@ -9887,7 +10062,6 @@
   \fi
 }
 
-% emacs-page
 % A message to be logged when using a character that isn't available
 % the default font encoding (OT1).
 %
@@ -9896,12 +10070,6 @@
 % Take account of \c (plain) vs. \, (Texinfo) difference.
 \def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi}
 
-% First, make active non-ASCII characters in order for them to be
-% correctly categorized when TeX reads the replacement text of
-% macros containing the character definitions.
-\setnonasciicharscatcode\active
-%
-
 \def\gdefchar#1#2{%
 \gdef#1{%
    \ifpassthroughchars
@@ -9911,8 +10079,14 @@
    \fi
 }}
 
+\begingroup
+
+% Make non-ASCII characters active for defining the character definition
+% macros.
+\setnonasciicharscatcode\active
+
 % Latin1 (ISO-8859-1) character definitions.
-\def\latonechardefs{%
+\gdef\latonechardefs{%
   \gdefchar^^a0{\tie}
   \gdefchar^^a1{\exclamdown}
   \gdefchar^^a2{{\tcfont \char162}} % cent
@@ -10017,7 +10191,7 @@
 }
 
 % Latin9 (ISO-8859-15) encoding character definitions.
-\def\latninechardefs{%
+\gdef\latninechardefs{%
   % Encoding is almost identical to Latin1.
   \latonechardefs
   %
@@ -10032,7 +10206,7 @@
 }
 
 % Latin2 (ISO-8859-2) character definitions.
-\def\lattwochardefs{%
+\gdef\lattwochardefs{%
   \gdefchar^^a0{\tie}
   \gdefchar^^a1{\ogonek{A}}
   \gdefchar^^a2{\u{}}
@@ -10050,7 +10224,7 @@
   \gdefchar^^ae{\v Z}
   \gdefchar^^af{\dotaccent Z}
   %
-  \gdefchar^^b0{\textdegree{}}
+  \gdefchar^^b0{\textdegree}
   \gdefchar^^b1{\ogonek{a}}
   \gdefchar^^b2{\ogonek{ }}
   \gdefchar^^b3{\l}
@@ -10136,6 +10310,8 @@
   \gdefchar^^ff{\dotaccent{}}
 }
 
+\endgroup % active chars
+
 % UTF-8 character definitions.
 %
 % This code to support UTF-8 is based on LaTeX's utf8.def, with some
@@ -10473,7 +10649,7 @@
   \DeclareUnicodeCharacter{00AE}{\registeredsymbol{}}%
   \DeclareUnicodeCharacter{00AF}{\={ }}%
   %
-  \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}%
+  \DeclareUnicodeCharacter{00B0}{\textdegree}%
   \DeclareUnicodeCharacter{00B1}{\ensuremath\pm}%
   \DeclareUnicodeCharacter{00B2}{$^2$}%
   \DeclareUnicodeCharacter{00B3}{$^3$}%
@@ -10977,7 +11153,7 @@
   %
   \DeclareUnicodeCharacter{20AC}{\euro{}}%
   %
-  \DeclareUnicodeCharacter{2192}{\expansion{}}%
+  \DeclareUnicodeCharacter{2192}{\arrow}%
   \DeclareUnicodeCharacter{21D2}{\result{}}%
   %
   % Mathematical symbols
@@ -11188,14 +11364,14 @@
    \relax
 }
 
-% Define all Unicode characters we know about.  This makes UTF-8 the default
-% input encoding and allows @U to work.
+% Define all Unicode characters we know about
 \iftxinativeunicodecapable
   \nativeunicodechardefsatu
 \else
   \utfeightchardefs
 \fi
 
+
 \message{formatting,}
 
 \newdimen\defaultparindent \defaultparindent = 15pt
@@ -11438,17 +11614,18 @@
   \mtadjustprotcode#1\relax
 }
 
+\newcount\countC
 \def\mtadjustprotcode#1{%
-  \countA=0
+  \countC=0
   \loop
-    \ifcase\lpcode#1\countA\else
-      \mtadjustcp\lpcode#1\countA
+    \ifcase\lpcode#1\countC\else
+      \mtadjustcp\lpcode#1\countC
     \fi
-    \ifcase\rpcode#1\countA\else
-      \mtadjustcp\rpcode#1\countA
+    \ifcase\rpcode#1\countC\else
+      \mtadjustcp\rpcode#1\countC
     \fi
-    \advance\countA 1
-  \ifnum\countA < 256 \repeat
+    \advance\countC 1
+  \ifnum\countC < 256 \repeat
 }
 
 \newcount\countB
@@ -11522,7 +11699,7 @@
   \fi
 }
 
-\microtypeON
+\microtypeOFF
 
 \parseargdef\microtype{%
   \def\txiarg{#1}%
@@ -11539,6 +11716,9 @@
 
 \message{and turning on texinfo input format.}
 
+% Make UTF-8 the default encoding.
+\documentencodingzzz{UTF-8}
+
 \def^^L{\par} % remove \outer, so ^L can appear in an @comment
 \catcode`\^^K = 10 % treat vertical tab as whitespace
 
@@ -11601,23 +11781,32 @@
 % Used sometimes to turn off (effectively) the active characters even after
 % parsing them.
 \def\turnoffactive{%
-  \normalturnoffactive
+  \passthroughcharstrue
+  \let-=\normaldash
+  \let"=\normaldoublequote
+  \let$=\normaldollar %$ font-lock fix
+  \let+=\normalplus
+  \let<=\normalless
+  \let>=\normalgreater
+  \let^=\normalcaret
+  \let_=\normalunderscore
+  \let|=\normalverticalbar
+  \let~=\normaltilde
   \otherbackslash
+  \setregularquotes
+  \unsepspaces
 }
 
-\catcode`\@=0
+% If a .fmt file is being used, characters that might appear in a file
+% name cannot be active until we have parsed the command line.
+% So turn them off again, and have \loadconf turn them back on.
+\catcode`+=\other \catcode`\_=\other
+
 
 % \backslashcurfont outputs one backslash character in current font,
 % as in \char`\\.
 \global\chardef\backslashcurfont=`\\
 
-% \realbackslash is an actual character `\' with catcode other.
-{\catcode`\\=\other @gdef@realbackslash{\}}
-
-% In Texinfo, backslash is an active character; it prints the backslash
-% in fixed width font.
-\catcode`\\=\active  % @ for escape char from now on.
-
 % Print a typewriter backslash.  For math mode, we can't simply use
 % \backslashcurfont: the story here is that in math mode, the \char
 % of \backslashcurfont ends up printing the roman \ from the math symbol
@@ -11627,109 +11816,125 @@
 % ignored family value; char position "5C).  We can't use " for the
 % usual hex value because it has already been made active.
 
-@def@ttbackslash{{@tt @ifmmode @mathchar29020 @else @backslashcurfont @fi}}
-@let@backslashchar = @ttbackslash % @backslashchar{} is for user documents.
+\def\ttbackslash{{\tt \ifmmode \mathchar29020 \else \backslashcurfont \fi}}
+\let\backslashchar = \ttbackslash % \backslashchar{} is for user documents.
 
-% \otherbackslash defines an active \ to be a literal `\' character with
-% catcode other.
-@gdef@otherbackslash{@let\=@realbackslash}
-
-% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
-% the literal character `\'.
-%
-{@catcode`- = @active
- @gdef@normalturnoffactive{%
-   @passthroughcharstrue
-   @let-=@normaldash
-   @let"=@normaldoublequote
-   @let$=@normaldollar %$ font-lock fix
-   @let+=@normalplus
-   @let<=@normalless
-   @let>=@normalgreater
-   @let^=@normalcaret
-   @let_=@normalunderscore
-   @let|=@normalverticalbar
-   @let~=@normaltilde
-   @let\=@ttbackslash
-   @setregularquotes
-   @unsepspaces
- }
-}
-
-% If a .fmt file is being used, characters that might appear in a file
-% name cannot be active until we have parsed the command line.
-% So turn them off again, and have @fixbackslash turn them back on.
-@catcode`+=@other @catcode`@_=@other
-
-% \enablebackslashhack - allow file to begin `\input texinfo'
-%
-% If a .fmt file is being used, we don't want the `\input texinfo' to show up.
-% That is what \eatinput is for; after that, the `\' should revert to printing
-% a backslash.
-% If the file did not have a `\input texinfo', then it is turned off after
-% the first line; otherwise the first `\' in the file would cause an error.
-% This is used on the very last line of this file, texinfo.tex.
-% We also use @c to call @fixbackslash, in case ends of lines are hidden.
-{
-@catcode`@^=7
-@catcode`@^^M=13@gdef@enablebackslashhack{%
-  @global@let\ = @eatinput%
-  @catcode`@^^M=13%
-  @def@c{@fixbackslash@c}%
-  % Definition for the newline at the end of this file.
-  @def ^^M{@let^^M@secondlinenl}%
-  % Definition for a newline in the main Texinfo file.
-  @gdef @secondlinenl{@fixbackslash}%
-  % In case the first line has a whole-line command on it
-  @let@originalparsearg@parsearg
-  @def@parsearg{@fixbackslash@originalparsearg}
+% These are made active for url-breaking, so need
+% active definitions as the normal characters.
+\def\normaldot{.}
+\def\normalquest{?}
+\def\normalslash{/}
+
+% \newlinesloadsconf - call \loadconf as soon as possible in the
+% file, e.g. at the first newline.
+%
+{\catcode`\^=7
+\catcode`\^^M=13
+\gdef\newlineloadsconf{%
+  \catcode`\^^M=13 %
+  \newlineloadsconfzz%
+}
+\gdef\newlineloadsconfzz#1^^M{%
+  \def\c{\loadconf\c}%
+  % Definition for the first newline read in the file
+  \def ^^M{\loadconf}%
+  % In case the first line has a whole-line or environment command on it
+  \let\originalparsearg\parsearg%
+  \def\parsearg{\loadconf\originalparsearg}%
+  %
+  % \startenvironment is in the expansion of commands defined with \envdef
+  \let\originalstartenvironment\startenvironment%
+  \def\startenvironment{\loadconf\startenvironment}%
 }}
 
-{@catcode`@^=7 @catcode`@^^M=13%
-@gdef@eatinput input texinfo#1^^M{@fixbackslash}}
 
 % Emergency active definition of newline, in case an active newline token
 % appears by mistake.
-{@catcode`@^=7 @catcode13=13%
-@gdef@enableemergencynewline{%
-  @gdef^^M{%
-    @par%
-    %<warning: active newline>@par%
+{\catcode`\^=7 \catcode13=13%
+\gdef\enableemergencynewline{%
+  \gdef^^M{%
+    \par%
+    %<warning: active newline>\par%
 }}}
 
 
-@gdef@fixbackslash{%
-  @ifx\@eatinput @let\ = @ttbackslash @fi
-  @catcode13=5 % regular end of line
-  @enableemergencynewline
-  @let@c=@comment
-  @let@parsearg@originalparsearg
+% \loadconf gets called at the beginning of every Texinfo file.
+% If texinfo.cnf is present on the system, read it.  Useful for site-wide
+% @afourpaper, etc.  Not opening texinfo.cnf directly in texinfo.tex
+% makes it possible to make a format file for Texinfo.
+%
+\gdef\loadconf{%
+  \relax  % Terminate the filename if running as "tex '&texinfo' FILE.texi".
+  %
+  % Turn off the definitions that trigger \loadconf
+  \everyjobreset
+  \catcode13=5 % regular end of line
+  \enableemergencynewline
+  \let\c=\comment
+  \let\parsearg\originalparsearg
+  \let\startenvironment\originalstartenvironment
+  %
   % Also turn back on active characters that might appear in the input
   % file name, in case not using a pre-dumped format.
-  @catcode`+=@active
-  @catcode`@_=@active
+  \catcode`+=\active
+  \catcode`\_=\active
   %
-  % If texinfo.cnf is present on the system, read it.
-  % Useful for site-wide @afourpaper, etc.  This macro, @fixbackslash, gets
-  % called at the beginning of every Texinfo file.  Not opening texinfo.cnf
-  % directly in this file, texinfo.tex, makes it possible to make a format
-  % file for Texinfo.
-  %
-  @openin 1 texinfo.cnf
-  @ifeof 1 @else @input texinfo.cnf @fi
-  @closein 1
+  \openin 1 texinfo.cnf
+  \ifeof 1 \else \input texinfo.cnf \fi
+  \closein 1
 }
 
+% Redefine some control sequences to be controlled by the \ifdummies
+% and \ifindexnofonts switches.  Do this at the end so that the control
+% sequences are all defined.
+\definedummies
+
+
+
+
+\catcode`\@=0
+
+% \realbackslash is an actual character `\' with catcode other.
+{\catcode`\\=\other @gdef@realbackslash{\}}
+
+% In Texinfo, backslash is an active character; it prints the backslash
+% in fixed width font.
+\catcode`\\=\active  % @ for escape char from now on.
+
+@let\ = @ttbackslash
+
+% If in a .fmt file, print the version number.
+% \eatinput stops the `\input texinfo' from showing up.
+% After that, `\' should revert to printing a backslash.
+% Turn on active characters that we couldn't do earlier because
+% they might have appeared in the input file name.
+%
+@everyjob{@message{Texinfo version @texinfoversion}%
+  @global@let\ = @eatinput
+  @catcode`+=@active @catcode`@_=@active}
+
+{@catcode`@^=7 @catcode`@^^M=13%
+@gdef@eatinput input texinfo#1^^M{@loadconf}}
+
+@def@everyjobreset{@ifx\@eatinput @let\ = @ttbackslash @fi}
+
+% \otherbackslash defines an active \ to be a literal `\' character with
+% catcode other.
+@gdef@otherbackslash{@let\=@realbackslash}
+
+% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
+% the literal character `\'.
+%
+{@catcode`- = @active
+ @gdef@normalturnoffactive{%
+   @turnoffactive
+   @let\=@ttbackslash
+ }
+}
 
 % Say @foo, not \foo, in error messages.
 @escapechar = `@@
 
-% These (along with & and #) are made active for url-breaking, so need
-% active definitions as the normal characters.
-@def@normaldot{.}
-@def@normalquest{?}
-@def@normalslash{/}
-
 % These look ok in all fonts, so just make them not special.
 % @hashchar{} gets its own user-level command, because of #line.
 @catcode`@& = @other @def@normalamp{&}
@@ -11744,15 +11949,11 @@
 @c Do this last of all since we use ` in the previous @catcode assignments.
 @catcode`@'=@active
 @catcode`@`=@active
-@setregularquotes
 
 @c Local variables:
 @c eval: (add-hook 'before-save-hook 'time-stamp nil t)
 @c time-stamp-pattern: "texinfoversion{%Y-%02m-%02d.%02H}"
-@c page-delimiter: "^\\\\message\\|emacs-page"
+@c page-delimiter: "^\\\\message"
 @c End:
 
-@c vim:sw=2:
-
-@enablebackslashhack
-
+@newlineloadsconf

_service:tar_scm:libidn2-2.3.4.tar.gz/build-aux/update-copyright -> _service:tar_scm:libidn2-2.3.7.tar.gz/build-aux/update-copyright Changed

@@ -3,7 +3,7 @@
 
 # Update an FSF copyright year list to include the current year.
 
-# Copyright (C) 2009-2022 Free Software Foundation, Inc.
+# Copyright (C) 2009-2024 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -98,7 +98,8 @@
 #   6. Blank lines, even if preceded by the prefix, do not appear
 #      within the FSF copyright statement.
 #   7. Each copyright year is 2 or 4 digits, and years are separated by
-#      commas, "-", or "--".  Whitespace may appear after commas.
+#      commas, "-", "--", or "\(en" (for troff).  Whitespace may appear
+#      after commas.
 #
 # Environment variables:
 #
@@ -122,7 +123,7 @@
 #   5. Set UPDATE_COPYRIGHT_HOLDER if the copyright holder is other
 #      than "Free Software Foundation, Inc.".
 
-# This is a prologue that allows to run a perl script as an executable
+# This is a prologue that allows running a perl script as an executable
 # on systems that are compliant to a POSIX version before POSIX:2017.
 # On such systems, the usual invocation of an executable through execlp()
 # or execvp() fails with ENOEXEC if it is a script that does not start
@@ -137,7 +138,7 @@
 eval 'exec perl -wSx -0777 -pi "$0" "$@"'
      if 0;
 
-my $VERSION = '2020-04-04.15:07'; # UTC
+my $VERSION = '2024-01-15.18:30'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -145,9 +146,11 @@
 
 use strict;
 use warnings;
+use re 'eval';
 
 my $copyright_re = 'Copyright';
 my $circle_c_re = '(?:$cC$|@copyright\{}|\\\\\(co|&copy;|©)';
+my $ndash_re = '(?:--?|\\\\\(en)';
 my $holder = $ENV{UPDATE_COPYRIGHT_HOLDER};
 $holder ||= 'Free Software Foundation, Inc.';
 my $prefix_max = 5;
@@ -167,14 +170,13 @@
 # Unless the file consistently uses "\r\n" as the EOL, use "\n" instead.
 my $eol = /(?:^|^\r)\n/ ? "\n" : "\r\n";
 
-my $leading;
-my $prefix;
-my $ws_re;
 my $stmt_re;
-while (/(^|\n)(.{0,$prefix_max})$copyright_re/g)
+my $found;
+while (/(^|\n)(.{0,$prefix_max})$copyright_re/cg)
   {
-    $leading = "$1$2";
-    $prefix = $2;
+    my $pos=pos();
+    my $leading = "$1$2";
+    my $prefix = $2;
     if ($prefix =~ /^(\s*\/)\*(\s*)$/)
       {
         $prefix =~ s,/, ,;
@@ -185,105 +187,108 @@
             $prefix = $prefix_ws;
           }
       }
-    $ws_re = ' \t\r\f'; # \s without \n
+    my $ws_re = ' \t\r\f'; # \s without \n
     $ws_re =
       "(?:$ws_re*(?:$ws_re|\\n" . quotemeta($prefix) . ")$ws_re*)";
     my $holder_re = $holder;
     $holder_re =~ s/\s/$ws_re/g;
     my $stmt_remainder_re =
       "(?:$ws_re$circle_c_re)?"
-      . "$ws_re(?:(?:\\d\\d)?\\d\\d(?:,$ws_re?|--?))*"
+      . "$ws_re(?:(?:\\d\\d)?\\d\\d(?:,$ws_re?|$ndash_re))*"
       . "((?:\\d\\d)?\\d\\d)$ws_re$holder_re";
     if (/\G$stmt_remainder_re/)
       {
+        $found = 1;
         $stmt_re =
           quotemeta($leading) . "($copyright_re$stmt_remainder_re)";
-        last;
-      }
-  }
-if (defined $stmt_re)
-  {
-    /$stmt_re/ or die; # Should never die.
-    my $stmt = $1;
-    my $final_year_orig = $2;
 
-    # Handle two-digit year numbers like "98" and "99".
-    my $final_year = $final_year_orig;
-    $final_year <= 99
-      and $final_year += 1900;
+        /$stmt_re/ or die; # Should never die.
+        my $stmt = $1;
+        my $final_year_orig = $2;
 
-    if ($final_year != $this_year)
-      {
-        # Update the year.
-        $stmt =~ s/\b$final_year_orig\b/$final_year, $this_year/;
-      }
-    if ($final_year != $this_year || $ENV{'UPDATE_COPYRIGHT_FORCE'})
-      {
-        # Normalize all whitespace including newline-prefix sequences.
-        $stmt =~ s/$ws_re/ /g;
+        # Handle two-digit year numbers like "98" and "99".
+        my $final_year = $final_year_orig;
+        $final_year <= 99
+          and $final_year += 1900;
 
-        # Put spaces after commas.
-        $stmt =~ s/, ?/, /g;
-
-        # Convert 2-digit to 4-digit years.
-        $stmt =~ s/(\b\d\d\b)/19$1/g;
-
-        # Make the use of intervals consistent.
-        if (!$ENV{UPDATE_COPYRIGHT_USE_INTERVALS})
+        if ($final_year != $this_year)
           {
-            $stmt =~ s/(\d{4})--?(\d{4})/join(', ', $1..$2)/eg;
+            # Update the year.
+            $stmt =~ s/(^|^\d)$final_year_orig\b/$1$final_year, $this_year/;
           }
-        else
+        if ($final_year != $this_year || $ENV{'UPDATE_COPYRIGHT_FORCE'})
           {
-            my $ndash = $ARGV =~ /\.tex(i(nfo)?)?$/ ? "--" : "-";
+            # Normalize all whitespace including newline-prefix sequences.
+            $stmt =~ s/$ws_re/ /g;
 
-            $stmt =~
-              s/
-                (\d{4})
-                (?:
-                  (,\ |--?)
-                  ((??{
-                    if   ($2 ne ', ') { '\d{4}'; }
-                    elsif (!$3)       { $1 + 1;  }
-                    else              { $3 + 1;  }
-                  }))
-                )+
-              /$1$ndash$3/gx;
+            # Put spaces after commas.
+            $stmt =~ s/, ?/, /g;
 
-            # When it's 2, emit a single range encompassing all year numbers.
-            $ENV{UPDATE_COPYRIGHT_USE_INTERVALS} == 2
-              and $stmt =~ s/\b(\d{4})\b.*\b(\d{4})\b/$1$ndash$2/;
-          }
+            # Convert 2-digit to 4-digit years.
+            $stmt =~ s/(\b\d\d\b)/19$1/g;
 
-        # Format within margin.
-        my $stmt_wrapped;
-        my $text_margin = $margin - length($prefix);
-        if ($prefix =~ /^(\t+)/)
-          {
-            $text_margin -= length($1) * ($tab_width - 1);
-          }
-        while (length $stmt)
-          {
-            if (($stmt =~ s/^(.{1,$text_margin})(?: |$)//)
-                || ($stmt =~ s/^(\S+)(?: |$)//))
+            # Make the use of intervals consistent.
+            if (!$ENV{UPDATE_COPYRIGHT_USE_INTERVALS})
               {
-                my $line = $1;
-                $stmt_wrapped .= $stmt_wrapped ? "$eol$prefix" : $leading;
-                $stmt_wrapped .= $line;
+                $stmt =~ s/(\d{4})$ndash_re(\d{4})/join(', ', $1..$2)/eg;
               }
             else
               {
-                # Should be unreachable, but we don't want an infinite
-                # loop if it can be reached.
-                die;
+                my $ndash = ($ARGV =~ /\.tex(i(nfo)?)?$/ ? "--"
+                             : $ARGV =~ /\.(\da-z*|man)$/ ? "\\(en"
+                             : "-");
+
+                $stmt =~
+                  s/
+                    (\d{4})
+                    (?:
+                      (,\ |$ndash_re)
+                      ((??{
+                        if   ($2 ne ', ') { '\d{4}'; }
+                        elsif (!$3)       { $1 + 1;  }
+                        else              { $3 + 1;  }
+                      }))
+                    )+
+                  /$1$ndash$3/gx;
+
+                # When it's 2, emit a single range encompassing all year numbers.
+                $ENV{UPDATE_COPYRIGHT_USE_INTERVALS} == 2
+                  and $stmt =~ s/(^|^\d)(\d{4})\b.*(?:^\d)(\d{4})\b/$1$2$ndash$3/;
               }
-          }
 
-        # Replace the old copyright statement.
-        s/$stmt_re/$stmt_wrapped/;
+            # Format within margin.
+            my $stmt_wrapped;
+            my $text_margin = $margin - length($prefix);
+            if ($prefix =~ /^(\t+)/)
+              {
+                $text_margin -= length($1) * ($tab_width - 1);
+              }
+            while (length $stmt)
+              {
+                if (($stmt =~ s/^(.{1,$text_margin})(?: |$)//)
+                    || ($stmt =~ s/^(\S+)(?: |$)//))
+                  {
+                    my $line = $1;
+                    $stmt_wrapped .= $stmt_wrapped ? "$eol$prefix" : $leading;
+                    $stmt_wrapped .= $line;
+                  }
+                else
+                  {
+                    # Should be unreachable, but we don't want an infinite
+                    # loop if it can be reached.
+                    die;
+                  }
+              }
+
+            # Replace the old copyright statement.
+            my $p = pos();
+            s/$stmt_re/$stmt_wrapped/g;
+            pos() = $p;
+          }
       }
   }
-else
+
+if (!$found)
   {
     print STDERR "$ARGV: warning: copyright statement not found\n";
   }

_service:tar_scm:libidn2-2.3.4.tar.gz/build-aux/useless-if-before-free -> _service:tar_scm:libidn2-2.3.7.tar.gz/build-aux/useless-if-before-free Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/build-aux/vc-list-files -> _service:tar_scm:libidn2-2.3.7.tar.gz/build-aux/vc-list-files Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/cfg.mk -> _service:tar_scm:libidn2-2.3.7.tar.gz/cfg.mk Changed

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2022 Simon Josefsson
+# Copyright (C) 2011-2024 Simon Josefsson
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 
 manual_title = Internationalized Domain Names Library
 
-old_NEWS_hash = 77e9c3f3613bcddd9a728d9ffee7e13d
+old_NEWS_hash = 0c20296b4846cf53d5222ce2e2c734fe
 
 bootstrap-tools = gnulib,autoconf,automake,libtoolize,make,makeinfo,help2man,gperf,gengetopt,gtkdocize,tar,gzip
 
@@ -24,9 +24,7 @@
 GNUPLOADFLAGS = --symlink-regex
 
 local-checks-to-skip += sc_unmarked_diagnostics sc_bindtextdomain # Re-add when we have translation
-local-checks-to-skip += sc_immutable_NEWS
 local-checks-to-skip += sc_prohibit_strcmp
-local-checks-to-skip += sc_copyright_check
 local-checks-to-skip += sc_prohibit_gnu_make_extensions
 
 # Ignore gnulib files.
@@ -45,13 +43,14 @@
 exclude_file_name_regexp--sc_makefile_at_at_check = ^Makefile.am|src/Makefile\.am|tests/Makefile.am$$
 exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = ^lib/IdnaMappingTable.txt|doc/reference/version.xml.in$$
 exclude_file_name_regexp--sc_prohibit_undesirable_word_seq = ^lib/idna-tables-properties.csv$$
-exclude_file_name_regexp--sc_prohibit_have_config_h = ^tests/test-lookup.c|tests/test-register.c|tests/test-tounicode.c|tests/test-strerror.c|tests/test-locale.c$$
+exclude_file_name_regexp--sc_prohibit_have_config_h = ^tests/.*.c$$
 exclude_file_name_regexp--sc_makefile_DISTCHECK_CONFIGURE_FLAGS = ^Makefile.am$$
 
 my-update-copyright:
 	make update-copyright update-copyright-env='UPDATE_COPYRIGHT_HOLDER="Tim Ruehsen" UPDATE_COPYRIGHT_USE_INTERVALS=2'
 	make update-copyright update-copyright-env='UPDATE_COPYRIGHT_HOLDER="Simon Josefsson" UPDATE_COPYRIGHT_USE_INTERVALS=2'
 	perl -pi -e "s/2011-20..  Simon Josefsson/2011-`(date +%Y)`  Simon Josefsson/" lib/version.c
+	perl -pi -e "s/2002-20.. Simon Josefsson/2002-`(date +%Y)` Simon Josefsson/" doc/Makefile.am
 
 aximport:
 	for f in m4/ax_*.m4; do \
@@ -60,5 +59,5 @@
 
 sc_codespell:
 	@if `which codespell > /dev/null`; then \
-		codespell -L tim,mitre `git -C $(top_srcdir) ls-files | egrep -v '_fuzzer.in|_fuzzer.repro|gnulib|^lib/.*\.(csv|txt)$$'`; \
+		codespell -L tim,mitre,bu `git -C $(top_srcdir) ls-files | egrep -v '_fuzzer.in|_fuzzer.repro|gnulib|^lib/.*\.(csv|txt)$$'`; \
 	fi

_service:tar_scm:libidn2-2.3.4.tar.gz/config.h.in -> _service:tar_scm:libidn2-2.3.7.tar.gz/config.h.in Changed

@@ -1,5 +1,9 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* Witness that <config.h> has been included.  */
+#define _GL_CONFIG_H_INCLUDED 1
+
+
 /* Define to the number of bits in type 'ptrdiff_t'. */
 #undef BITSIZEOF_PTRDIFF_T
 
@@ -111,6 +115,9 @@
 /* Define to 1 when the gnulib module getopt-posix should be tested. */
 #undef GNULIB_TEST_GETOPT_POSIX
 
+/* Define to 1 when the gnulib module getprogname should be tested. */
+#undef GNULIB_TEST_GETPROGNAME
+
 /* Define to 1 when the gnulib module open should be tested. */
 #undef GNULIB_TEST_OPEN
 
@@ -198,9 +205,6 @@
 /* Define to 1 if you have the <crtdefs.h> header file. */
 #undef HAVE_CRTDEFS_H
 
-/* Define to 1 if the alignas and alignof keywords work. */
-#undef HAVE_C_ALIGNASOF
-
 /* Define to 1 if bool, true and false work as per C2023. */
 #undef HAVE_C_BOOL
 
@@ -214,93 +218,110 @@
    */
 #undef HAVE_DCGETTEXT
 
-/* Define to 1 if you have the declaration of `ecvt', and to 0 if you don't.
+/* Define to 1 if you have the declaration of 'ecvt', and to 0 if you don't.
    */
 #undef HAVE_DECL_ECVT
 
-/* Define to 1 if you have the declaration of `execvpe', and to 0 if you
+/* Define to 1 if you have the declaration of 'execvpe', and to 0 if you
    don't. */
 #undef HAVE_DECL_EXECVPE
 
-/* Define to 1 if you have the declaration of `fcloseall', and to 0 if you
+/* Define to 1 if you have the declaration of 'fcloseall', and to 0 if you
    don't. */
 #undef HAVE_DECL_FCLOSEALL
 
-/* Define to 1 if you have the declaration of `fcvt', and to 0 if you don't.
+/* Define to 1 if you have the declaration of 'fcvt', and to 0 if you don't.
    */
 #undef HAVE_DECL_FCVT
 
-/* Define to 1 if you have the declaration of `gcvt', and to 0 if you don't.
+/* Define to 1 if you have the declaration of 'gcvt', and to 0 if you don't.
    */
 #undef HAVE_DECL_GCVT
 
-/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
+/* Define to 1 if you have the declaration of 'getc_unlocked', and to 0 if you
    don't. */
 #undef HAVE_DECL_GETC_UNLOCKED
 
-/* Define to 1 if you have the declaration of `getdelim', and to 0 if you
+/* Define to 1 if you have the declaration of 'getdelim', and to 0 if you
    don't. */
 #undef HAVE_DECL_GETDELIM
 
-/* Define to 1 if you have the declaration of `getdtablesize', and to 0 if you
+/* Define to 1 if you have the declaration of 'getdtablesize', and to 0 if you
    don't. */
 #undef HAVE_DECL_GETDTABLESIZE
 
-/* Define to 1 if you have the declaration of `getline', and to 0 if you
+/* Define to 1 if you have the declaration of 'getline', and to 0 if you
    don't. */
 #undef HAVE_DECL_GETLINE
 
-/* Define to 1 if you have the declaration of `program_invocation_name', and
+/* Define to 1 if you have the declaration of 'getw', and to 0 if you don't.
+   */
+#undef HAVE_DECL_GETW
+
+/* Define to 1 if you have the declaration of 'program_invocation_name', and
    to 0 if you don't. */
 #undef HAVE_DECL_PROGRAM_INVOCATION_NAME
 
-/* Define to 1 if you have the declaration of `program_invocation_short_name',
+/* Define to 1 if you have the declaration of 'program_invocation_short_name',
    and to 0 if you don't. */
 #undef HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
 
-/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
+/* Define to 1 if you have the declaration of 'putw', and to 0 if you don't.
+   */
+#undef HAVE_DECL_PUTW
+
+/* Define to 1 if you have the declaration of 'strerror_r', and to 0 if you
    don't. */
 #undef HAVE_DECL_STRERROR_R
 
-/* Define to 1 if you have the declaration of `wcsdup', and to 0 if you don't.
+/* Define to 1 if you have the declaration of 'wcsdup', and to 0 if you don't.
    */
 #undef HAVE_DECL_WCSDUP
 
-/* Define to 1 if you have the declaration of `__argv', and to 0 if you don't.
+/* Define to 1 if you have the declaration of '__argv', and to 0 if you don't.
    */
 #undef HAVE_DECL___ARGV
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
-/* Define to 1 if you have the `fcntl' function. */
+/* Define to 1 if you have the `error' function. */
+#undef HAVE_ERROR
+
+/* Define to 1 if you have the <error.h> header file. */
+#undef HAVE_ERROR_H
+
+/* Define to 1 if you have the 'fcntl' function. */
 #undef HAVE_FCNTL
 
 /* Define to 1 if you have the <features.h> header file. */
 #undef HAVE_FEATURES_H
 
-/* Define to 1 if you have the `flockfile' function. */
+/* Define to 1 if you have the 'flockfile' function. */
 #undef HAVE_FLOCKFILE
 
 /* Define if the 'free' function is guaranteed to preserve errno. */
 #undef HAVE_FREE_POSIX
 
-/* Define to 1 if you have the `funlockfile' function. */
+/* Define to 1 if you have the 'funlockfile' function. */
 #undef HAVE_FUNLOCKFILE
 
 /* Define to 1 if you have the `getdelim' function. */
 #undef HAVE_GETDELIM
 
-/* Define to 1 if you have the `getdtablesize' function. */
+/* Define to 1 if you have the 'getdtablesize' function. */
 #undef HAVE_GETDTABLESIZE
 
-/* Define to 1 if you have the `getexecname' function. */
+/* Define to 1 if you have the 'getexecname' function. */
 #undef HAVE_GETEXECNAME
 
+/* Define to 1 if you have the `getline' function. */
+#undef HAVE_GETLINE
+
 /* Define to 1 if you have the <getopt.h> header file. */
 #undef HAVE_GETOPT_H
 
-/* Define to 1 if you have the `getopt_long_only' function. */
+/* Define to 1 if you have the 'getopt_long_only' function. */
 #undef HAVE_GETOPT_LONG_ONLY
 
 /* Define to 1 if you have the `getprogname' function. */
@@ -335,7 +356,7 @@
 /* Define to 1 if the system has the type 'long long int'. */
 #undef HAVE_LONG_LONG_INT
 
-/* Define to 1 if you have the `lstat' function. */
+/* Define to 1 if you have the 'lstat' function. */
 #undef HAVE_LSTAT
 
 /* Define to 1 if you have the <minix/config.h> header file. */
@@ -345,13 +366,13 @@
    concept. */
 #undef HAVE_MSVC_INVALID_PARAMETER_HANDLER
 
-/* Define to 1 if you have the `rawmemchr' function. */
+/* Define to 1 if you have the 'rawmemchr' function. */
 #undef HAVE_RAWMEMCHR
 
 /* Define to 1 if you have the <sdkddkver.h> header file. */
 #undef HAVE_SDKDDKVER_H
 
-/* Define to 1 if you have the `setdtablesize' function. */
+/* Define to 1 if you have the 'setdtablesize' function. */
 #undef HAVE_SETDTABLESIZE
 
 /* Define to 1 if 'sig_atomic_t' is a signed integer type. */
@@ -363,9 +384,6 @@
 /* Define to 1 if 'wint_t' is a signed integer type. */
 #undef HAVE_SIGNED_WINT_T
 
-/* Define to 1 if you have the <stdalign.h> header file. */
-#undef HAVE_STDALIGN_H
-
 /* Define to 1 if you have the <stdbool.h> header file. */
 #undef HAVE_STDBOOL_H
 
@@ -384,7 +402,7 @@
 /* Define to 1 if you have the `strchrnul' function. */
 #undef HAVE_STRCHRNUL
 
-/* Define if you have `strerror_r'. */
+/* Define if you have 'strerror_r'. */
 #undef HAVE_STRERROR_R
 
 /* Define to 1 if you have the <strings.h> header file. */
@@ -393,31 +411,31 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if `st_atimensec' is a member of `struct stat'. */
+/* Define to 1 if 'st_atimensec' is a member of 'struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_ATIMENSEC
 
-/* Define to 1 if `st_atimespec.tv_nsec' is a member of `struct stat'. */
+/* Define to 1 if 'st_atimespec.tv_nsec' is a member of 'struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC
 
-/* Define to 1 if `st_atim.st__tim.tv_nsec' is a member of `struct stat'. */
+/* Define to 1 if 'st_atim.st__tim.tv_nsec' is a member of 'struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC
 
-/* Define to 1 if `st_atim.tv_nsec' is a member of `struct stat'. */
+/* Define to 1 if 'st_atim.tv_nsec' is a member of 'struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC
 
-/* Define to 1 if `st_birthtimensec' is a member of `struct stat'. */
+/* Define to 1 if 'st_birthtimensec' is a member of 'struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC
 
-/* Define to 1 if `st_birthtimespec.tv_nsec' is a member of `struct stat'. */
+/* Define to 1 if 'st_birthtimespec.tv_nsec' is a member of 'struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC
 
-/* Define to 1 if `st_birthtim.tv_nsec' is a member of `struct stat'. */
+/* Define to 1 if 'st_birthtim.tv_nsec' is a member of 'struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC
 
-/* Define to 1 if you have the `strverscmp' function. */
+/* Define to 1 if you have the 'strverscmp' function. */
 #undef HAVE_STRVERSCMP
 
-/* Define to 1 if you have the `symlink' function. */
+/* Define to 1 if you have the 'symlink' function. */
 #undef HAVE_SYMLINK
 
 /* The toolchain supports aliases and .symver. */
@@ -450,6 +468,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to 1 if you have the <unistring/woe32dll.h> header file. */
+#undef HAVE_UNISTRING_WOE32DLL_H
+
 /* Define to 1 if the system has the type 'unsigned long long int'. */
 #undef HAVE_UNSIGNED_LONG_LONG_INT
 
@@ -478,7 +499,7 @@
 /* Define to 1 if O_NOFOLLOW works. */
 #undef HAVE_WORKING_O_NOFOLLOW
 
-/* Define to 1 if you have the `_set_invalid_parameter_handler' function. */
+/* Define to 1 if you have the '_set_invalid_parameter_handler' function. */
 #undef HAVE__SET_INVALID_PARAMETER_HANDLER
 
 /* Define to 1 if ctype.h defines __header_inline. */
@@ -540,7 +561,8 @@
 # define _GL_EXTERN_INLINE_STDHEADER_BUG
 #endif
 #if ((__GNUC__ \
-      ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
+      ? (defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
+         && !defined __PCC__) \
       : (199901L <= __STDC_VERSION__ \
          && !defined __HP_cc \
          && !defined __PGI \
@@ -550,6 +572,7 @@
 # define _GL_EXTERN_INLINE extern inline
 # define _GL_EXTERN_INLINE_IN_USE
 #elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
+       && !defined __PCC__ \
        && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
 # if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__
    /* __gnu_inline__ suppresses a GCC 4.2 diagnostic.  */
@@ -611,6 +634,9 @@
 #endif
 
 
+/* Define to 1 on musl libc. */
+#undef MUSL_LIBC
+
 /* Define to 1 if open() fails to recognize a trailing slash. */
 #undef OPEN_TRAILING_SLASH_BUG
 
@@ -675,10 +701,10 @@
 	STACK_DIRECTION = 0 => direction of growth unknown */
 #undef STACK_DIRECTION
 
-/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
+/* Define to 1 if the 'S_IS*' macros in <sys/stat.h> do not work properly. */
 #undef STAT_MACROS_BROKEN
 
-/* Define to 1 if all of the C90 standard headers exist (not just the ones
+/* Define to 1 if all of the C89 standard headers exist (not just the ones
    required in a freestanding environment). This macro is provided for
    backward compatibility; new code need not use it. */
 #undef STDC_HEADERS
@@ -690,7 +716,7 @@
    timespec. */
 #undef TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC
 
-/* Enable extensions on AIX 3, Interix.  */
+/* Enable extensions on AIX, Interix, z/OS.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
@@ -751,11 +777,15 @@
 #ifndef __STDC_WANT_IEC_60559_DFP_EXT__
 # undef __STDC_WANT_IEC_60559_DFP_EXT__
 #endif
+/* Enable extensions specified by C23 Annex F.  */
+#ifndef __STDC_WANT_IEC_60559_EXT__
+# undef __STDC_WANT_IEC_60559_EXT__
+#endif
 /* Enable extensions specified by ISO/IEC TS 18661-4:2015.  */
 #ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
 # undef __STDC_WANT_IEC_60559_FUNCS_EXT__
 #endif
-/* Enable extensions specified by ISO/IEC TS 18661-3:2015.  */
+/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015.  */
 #ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
 # undef __STDC_WANT_IEC_60559_TYPES_EXT__
 #endif
@@ -804,7 +834,7 @@
 /* Define to enable the declarations of ISO C 11 types and functions. */
 #undef _ISOC11_SOURCE
 
-/* Define for large files, on AIX-style hosts. */
+/* Define to 1 on platforms where this makes off_t a 64-bit type. */
 #undef _LARGE_FILES
 
 /* The _Noreturn keyword of C11.  */
@@ -820,6 +850,11 @@
        AIX system header files and several gnulib header files use precisely
        this syntax with 'extern'.  */
 #  define _Noreturn noreturn
+# elif (defined __clang__ && __clang_major__ < 16 \
+        && defined _GL_WORK_AROUND_LLVM_BUG_59792)
+   /* Compile with -D_GL_WORK_AROUND_LLVM_BUG_59792 to work around
+      that rare LLVM bug, though you may get many false-alarm warnings.  */
+#  define _Noreturn
 # elif ((!defined __cplusplus || defined __clang__) \
         && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \
             || (!defined __STRICT_ANSI__ \
@@ -838,7 +873,7 @@
 #endif
 
 
-/* Number of bits in a timestamp, on hosts where this is settable. */
+/* Number of bits in time_t, on hosts where this is settable. */
 #undef _TIME_BITS
 
 /* For standard stat data types on VMS. */
@@ -848,7 +883,7 @@
    used. */
 #undef __GETOPT_PREFIX
 
-/* For 64-bit time_t on 32-bit mingw. */
+/* Define to 1 on platforms where this makes time_t a 64-bit type. */
 #undef __MINGW_USE_VC2005_COMPAT
 
 /* Define to 1 if the system <stdint.h> predates C++11. */
@@ -893,7 +928,7 @@
      && (!defined __clang_minor__ \
          || (defined __apple_build_version__ \
              ? 6000000 <= __apple_build_version__ \
-             : 3 < __clang_major__ + (5 <= __clang_minor__))))
+             : 5 <= __clang_major__)))
 # define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__)
 #else
 # define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr
@@ -927,16 +962,30 @@
 # define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4)
 #endif
 
-#ifdef __has_c_attribute
-# if ((defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) <= 201710 \
-      && _GL_GNUC_PREREQ (4, 6))
-#  pragma GCC diagnostic ignored "-Wpedantic"
-# endif
-# define _GL_HAS_C_ATTRIBUTE(attr) __has_c_attribute (__##attr##__)
+/* Use __has_c_attribute if available.  However, do not use with
+   pre-C23 GCC, which can issue false positives if -Wpedantic.  */
+#if (defined __has_c_attribute \
+     && ! (_GL_GNUC_PREREQ (4, 6) \
+           && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) <= 201710))
+# define _GL_HAVE___HAS_C_ATTRIBUTE 1
 #else
-# define _GL_HAS_C_ATTRIBUTE(attr) 0
+# define _GL_HAVE___HAS_C_ATTRIBUTE 0
 #endif
 
+/* Define if, in a function declaration, the attributes in bracket syntax
+   ... must come before the attributes in __attribute__((...)) syntax.
+   If this is defined, it is best to avoid the bracket syntax, so that the
+   various _GL_ATTRIBUTE_* can be cumulated on the same declaration in any
+   order.  */
+#ifdef __cplusplus
+# if defined __clang__
+#  define _GL_BRACKET_BEFORE_ATTRIBUTE 1
+# endif
+#else
+# if defined __GNUC__ && !defined __clang__
+#  define _GL_BRACKET_BEFORE_ATTRIBUTE 1
+# endif
+#endif
 
 /* _GL_ATTRIBUTE_ALLOC_SIZE ((N)) declares that the Nth argument of the function
    is the size of the returned memory block.
@@ -944,29 +993,35 @@
    by the Nth argument of the function is the size of the returned memory block.
  */
 /* Applies to: function, pointer to function, function types.  */
-#if _GL_HAS_ATTRIBUTE (alloc_size)
-# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args))
-#else
-# define _GL_ATTRIBUTE_ALLOC_SIZE(args)
+#ifndef _GL_ATTRIBUTE_ALLOC_SIZE
+# if _GL_HAS_ATTRIBUTE (alloc_size)
+#  define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args))
+# else
+#  define _GL_ATTRIBUTE_ALLOC_SIZE(args)
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_ALWAYS_INLINE tells that the compiler should always inline the
    function and report an error if it cannot do so.  */
 /* Applies to: function.  */
-#if _GL_HAS_ATTRIBUTE (always_inline)
-# define _GL_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((__always_inline__))
-#else
-# define _GL_ATTRIBUTE_ALWAYS_INLINE
+#ifndef _GL_ATTRIBUTE_ALWAYS_INLINE
+# if _GL_HAS_ATTRIBUTE (always_inline)
+#  define _GL_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((__always_inline__))
+# else
+#  define _GL_ATTRIBUTE_ALWAYS_INLINE
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_ARTIFICIAL declares that the function is not important to show
     in stack traces when debugging.  The compiler should omit the function from
     stack traces.  */
 /* Applies to: function.  */
-#if _GL_HAS_ATTRIBUTE (artificial)
-# define _GL_ATTRIBUTE_ARTIFICIAL __attribute__ ((__artificial__))
-#else
-# define _GL_ATTRIBUTE_ARTIFICIAL
+#ifndef _GL_ATTRIBUTE_ARTIFICIAL
+# if _GL_HAS_ATTRIBUTE (artificial)
+#  define _GL_ATTRIBUTE_ARTIFICIAL __attribute__ ((__artificial__))
+# else
+#  define _GL_ATTRIBUTE_ARTIFICIAL
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_COLD declares that the function is rarely executed.  */
@@ -974,14 +1029,16 @@
 /* Avoid __attribute__ ((cold)) on MinGW; see thread starting at
    <https://lists.gnu.org/r/emacs-devel/2019-04/msg01152.html>.
    Also, Oracle Studio 12.6 requires 'cold' not '__cold__'.  */
-#if _GL_HAS_ATTRIBUTE (cold) && !defined __MINGW32__
-# ifndef __SUNPRO_C
-#  define _GL_ATTRIBUTE_COLD __attribute__ ((__cold__))
+#ifndef _GL_ATTRIBUTE_COLD
+# if _GL_HAS_ATTRIBUTE (cold) && !defined __MINGW32__
+#  ifndef __SUNPRO_C
+#   define _GL_ATTRIBUTE_COLD __attribute__ ((__cold__))
+#  else
+#   define _GL_ATTRIBUTE_COLD __attribute__ ((cold))
+#  endif
 # else
-#  define _GL_ATTRIBUTE_COLD __attribute__ ((cold))
+#  define _GL_ATTRIBUTE_COLD
 # endif
-#else
-# define _GL_ATTRIBUTE_COLD
 #endif
 
 /* _GL_ATTRIBUTE_CONST declares that it is OK for a compiler to omit duplicate
@@ -991,10 +1048,12 @@
    forever, and does not call longjmp.
    (This attribute is stricter than _GL_ATTRIBUTE_PURE.)  */
 /* Applies to: functions.  */
-#if _GL_HAS_ATTRIBUTE (const)
-# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__))
-#else
-# define _GL_ATTRIBUTE_CONST
+#ifndef _GL_ATTRIBUTE_CONST
+# if _GL_HAS_ATTRIBUTE (const)
+#  define _GL_ATTRIBUTE_CONST __attribute__ ((__const__))
+# else
+#  define _GL_ATTRIBUTE_CONST
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_DEALLOC (F, I) declares that the function returns pointers
@@ -1003,16 +1062,25 @@
    _GL_ATTRIBUTE_DEALLOC_FREE declares that the function returns pointers that
    can be freed via 'free'; it can be used only after declaring 'free'.  */
 /* Applies to: functions.  Cannot be used on inline functions.  */
-#if _GL_GNUC_PREREQ (11, 0)
-# define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i)))
-#else
-# define _GL_ATTRIBUTE_DEALLOC(f, i)
+#ifndef _GL_ATTRIBUTE_DEALLOC
+# if _GL_GNUC_PREREQ (11, 0)
+#  define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i)))
+# else
+#  define _GL_ATTRIBUTE_DEALLOC(f, i)
+# endif
 #endif
 /* If gnulib's <string.h> or <wchar.h> has already defined this macro, continue
    to use this earlier definition, since <stdlib.h> may not have been included
    yet.  */
 #ifndef _GL_ATTRIBUTE_DEALLOC_FREE
-# define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (free, 1)
+# if defined __cplusplus && defined __GNUC__ && !defined __clang__
+/* Work around GCC bug <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108231> */
+#  define _GL_ATTRIBUTE_DEALLOC_FREE \
+     _GL_ATTRIBUTE_DEALLOC ((void (*) (void *)) free, 1)
+# else
+#  define _GL_ATTRIBUTE_DEALLOC_FREE \
+     _GL_ATTRIBUTE_DEALLOC (free, 1)
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_DEPRECATED: Declares that an entity is deprecated.
@@ -1023,12 +1091,20 @@
      - enumeration, enumeration item,
      - typedef,
    in C++ also: namespace, class, template specialization.  */
-#if _GL_HAS_C_ATTRIBUTE (deprecated)
-# define _GL_ATTRIBUTE_DEPRECATED __deprecated__
-#elif _GL_HAS_ATTRIBUTE (deprecated)
-# define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__))
-#else
-# define _GL_ATTRIBUTE_DEPRECATED
+#ifndef _GL_ATTRIBUTE_DEPRECATED
+# ifndef _GL_BRACKET_BEFORE_ATTRIBUTE
+#  if _GL_HAVE___HAS_C_ATTRIBUTE
+#   if __has_c_attribute (__deprecated__)
+#    define _GL_ATTRIBUTE_DEPRECATED __deprecated__
+#   endif
+#  endif
+# endif
+# if !defined _GL_ATTRIBUTE_DEPRECATED && _GL_HAS_ATTRIBUTE (deprecated)
+#  define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__))
+# endif
+# ifndef _GL_ATTRIBUTE_DEPRECATED
+#  define _GL_ATTRIBUTE_DEPRECATED
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_ERROR(msg) requests an error if a function is called and
@@ -1036,24 +1112,28 @@
    _GL_ATTRIBUTE_WARNING(msg) requests a warning if a function is called and
    the function call is not optimized away.  */
 /* Applies to: functions.  */
-#if _GL_HAS_ATTRIBUTE (error)
-# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__error__ (msg)))
-# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__warning__ (msg)))
-#elif _GL_HAS_ATTRIBUTE (diagnose_if)
-# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__diagnose_if__ (1, msg, "error")))
-# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__diagnose_if__ (1, msg, "warning")))
-#else
-# define _GL_ATTRIBUTE_ERROR(msg)
-# define _GL_ATTRIBUTE_WARNING(msg)
+#if !(defined _GL_ATTRIBUTE_ERROR && defined _GL_ATTRIBUTE_WARNING)
+# if _GL_HAS_ATTRIBUTE (error)
+#  define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__error__ (msg)))
+#  define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__warning__ (msg)))
+# elif _GL_HAS_ATTRIBUTE (diagnose_if)
+#  define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__diagnose_if__ (1, msg, "error")))
+#  define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__diagnose_if__ (1, msg, "warning")))
+# else
+#  define _GL_ATTRIBUTE_ERROR(msg)
+#  define _GL_ATTRIBUTE_WARNING(msg)
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_EXTERNALLY_VISIBLE declares that the entity should remain
    visible to debuggers etc., even with '-fwhole-program'.  */
 /* Applies to: functions, variables.  */
-#if _GL_HAS_ATTRIBUTE (externally_visible)
-# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((externally_visible))
-#else
-# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE
+#ifndef _GL_ATTRIBUTE_EXTERNALLY_VISIBLE
+# if _GL_HAS_ATTRIBUTE (externally_visible)
+#  define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((externally_visible))
+# else
+#  define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_FALLTHROUGH declares that it is not a programming mistake if
@@ -1061,12 +1141,18 @@
    'default' label.  The compiler should not warn in this case.  */
 /* Applies to: Empty statement (;), inside a 'switch' statement.  */
 /* Always expands to something.  */
-#if _GL_HAS_C_ATTRIBUTE (fallthrough)
-# define _GL_ATTRIBUTE_FALLTHROUGH __fallthrough__
-#elif _GL_HAS_ATTRIBUTE (fallthrough)
-# define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__))
-#else
-# define _GL_ATTRIBUTE_FALLTHROUGH ((void) 0)
+#ifndef _GL_ATTRIBUTE_FALLTHROUGH
+# if _GL_HAVE___HAS_C_ATTRIBUTE
+#  if __has_c_attribute (__fallthrough__)
+#   define _GL_ATTRIBUTE_FALLTHROUGH __fallthrough__
+#  endif
+# endif
+# if !defined _GL_ATTRIBUTE_FALLTHROUGH && _GL_HAS_ATTRIBUTE (fallthrough)
+#  define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__))
+# endif
+# ifndef _GL_ATTRIBUTE_FALLTHROUGH
+#  define _GL_ATTRIBUTE_FALLTHROUGH ((void) 0)
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_FORMAT ((ARCHETYPE, STRING-INDEX, FIRST-TO-CHECK))
@@ -1080,10 +1166,12 @@
    If FIRST-TO-CHECK is not 0, arguments starting at FIRST-TO_CHECK
    are suitable for the format string.  */
 /* Applies to: functions.  */
-#if _GL_HAS_ATTRIBUTE (format)
-# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
-#else
-# define _GL_ATTRIBUTE_FORMAT(spec)
+#ifndef _GL_ATTRIBUTE_FORMAT
+# if _GL_HAS_ATTRIBUTE (format)
+#  define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
+# else
+#  define _GL_ATTRIBUTE_FORMAT(spec)
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_LEAF declares that if the function is called from some other
@@ -1091,19 +1179,23 @@
    exception handling.  This declaration lets the compiler optimize that unit
    more aggressively.  */
 /* Applies to: functions.  */
-#if _GL_HAS_ATTRIBUTE (leaf)
-# define _GL_ATTRIBUTE_LEAF __attribute__ ((__leaf__))
-#else
-# define _GL_ATTRIBUTE_LEAF
+#ifndef _GL_ATTRIBUTE_LEAF
+# if _GL_HAS_ATTRIBUTE (leaf)
+#  define _GL_ATTRIBUTE_LEAF __attribute__ ((__leaf__))
+# else
+#  define _GL_ATTRIBUTE_LEAF
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_MALLOC declares that the function returns a pointer to freshly
    allocated memory.  */
 /* Applies to: functions.  */
-#if _GL_HAS_ATTRIBUTE (malloc)
-# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
-#else
-# define _GL_ATTRIBUTE_MALLOC
+#ifndef _GL_ATTRIBUTE_MALLOC
+# if _GL_HAS_ATTRIBUTE (malloc)
+#  define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
+# else
+#  define _GL_ATTRIBUTE_MALLOC
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_MAY_ALIAS declares that pointers to the type may point to the
@@ -1111,10 +1203,12 @@
    strict aliasing optimization.  */
 /* Applies to: types.  */
 /* Oracle Studio 12.6 mishandles may_alias despite __has_attribute OK.  */
-#if _GL_HAS_ATTRIBUTE (may_alias) && !defined __SUNPRO_C
-# define _GL_ATTRIBUTE_MAY_ALIAS __attribute__ ((__may_alias__))
-#else
-# define _GL_ATTRIBUTE_MAY_ALIAS
+#ifndef _GL_ATTRIBUTE_MAY_ALIAS
+# if _GL_HAS_ATTRIBUTE (may_alias) && !defined __SUNPRO_C
+#  define _GL_ATTRIBUTE_MAY_ALIAS __attribute__ ((__may_alias__))
+# else
+#  define _GL_ATTRIBUTE_MAY_ALIAS
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_MAYBE_UNUSED declares that it is not a programming mistake if
@@ -1126,13 +1220,26 @@
      - enumeration, enumeration item,
      - typedef,
    in C++ also: class.  */
-/* In C++ and C2x, this is spelled __maybe_unused__.
+/* In C++ and C23, this is spelled __maybe_unused__.
    GCC's syntax is __attribute__ ((__unused__)).
-   clang supports both syntaxes.  */
-#if _GL_HAS_C_ATTRIBUTE (maybe_unused)
-# define _GL_ATTRIBUTE_MAYBE_UNUSED __maybe_unused__
-#else
-# define _GL_ATTRIBUTE_MAYBE_UNUSED _GL_ATTRIBUTE_UNUSED
+   clang supports both syntaxes.  Except that with clang ≥ 6, < 10, in C++ mode,
+   __has_c_attribute (__maybe_unused__) yields true but the use of
+   __maybe_unused__ nevertheless produces a warning.  */
+#ifndef _GL_ATTRIBUTE_MAYBE_UNUSED
+# ifndef _GL_BRACKET_BEFORE_ATTRIBUTE
+#  if defined __clang__ && defined __cplusplus
+#   if !defined __apple_build_version__ && __clang_major__ >= 10
+#    define _GL_ATTRIBUTE_MAYBE_UNUSED __maybe_unused__
+#   endif
+#  elif _GL_HAVE___HAS_C_ATTRIBUTE
+#   if __has_c_attribute (__maybe_unused__)
+#    define _GL_ATTRIBUTE_MAYBE_UNUSED __maybe_unused__
+#   endif
+#  endif
+# endif
+# ifndef _GL_ATTRIBUTE_MAYBE_UNUSED
+#  define _GL_ATTRIBUTE_MAYBE_UNUSED _GL_ATTRIBUTE_UNUSED
+# endif
 #endif
 /* Alternative spelling of this macro, for convenience and for
    compatibility with glibc/include/libc-symbols.h.  */
@@ -1144,21 +1251,40 @@
    discard the return value.  The compiler may warn if the caller does not use
    the return value, unless the caller uses something like ignore_value.  */
 /* Applies to: function, enumeration, class.  */
-#if _GL_HAS_C_ATTRIBUTE (nodiscard)
-# define _GL_ATTRIBUTE_NODISCARD __nodiscard__
-#elif _GL_HAS_ATTRIBUTE (warn_unused_result)
-# define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__))
-#else
-# define _GL_ATTRIBUTE_NODISCARD
+#ifndef _GL_ATTRIBUTE_NODISCARD
+# ifndef _GL_BRACKET_BEFORE_ATTRIBUTE
+#  if defined __clang__ && defined __cplusplus
+  /* With clang up to 15.0.6 (at least), in C++ mode, __nodiscard__ produces
+     a warning.
+     The 1000 below means a yet unknown threshold.  When clang++ version X
+     starts supporting __nodiscard__ without warning about it, you can
+     replace the 1000 with X.  */
+#   if __clang_major__ >= 1000
+#    define _GL_ATTRIBUTE_NODISCARD __nodiscard__
+#   endif
+#  elif _GL_HAVE___HAS_C_ATTRIBUTE
+#   if __has_c_attribute (__nodiscard__)
+#    define _GL_ATTRIBUTE_NODISCARD __nodiscard__
+#   endif
+#  endif
+# endif
+# if !defined _GL_ATTRIBUTE_NODISCARD && _GL_HAS_ATTRIBUTE (warn_unused_result)
+#  define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__))
+# endif
+# ifndef _GL_ATTRIBUTE_NODISCARD
+#  define _GL_ATTRIBUTE_NODISCARD
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_NOINLINE tells that the compiler should not inline the
    function.  */
 /* Applies to: functions.  */
-#if _GL_HAS_ATTRIBUTE (noinline)
-# define _GL_ATTRIBUTE_NOINLINE __attribute__ ((__noinline__))
-#else
-# define _GL_ATTRIBUTE_NOINLINE
+#ifndef _GL_ATTRIBUTE_NOINLINE
+# if _GL_HAS_ATTRIBUTE (noinline)
+#  define _GL_ATTRIBUTE_NOINLINE __attribute__ ((__noinline__))
+# else
+#  define _GL_ATTRIBUTE_NOINLINE
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_NONNULL ((N1, N2,...)) declares that the arguments N1, N2,...
@@ -1166,20 +1292,24 @@
    _GL_ATTRIBUTE_NONNULL () declares that all pointer arguments must not be
    null.  */
 /* Applies to: functions.  */
-#if _GL_HAS_ATTRIBUTE (nonnull)
-# define _GL_ATTRIBUTE_NONNULL(args) __attribute__ ((__nonnull__ args))
-#else
-# define _GL_ATTRIBUTE_NONNULL(args)
+#ifndef _GL_ATTRIBUTE_NONNULL
+# if _GL_HAS_ATTRIBUTE (nonnull)
+#  define _GL_ATTRIBUTE_NONNULL(args) __attribute__ ((__nonnull__ args))
+# else
+#  define _GL_ATTRIBUTE_NONNULL(args)
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_NONSTRING declares that the contents of a character array is
    not meant to be NUL-terminated.  */
 /* Applies to: struct/union members and variables that are arrays of element
    type 'unsigned char'.  */
-#if _GL_HAS_ATTRIBUTE (nonstring)
-# define _GL_ATTRIBUTE_NONSTRING __attribute__ ((__nonstring__))
-#else
-# define _GL_ATTRIBUTE_NONSTRING
+#ifndef _GL_ATTRIBUTE_NONSTRING
+# if _GL_HAS_ATTRIBUTE (nonstring)
+#  define _GL_ATTRIBUTE_NONSTRING __attribute__ ((__nonstring__))
+# else
+#  define _GL_ATTRIBUTE_NONSTRING
+# endif
 #endif
 
 /* There is no _GL_ATTRIBUTE_NORETURN; use _Noreturn instead.  */
@@ -1187,10 +1317,26 @@
 /* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions.
  */
 /* Applies to: functions.  */
-#if _GL_HAS_ATTRIBUTE (nothrow) && !defined __cplusplus
-# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__))
-#else
-# define _GL_ATTRIBUTE_NOTHROW
+/* After a function's parameter list, this attribute must come first, before
+   other attributes.  */
+#ifndef _GL_ATTRIBUTE_NOTHROW
+# if defined __cplusplus
+#  if _GL_GNUC_PREREQ (2, 8) || __clang_major >= 4
+#   if __cplusplus >= 201103L
+#    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
+#   else
+#    define _GL_ATTRIBUTE_NOTHROW throw ()
+#   endif
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# else
+#  if _GL_HAS_ATTRIBUTE (nothrow)
+#   define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__))
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_PACKED declares:
@@ -1199,10 +1345,12 @@
    minimizing the memory required.  */
 /* Applies to: struct members, struct, union,
    in C++ also: class.  */
-#if _GL_HAS_ATTRIBUTE (packed)
-# define _GL_ATTRIBUTE_PACKED __attribute__ ((__packed__))
-#else
-# define _GL_ATTRIBUTE_PACKED
+#ifndef _GL_ATTRIBUTE_PACKED
+# if _GL_HAS_ATTRIBUTE (packed)
+#  define _GL_ATTRIBUTE_PACKED __attribute__ ((__packed__))
+# else
+#  define _GL_ATTRIBUTE_PACKED
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_PURE declares that It is OK for a compiler to omit duplicate
@@ -1212,19 +1360,23 @@
    observable state, and always returns exactly once.
    (This attribute is looser than _GL_ATTRIBUTE_CONST.)  */
 /* Applies to: functions.  */
-#if _GL_HAS_ATTRIBUTE (pure)
-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-# define _GL_ATTRIBUTE_PURE
+#ifndef _GL_ATTRIBUTE_PURE
+# if _GL_HAS_ATTRIBUTE (pure)
+#  define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
+# else
+#  define _GL_ATTRIBUTE_PURE
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_RETURNS_NONNULL declares that the function's return value is
    a non-NULL pointer.  */
 /* Applies to: functions.  */
-#if _GL_HAS_ATTRIBUTE (returns_nonnull)
-# define _GL_ATTRIBUTE_RETURNS_NONNULL __attribute__ ((__returns_nonnull__))
-#else
-# define _GL_ATTRIBUTE_RETURNS_NONNULL
+#ifndef _GL_ATTRIBUTE_RETURNS_NONNULL
+# if _GL_HAS_ATTRIBUTE (returns_nonnull)
+#  define _GL_ATTRIBUTE_RETURNS_NONNULL __attribute__ ((__returns_nonnull__))
+# else
+#  define _GL_ATTRIBUTE_RETURNS_NONNULL
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_SENTINEL(pos) declares that the variadic function expects a
@@ -1232,17 +1384,21 @@
    _GL_ATTRIBUTE_SENTINEL () - The last argument is NULL (requires C99).
    _GL_ATTRIBUTE_SENTINEL ((N)) - The (N+1)st argument from the end is NULL.  */
 /* Applies to: functions.  */
-#if _GL_HAS_ATTRIBUTE (sentinel)
-# define _GL_ATTRIBUTE_SENTINEL(pos) __attribute__ ((__sentinel__ pos))
-#else
-# define _GL_ATTRIBUTE_SENTINEL(pos)
+#ifndef _GL_ATTRIBUTE_SENTINEL
+# if _GL_HAS_ATTRIBUTE (sentinel)
+#  define _GL_ATTRIBUTE_SENTINEL(pos) __attribute__ ((__sentinel__ pos))
+# else
+#  define _GL_ATTRIBUTE_SENTINEL(pos)
+# endif
 #endif
 
 /* A helper macro.  Don't use it directly.  */
-#if _GL_HAS_ATTRIBUTE (unused)
-# define _GL_ATTRIBUTE_UNUSED __attribute__ ((__unused__))
-#else
-# define _GL_ATTRIBUTE_UNUSED
+#ifndef _GL_ATTRIBUTE_UNUSED
+# if _GL_HAS_ATTRIBUTE (unused)
+#  define _GL_ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+# else
+#  define _GL_ATTRIBUTE_UNUSED
+# endif
 #endif
 
 
@@ -1252,17 +1408,31 @@
 /* Applies to: label (both in C and C++).  */
 /* Note that g++ < 4.5 does not support the '__attribute__ ((__unused__)) ;'
    syntax.  But clang does.  */
-#if !(defined __cplusplus && !_GL_GNUC_PREREQ (4, 5)) || defined __clang__
-# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_UNUSED
+#ifndef _GL_UNUSED_LABEL
+# if !(defined __cplusplus && !_GL_GNUC_PREREQ (4, 5)) || defined __clang__
+#  define _GL_UNUSED_LABEL _GL_ATTRIBUTE_UNUSED
+# else
+#  define _GL_UNUSED_LABEL
+# endif
+#endif
+
+
+/* In C++, there is the concept of "language linkage", that encompasses
+    name mangling and function calling conventions.
+    The following macros start and end a block of "C" linkage.  */
+#ifdef __cplusplus
+# define _GL_BEGIN_C_LINKAGE extern "C" {
+# define _GL_END_C_LINKAGE }
 #else
-# define _GL_UNUSED_LABEL
+# define _GL_BEGIN_C_LINKAGE
+# define _GL_END_C_LINKAGE
 #endif
 
 
 /* A replacement for va_copy, if needed.  */
 #define gl_va_copy(a,b) ((a) = (b))
 
-/* Define to `__inline__' or `__inline' if that's what the C compiler
+/* Define to '__inline__' or '__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
 #undef inline
@@ -1294,7 +1464,7 @@
 #define _GL_CMP(n1, n2) (((n1) > (n2)) - ((n1) < (n2)))
 
 
-/* Define to `int' if <sys/types.h> does not define. */
+/* Define to 'int' if <sys/types.h> does not define. */
 #undef mode_t
 
 /* Define to the type of st_nlink in struct stat, or a supertype. */
@@ -1318,7 +1488,7 @@
 # define __restrict__
 #endif
 
-/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* Define as 'unsigned int' if <stddef.h> doesn't define. */
 #undef size_t
 
 /* Define as a signed type of the same size as size_t. */
@@ -1343,67 +1513,6 @@
 /* Define as a macro for copying va_list variables. */
 #undef va_copy
 
-#if !defined HAVE_C_ALIGNASOF && __cplusplus < 201103 && !defined alignof
-# if HAVE_STDALIGN_H
-#  include <stdalign.h>
-# else
-   /* Substitute.  Keep consistent with gnulib/lib/stdalign.in.h.  */
-#  ifndef _GL_STDALIGN_H
-#   define _GL_STDALIGN_H
-#   undef _Alignas
-#   undef _Alignof
-#   if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \
-        || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \
-            && !defined __clang__) \
-        || (defined __clang__ && __clang_major__ < 8))
-#    ifdef __cplusplus
-#     if (201103 <= __cplusplus || defined _MSC_VER)
-#      define _Alignof(type) alignof (type)
-#     else
-       template <class __t> struct __alignof_helper { char __a; __t __b; };
-#      define _Alignof(type) offsetof (__alignof_helper<type>, __b)
-#      define _GL_STDALIGN_NEEDS_STDDEF 1
-#     endif
-#    else
-#     define _Alignof(type) offsetof (struct { char __a; type __b; }, __b)
-#     define _GL_STDALIGN_NEEDS_STDDEF 1
-#    endif
-#   endif
-#   if ! (defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER))
-#    define alignof _Alignof
-#   endif
-#   define __alignof_is_defined 1
-#   if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112
-#    if defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER)
-#     define _Alignas(a) alignas (a)
-#    elif (!defined __attribute__ \
-           && ((defined __APPLE__ && defined __MACH__ \
-                ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \
-                : __GNUC__ && !defined __ibmxl__) \
-               || (4 <= __clang_major__) \
-               || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \
-               || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__))
-#     define _Alignas(a) __attribute__ ((__aligned__ (a)))
-#    elif 1300 <= _MSC_VER
-#     define _Alignas(a) __declspec (align (a))
-#    endif
-#   endif
-#   if ((defined _Alignas \
-         && !(defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER))) \
-        || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
-#    define alignas _Alignas
-#   endif
-#   if (defined alignas \
-        || (defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER)))
-#    define __alignas_is_defined 1
-#   endif
-#   if _GL_STDALIGN_NEEDS_STDDEF
-#    include <stddef.h>
-#   endif
-#  endif /* _GL_STDALIGN_H */
-# endif
-#endif
-
 #ifndef HAVE_C_BOOL
 # if !defined __cplusplus && !defined __bool_true_false_are_defined
 #  if HAVE_STDBOOL_H
@@ -1427,4 +1536,13 @@
              && __GNUG__ < 6 && __clang_major__ < 6)))
  #include <assert.h>
  #undef/**/assert
+ #ifdef __sgi
+  #undef/**/__ASSERT_H__
+ #endif
+ /* Solaris 11.4 <assert.h> defines static_assert as a macro with 2 arguments.
+    We need it also to be invocable with a single argument.  */
+ #if defined __sun && (__STDC_VERSION__ - 0 >= 201112L) && !defined __cplusplus
+  #undef/**/static_assert
+  #define static_assert _Static_assert
+ #endif
 #endif

_service:tar_scm:libidn2-2.3.4.tar.gz/configure -> _service:tar_scm:libidn2-2.3.7.tar.gz/configure Changed

@@ -1,11 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for Libidn2 2.3.4.
+# Generated by GNU Autoconf 2.72 for Libidn2 2.3.7.
 #
 # Report bugs to <help-libidn@gnu.org>.
 #
 #
-# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
+# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
 # Inc.
 #
 #
@@ -17,7 +17,6 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-as_nop=:
 if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
 then :
   emulate sh
@@ -26,12 +25,13 @@
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else $as_nop
-  case `(set -o) 2>/dev/null` in #(
+else case e in #(
+  e) case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
+esac ;;
 esac
 fi
 
@@ -103,7 +103,7 @@
 
      ;;
 esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
+# We did not find ourselves, most probably we were run as 'sh COMMAND'
 # in which case we are not to be found in the path.
 if test "x$as_myself" = x; then
   as_myself=$0
@@ -133,15 +133,14 @@
 esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
+# out after a failed 'exec'.
 printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
   fi
   # We don't want this to propagate to other subprocesses.
           { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="as_nop=:
-if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+  as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
 then :
   emulate sh
   NULLCMD=:
@@ -149,12 +148,13 @@
   # is contrary to our usage.  Disable this feature.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
-else \$as_nop
-  case \`(set -o) 2>/dev/null\` in #(
+else case e in #(
+  e) case \`(set -o) 2>/dev/null\` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
+esac ;;
 esac
 fi
 "
@@ -172,8 +172,9 @@
 if ( set x; as_fn_ret_success y && test x = \"\$1\" )
 then :
 
-else \$as_nop
-  exitcode=1; echo positional parameters were not saved.
+else case e in #(
+  e) exitcode=1; echo positional parameters were not saved. ;;
+esac
 fi
 test x\$exitcode = x0 || exit 1
 blah=\$(echo \$(echo blah))
@@ -195,14 +196,15 @@
   if (eval "$as_required") 2>/dev/null
 then :
   as_have_required=yes
-else $as_nop
-  as_have_required=no
+else case e in #(
+  e) as_have_required=no ;;
+esac
 fi
   if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
 then :
 
-else $as_nop
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+else case e in #(
+  e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
@@ -235,12 +237,13 @@
 if $as_found
 then :
 
-else $as_nop
-  if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+else case e in #(
+  e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
 	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
 then :
   CONFIG_SHELL=$SHELL as_have_required=yes
-fi
+fi ;;
+esac
 fi
 
 
@@ -262,7 +265,7 @@
 esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
+# out after a failed 'exec'.
 printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
@@ -282,7 +285,8 @@
 $0: shell if you do have one."
   fi
   exit 1
-fi
+fi ;;
+esac
 fi
 fi
 SHELL=${CONFIG_SHELL-/bin/sh}
@@ -321,14 +325,6 @@
   as_fn_set_status $1
   exit $1
 } # as_fn_exit
-# as_fn_nop
-# ---------
-# Do nothing but, unlike ":", preserve the value of $?.
-as_fn_nop ()
-{
-  return $?
-}
-as_nop=as_fn_nop
 
 # as_fn_mkdir_p
 # -------------
@@ -397,11 +393,12 @@
   {
     eval $1+=\$2
   }'
-else $as_nop
-  as_fn_append ()
+else case e in #(
+  e) as_fn_append ()
   {
     eval $1=\$$1\$2
-  }
+  } ;;
+esac
 fi # as_fn_append
 
 # as_fn_arith ARG...
@@ -415,21 +412,14 @@
   {
     as_val=$(( $* ))
   }'
-else $as_nop
-  as_fn_arith ()
+else case e in #(
+  e) as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
-  }
+  } ;;
+esac
 fi # as_fn_arith
 
-# as_fn_nop
-# ---------
-# Do nothing but, unlike ":", preserve the value of $?.
-as_fn_nop ()
-{
-  return $?
-}
-as_nop=as_fn_nop
 
 # as_fn_error STATUS ERROR LINENO LOG_FD
 # ----------------------------------------
@@ -503,6 +493,8 @@
     /$LINENO/=
   ' <$as_myself |
     sed '
+      t clear
+      :clear
       s/$LINENO.*/&-/
       t lineno
       b
@@ -551,7 +543,6 @@
 as_echo='printf %s\n'
 as_echo_n='printf %s'
 
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -563,9 +554,9 @@
   if ln -s conf$$.file conf$$ 2>/dev/null; then
     as_ln_s='ln -s'
     # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable.
+    # In both cases, we have to default to 'cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
       as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
@@ -590,10 +581,12 @@
 as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g'"
+as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g"
+as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated
 
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%^_$as_cr_alnum%_%g'"
+as_sed_sh="y%*+%pp%;s%^_$as_cr_alnum%_%g"
+as_tr_sh="eval sed '$as_sed_sh'" # deprecated
 
 SHELL=${CONFIG_SHELL-/bin/sh}
 
@@ -621,8 +614,8 @@
 # Identity of this package.
 PACKAGE_NAME='Libidn2'
 PACKAGE_TARNAME='libidn2'
-PACKAGE_VERSION='2.3.4'
-PACKAGE_STRING='Libidn2 2.3.4'
+PACKAGE_VERSION='2.3.7'
+PACKAGE_STRING='Libidn2 2.3.7'
 PACKAGE_BUGREPORT='help-libidn@gnu.org'
 PACKAGE_URL='https://www.gnu.org/software/libidn/#libidn2'
 
@@ -661,6 +654,7 @@
 ac_func_c_list=
 gl_getopt_required=POSIX
 gt_needs=
+enable_year2038=no
 ac_subst_vars='unistringtests_LIBOBJDEPS
 unistringtests_LTLIBOBJS
 unistringtests_LIBOBJS
@@ -681,6 +675,8 @@
 ENABLE_DOC_FALSE
 ENABLE_DOC_TRUE
 WARN_CFLAGS
+WERROR_TESTS_CFLAGS
+WERROR_CFLAGS
 CODE_COVERAGE_LIBS
 CODE_COVERAGE_CXXFLAGS
 CODE_COVERAGE_CFLAGS
@@ -730,6 +726,7 @@
 TEST_GLIBC_TRUE
 unistringtests_WITNESS
 GL_UNISTRING_GNULIB_MDA_WCSDUP
+GL_UNISTRING_GNULIB_WGETCWD
 GL_UNISTRING_GNULIB_WCSFTIME
 GL_UNISTRING_GNULIB_WCSWIDTH
 GL_UNISTRING_GNULIB_WCSTOK
@@ -768,6 +765,7 @@
 GL_UNISTRING_GNULIB_MBSRTOWCS
 GL_UNISTRING_GNULIB_MBRLEN
 GL_UNISTRING_GNULIB_MBRTOWC
+GL_UNISTRING_GNULIB_MBSZERO
 GL_UNISTRING_GNULIB_MBSINIT
 GL_UNISTRING_GNULIB_WCTOB
 GL_UNISTRING_GNULIB_BTOWC
@@ -776,7 +774,12 @@
 HAVE_FEATURES_H
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H
 NEXT_WCHAR_H
+REPLACE_WMEMPCPY
+REPLACE_WMEMCMP
 REPLACE_WCSTOK
+REPLACE_WCSSTR
+REPLACE_WCSNCMP
+REPLACE_WCSCMP
 REPLACE_WCSFTIME
 REPLACE_WCSWIDTH
 REPLACE_WCWIDTH
@@ -961,6 +964,10 @@
 LIBUNISTRING_COMPILE_UNINORM_COMPOSITION_TRUE
 LIBUNISTRING_COMPILE_UNINORM_CANONICAL_DECOMPOSITION_FALSE
 LIBUNISTRING_COMPILE_UNINORM_CANONICAL_DECOMPOSITION_TRUE
+GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE
 LIBUNISTRING_UNINORM_H
 LIBUNISTRING_COMPILE_UNICTYPE_SCRIPTS_FALSE
 LIBUNISTRING_COMPILE_UNICTYPE_SCRIPTS_TRUE
@@ -972,12 +979,141 @@
 LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_TEST_TRUE
 LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_OF_FALSE
 LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_OF_TRUE
-LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NONE_FALSE
-LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NONE_TRUE
 LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_M_FALSE
 LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_M_TRUE
 LIBUNISTRING_COMPILE_UNICTYPE_BIDICLASS_OF_FALSE
 LIBUNISTRING_COMPILE_UNICTYPE_BIDICLASS_OF_TRUE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE
 LIBUNISTRING_UNICTYPE_H
 LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_TO_LOCALE_FALSE
 LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_TO_LOCALE_TRUE
@@ -990,6 +1126,7 @@
 LIBUNISTRING_COMPILE_UNICONV_U8_CONV_FROM_ENC_FALSE
 LIBUNISTRING_COMPILE_UNICONV_U8_CONV_FROM_ENC_TRUE
 LIBUNISTRING_UNICONV_H
+HAVE_UNISTRING_WOE32DLL_H
 GL_UNISTRING_GNULIB_MDA_STRDUP
 GL_UNISTRING_GNULIB_MDA_MEMCCPY
 GL_UNISTRING_GNULIB_STRVERSCMP
@@ -1026,6 +1163,7 @@
 GL_UNISTRING_GNULIB_STPNCPY
 GL_UNISTRING_GNULIB_STPCPY
 GL_UNISTRING_GNULIB_RAWMEMCHR
+GL_UNISTRING_GNULIB_MEMSET_EXPLICIT
 GL_UNISTRING_GNULIB_MEMRCHR
 GL_UNISTRING_GNULIB_MEMPCPY
 GL_UNISTRING_GNULIB_MEMMEM
@@ -1051,6 +1189,10 @@
 INT32_MAX_LT_INTMAX_MAX
 REPLACE_STRTOUMAX
 REPLACE_STRTOIMAX
+REPLACE_IMAXDIV
+REPLACE_IMAXABS
+HAVE_IMAXDIV
+HAVE_IMAXABS
 HAVE_IMAXDIV_T
 HAVE_DECL_STRTOUMAX
 HAVE_DECL_STRTOIMAX
@@ -1096,6 +1238,7 @@
 GL_UNISTRING_GNULIB_REALLOCARRAY
 GL_UNISTRING_GNULIB_RANDOM_R
 GL_UNISTRING_GNULIB_RANDOM
+GL_UNISTRING_GNULIB_RAND
 GL_UNISTRING_GNULIB_QSORT_R
 GL_UNISTRING_GNULIB_PUTENV
 GL_UNISTRING_GNULIB_PTSNAME_R
@@ -1108,10 +1251,12 @@
 GL_UNISTRING_GNULIB_MKOSTEMP
 GL_UNISTRING_GNULIB_MKDTEMP
 GL_UNISTRING_GNULIB_MBTOWC
+GL_UNISTRING_GNULIB_MBSTOWCS
 GL_UNISTRING_GNULIB_MALLOC_POSIX
 GL_UNISTRING_GNULIB_MALLOC_GNU
 GL_UNISTRING_GNULIB_GRANTPT
 GL_UNISTRING_GNULIB_GETSUBOPT
+GL_UNISTRING_GNULIB_GETPROGNAME
 GL_UNISTRING_GNULIB_GETLOADAVG
 GL_UNISTRING_GNULIB_FREE_POSIX
 GL_UNISTRING_GNULIB_CANONICALIZE_FILE_NAME
@@ -1143,6 +1288,7 @@
 GL_GNULIB_TIMESPEC_GETRES
 GL_GNULIB_TIMESPEC_GET
 GL_GNULIB_TIMEGM
+GL_GNULIB_TIME
 GL_GNULIB_STRPTIME
 GL_GNULIB_STRFTIME
 GL_GNULIB_NANOSLEEP
@@ -1156,15 +1302,17 @@
 TIME_H_DEFINES_STRUCT_TIMESPEC
 NEXT_AS_FIRST_DIRECTIVE_TIME_H
 NEXT_TIME_H
-REPLACE_LOCALTIME
-REPLACE_GMTIME
-GNULIB_GETTIMEOFDAY
 REPLACE_TZSET
+REPLACE_TIMESPEC_GETRES
+REPLACE_TIMESPEC_GET
 REPLACE_TIMEGM
+REPLACE_TIME
 REPLACE_STRFTIME
 REPLACE_NANOSLEEP
 REPLACE_MKTIME
 REPLACE_LOCALTIME_R
+REPLACE_LOCALTIME
+REPLACE_GMTIME
 REPLACE_CTIME
 HAVE_TIMEZONE_T
 HAVE_TIMESPEC_GETRES
@@ -1187,6 +1335,11 @@
 GL_COND_OBJ_STRERROR_TRUE
 GL_COND_OBJ_STRCHRNUL_FALSE
 GL_COND_OBJ_STRCHRNUL_TRUE
+LC_MONETARY_IMPLEMENTED
+LC_TIME_IMPLEMENTED
+LC_NUMERIC_IMPLEMENTED
+LC_COLLATE_IMPLEMENTED
+LOCALE_FR_UTF8
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H
 NEXT_STDLIB_H
 GL_COND_OBJ_STDIO_WRITE_FALSE
@@ -1237,134 +1390,8 @@
 STDARG_H
 NEXT_AS_FIRST_DIRECTIVE_STDARG_H
 NEXT_STDARG_H
-GL_GENERATE_STDALIGN_H_FALSE
-GL_GENERATE_STDALIGN_H_TRUE
-STDALIGN_H
 GL_COND_OBJ_STAT_FALSE
 GL_COND_OBJ_STAT_TRUE
-REPLACE_WCTOMB
-REPLACE_UNSETENV
-REPLACE_STRTOULL
-REPLACE_STRTOUL
-REPLACE_STRTOLL
-REPLACE_STRTOLD
-REPLACE_STRTOL
-REPLACE_STRTOD
-REPLACE_SETSTATE
-REPLACE_SETENV
-REPLACE_REALPATH
-REPLACE_REALLOCARRAY
-REPLACE_REALLOC_FOR_REALLOC_POSIX
-REPLACE_REALLOC_FOR_REALLOC_GNU
-REPLACE_RANDOM_R
-REPLACE_RANDOM
-REPLACE_QSORT_R
-REPLACE_PUTENV
-REPLACE_PTSNAME_R
-REPLACE_PTSNAME
-REPLACE_POSIX_MEMALIGN
-REPLACE_MKSTEMP
-REPLACE_MBTOWC
-REPLACE_MALLOC_FOR_MALLOC_POSIX
-REPLACE_MALLOC_FOR_MALLOC_GNU
-REPLACE_INITSTATE
-REPLACE_FREE
-REPLACE_CANONICALIZE_FILE_NAME
-REPLACE_CALLOC_FOR_CALLOC_POSIX
-REPLACE_CALLOC_FOR_CALLOC_GNU
-REPLACE_ALIGNED_ALLOC
-HAVE_DECL_UNSETENV
-HAVE_UNLOCKPT
-HAVE_SYS_LOADAVG_H
-HAVE_STRUCT_RANDOM_DATA
-HAVE_STRTOULL
-HAVE_STRTOUL
-HAVE_STRTOLL
-HAVE_STRTOLD
-HAVE_STRTOL
-HAVE_STRTOD
-HAVE_DECL_SETSTATE
-HAVE_SETSTATE
-HAVE_DECL_SETENV
-HAVE_SETENV
-HAVE_SECURE_GETENV
-HAVE_RPMATCH
-HAVE_REALPATH
-HAVE_REALLOCARRAY
-HAVE_RANDOM_R
-HAVE_RANDOM_H
-HAVE_RANDOM
-HAVE_QSORT_R
-HAVE_PTSNAME_R
-HAVE_PTSNAME
-HAVE_POSIX_OPENPT
-HAVE_POSIX_MEMALIGN
-HAVE_MKSTEMPS
-HAVE_MKSTEMP
-HAVE_MKOSTEMPS
-HAVE_MKOSTEMP
-HAVE_MKDTEMP
-HAVE_MBTOWC
-HAVE_DECL_INITSTATE
-HAVE_INITSTATE
-HAVE_GRANTPT
-HAVE_GETSUBOPT
-HAVE_DECL_GETLOADAVG
-HAVE_DECL_GCVT
-HAVE_DECL_FCVT
-HAVE_DECL_ECVT
-HAVE_CANONICALIZE_FILE_NAME
-HAVE_ATOLL
-HAVE_ALIGNED_ALLOC
-HAVE__EXIT
-GL_GNULIB_MDA_PUTENV
-GL_GNULIB_MDA_MKTEMP
-GL_GNULIB_MDA_GCVT
-GL_GNULIB_MDA_FCVT
-GL_GNULIB_MDA_ECVT
-GL_GNULIB_WCTOMB
-GL_GNULIB_UNSETENV
-GL_GNULIB_UNLOCKPT
-GL_GNULIB_SYSTEM_POSIX
-GL_GNULIB_STRTOULL
-GL_GNULIB_STRTOUL
-GL_GNULIB_STRTOLL
-GL_GNULIB_STRTOLD
-GL_GNULIB_STRTOL
-GL_GNULIB_STRTOD
-GL_GNULIB_SETENV
-GL_GNULIB_SECURE_GETENV
-GL_GNULIB_RPMATCH
-GL_GNULIB_REALPATH
-GL_GNULIB_REALLOC_POSIX
-GL_GNULIB_REALLOC_GNU
-GL_GNULIB_REALLOCARRAY
-GL_GNULIB_RANDOM_R
-GL_GNULIB_RANDOM
-GL_GNULIB_QSORT_R
-GL_GNULIB_PUTENV
-GL_GNULIB_PTSNAME_R
-GL_GNULIB_PTSNAME
-GL_GNULIB_POSIX_OPENPT
-GL_GNULIB_POSIX_MEMALIGN
-GL_GNULIB_MKSTEMPS
-GL_GNULIB_MKSTEMP
-GL_GNULIB_MKOSTEMPS
-GL_GNULIB_MKOSTEMP
-GL_GNULIB_MKDTEMP
-GL_GNULIB_MBTOWC
-GL_GNULIB_MALLOC_POSIX
-GL_GNULIB_MALLOC_GNU
-GL_GNULIB_GRANTPT
-GL_GNULIB_GETSUBOPT
-GL_GNULIB_GETLOADAVG
-GL_GNULIB_FREE_POSIX
-GL_GNULIB_CANONICALIZE_FILE_NAME
-GL_GNULIB_CALLOC_POSIX
-GL_GNULIB_CALLOC_GNU
-GL_GNULIB_ATOLL
-GL_GNULIB_ALIGNED_ALLOC
-GL_GNULIB__EXIT
 GL_GNULIB_MDA_STRDUP
 GL_GNULIB_MDA_MEMCCPY
 GL_GNULIB_STRVERSCMP
@@ -1401,6 +1428,7 @@
 GL_GNULIB_STPNCPY
 GL_GNULIB_STPCPY
 GL_GNULIB_RAWMEMCHR
+GL_GNULIB_MEMSET_EXPLICIT
 GL_GNULIB_MEMRCHR
 GL_GNULIB_MEMPCPY
 GL_GNULIB_MEMMEM
@@ -1411,6 +1439,7 @@
 GL_COND_OBJ_RAWMEMCHR_FALSE
 GL_COND_OBJ_RAWMEMCHR_TRUE
 UNDEFINE_STRTOK_R
+REPLACE_STRVERSCMP
 REPLACE_STRSIGNAL
 REPLACE_STRERRORNAME_NP
 REPLACE_STRERROR_R
@@ -1424,6 +1453,9 @@
 REPLACE_STRDUP
 REPLACE_STRCHRNUL
 REPLACE_STPNCPY
+REPLACE_STPCPY
+REPLACE_MEMSET_EXPLICIT
+REPLACE_MEMPCPY
 REPLACE_MEMMEM
 REPLACE_MEMCHR
 REPLACE_FFSLL
@@ -1445,6 +1477,7 @@
 HAVE_STPCPY
 HAVE_RAWMEMCHR
 HAVE_DECL_MEMRCHR
+HAVE_MEMSET_EXPLICIT
 HAVE_MEMPCPY
 HAVE_DECL_MEMMEM
 HAVE_FFSLL
@@ -1471,6 +1504,146 @@
 HAVE_LD_OUTPUT_DEF_TRUE
 LTLIBINTL
 LIBINTL
+GL_GNULIB_MDA_PUTENV
+GL_GNULIB_MDA_MKTEMP
+GL_GNULIB_MDA_GCVT
+GL_GNULIB_MDA_FCVT
+GL_GNULIB_MDA_ECVT
+GL_GNULIB_WCTOMB
+GL_GNULIB_UNSETENV
+GL_GNULIB_UNLOCKPT
+GL_GNULIB_SYSTEM_POSIX
+GL_GNULIB_STRTOULL
+GL_GNULIB_STRTOUL
+GL_GNULIB_STRTOLL
+GL_GNULIB_STRTOLD
+GL_GNULIB_STRTOL
+GL_GNULIB_STRTOD
+GL_GNULIB_SETENV
+GL_GNULIB_SECURE_GETENV
+GL_GNULIB_RPMATCH
+GL_GNULIB_REALPATH
+GL_GNULIB_REALLOC_POSIX
+GL_GNULIB_REALLOC_GNU
+GL_GNULIB_REALLOCARRAY
+GL_GNULIB_RANDOM_R
+GL_GNULIB_RANDOM
+GL_GNULIB_RAND
+GL_GNULIB_QSORT_R
+GL_GNULIB_PUTENV
+GL_GNULIB_PTSNAME_R
+GL_GNULIB_PTSNAME
+GL_GNULIB_POSIX_OPENPT
+GL_GNULIB_POSIX_MEMALIGN
+GL_GNULIB_MKSTEMPS
+GL_GNULIB_MKSTEMP
+GL_GNULIB_MKOSTEMPS
+GL_GNULIB_MKOSTEMP
+GL_GNULIB_MKDTEMP
+GL_GNULIB_MBTOWC
+GL_GNULIB_MBSTOWCS
+GL_GNULIB_MALLOC_POSIX
+GL_GNULIB_MALLOC_GNU
+GL_GNULIB_GRANTPT
+GL_GNULIB_GETSUBOPT
+GL_GNULIB_GETPROGNAME
+GL_GNULIB_GETLOADAVG
+GL_GNULIB_FREE_POSIX
+GL_GNULIB_CANONICALIZE_FILE_NAME
+GL_GNULIB_CALLOC_POSIX
+GL_GNULIB_CALLOC_GNU
+GL_GNULIB_ATOLL
+GL_GNULIB_ALIGNED_ALLOC
+GL_GNULIB__EXIT
+GL_COND_OBJ_GETPROGNAME_FALSE
+GL_COND_OBJ_GETPROGNAME_TRUE
+REPLACE_WCTOMB
+REPLACE_UNSETENV
+REPLACE_STRTOULL
+REPLACE_STRTOUL
+REPLACE_STRTOLL
+REPLACE_STRTOLD
+REPLACE_STRTOL
+REPLACE_STRTOD
+REPLACE_SETSTATE
+REPLACE_SETENV
+REPLACE_REALPATH
+REPLACE_REALLOCARRAY
+REPLACE_REALLOC_FOR_REALLOC_POSIX
+REPLACE_REALLOC_FOR_REALLOC_GNU
+REPLACE_RANDOM_R
+REPLACE_RANDOM
+REPLACE_RAND
+REPLACE_QSORT_R
+REPLACE_PUTENV
+REPLACE_PTSNAME_R
+REPLACE_PTSNAME
+REPLACE_POSIX_OPENPT
+REPLACE_POSIX_MEMALIGN
+REPLACE_MKSTEMP
+REPLACE_MKOSTEMPS
+REPLACE_MKOSTEMP
+REPLACE_MBTOWC
+REPLACE_MBSTOWCS
+REPLACE_MB_CUR_MAX
+REPLACE_MALLOC_FOR_MALLOC_POSIX
+REPLACE_MALLOC_FOR_MALLOC_GNU
+REPLACE_INITSTATE
+REPLACE_GETSUBOPT
+REPLACE_GETPROGNAME
+REPLACE_GETLOADAVG
+REPLACE_FREE
+REPLACE_CANONICALIZE_FILE_NAME
+REPLACE_CALLOC_FOR_CALLOC_POSIX
+REPLACE_CALLOC_FOR_CALLOC_GNU
+REPLACE_ALIGNED_ALLOC
+REPLACE__EXIT
+HAVE_DECL_UNSETENV
+HAVE_UNLOCKPT
+HAVE_SYS_LOADAVG_H
+HAVE_STRUCT_RANDOM_DATA
+HAVE_STRTOULL
+HAVE_STRTOUL
+HAVE_STRTOLL
+HAVE_STRTOLD
+HAVE_STRTOL
+HAVE_STRTOD
+HAVE_DECL_SETSTATE
+HAVE_SETSTATE
+HAVE_DECL_SETENV
+HAVE_SETENV
+HAVE_SECURE_GETENV
+HAVE_RPMATCH
+HAVE_REALPATH
+HAVE_REALLOCARRAY
+HAVE_RANDOM_R
+HAVE_RANDOM_H
+HAVE_RANDOM
+HAVE_QSORT_R
+HAVE_PTSNAME_R
+HAVE_PTSNAME
+HAVE_POSIX_OPENPT
+HAVE_POSIX_MEMALIGN
+HAVE_MKSTEMPS
+HAVE_MKSTEMP
+HAVE_MKOSTEMPS
+HAVE_MKOSTEMP
+HAVE_MKDTEMP
+HAVE_MBTOWC
+HAVE_DECL_INITSTATE
+HAVE_INITSTATE
+HAVE_GRANTPT
+HAVE_GETSUBOPT
+HAVE_GETPROGNAME
+HAVE_DECL_PROGRAM_INVOCATION_NAME
+HAVE_DECL_GETLOADAVG
+HAVE_DECL_GCVT
+HAVE_DECL_FCVT
+HAVE_DECL_ECVT
+HAVE_CANONICALIZE_FILE_NAME
+HAVE_ATOLL
+HAVE_ALIGNED_ALLOC
+HAVE__EXIT
 GL_COND_OBJ_GETOPT_FALSE
 GL_COND_OBJ_GETOPT_TRUE
 GL_GENERATE_GETOPT_CDEFS_H_FALSE
@@ -1592,7 +1765,9 @@
 HAVE_DPRINTF
 HAVE_DECL_VSNPRINTF
 HAVE_DECL_SNPRINTF
+HAVE_DECL_PUTW
 HAVE_DECL_OBSTACK_PRINTF
+HAVE_DECL_GETW
 HAVE_DECL_GETLINE
 HAVE_DECL_GETDELIM
 HAVE_DECL_FTELLO
@@ -1669,6 +1844,13 @@
 HAVE_FCNTL
 GL_COND_OBJ_ERROR_FALSE
 GL_COND_OBJ_ERROR_TRUE
+REPLACE_ERROR_AT_LINE
+REPLACE_ERROR
+HAVE_ERROR_AT_LINE
+HAVE_ERROR
+HAVE_ERROR_H
+NEXT_AS_FIRST_DIRECTIVE_ERROR_H
+NEXT_ERROR_H
 GL_GENERATE_ERRNO_H_FALSE
 GL_GENERATE_ERRNO_H_TRUE
 ERRNO_H
@@ -1782,12 +1964,14 @@
 REPLACE_SYMLINKAT
 REPLACE_SYMLINK
 REPLACE_SLEEP
+REPLACE_SETHOSTNAME
 REPLACE_RMDIR
 REPLACE_READLINKAT
 REPLACE_READLINK
 REPLACE_READ
 REPLACE_PWRITE
 REPLACE_PREAD
+REPLACE_PIPE2
 REPLACE_LSEEK
 REPLACE_LINKAT
 REPLACE_LINK
@@ -1798,11 +1982,14 @@
 REPLACE_GETPAGESIZE
 REPLACE_GETGROUPS
 REPLACE_GETLOGIN_R
+REPLACE_GETENTROPY
 REPLACE_GETDTABLESIZE
 REPLACE_GETDOMAINNAME
 REPLACE_GETCWD
 REPLACE_FTRUNCATE
+REPLACE_FDATASYNC
 REPLACE_FCHOWNAT
+REPLACE_FCHDIR
 REPLACE_FACCESSAT
 REPLACE_EXECVPE
 REPLACE_EXECVP
@@ -1811,6 +1998,7 @@
 REPLACE_EXECLP
 REPLACE_EXECLE
 REPLACE_EXECL
+REPLACE_DUP3
 REPLACE_DUP2
 REPLACE_DUP
 REPLACE_COPY_FILE_RANGE
@@ -1895,6 +2083,8 @@
 DUMPBIN
 LD
 FGREP
+EGREP
+GREP
 SED
 LIBTOOL
 OBJDUMP
@@ -1904,8 +2094,6 @@
 RANLIB
 ARFLAGS
 AR
-EGREP
-GREP
 CPP
 host_os
 host_vendor
@@ -2015,7 +2203,6 @@
 enable_silent_rules
 enable_dependency_tracking
 enable_largefile
-enable_year2038
 enable_shared
 enable_static
 with_pic
@@ -2044,6 +2231,7 @@
 enable_code_coverage
 enable_gcc_warnings
 enable_doc
+enable_year2038
 '
       ac_precious_vars='build_alias
 host_alias
@@ -2167,7 +2355,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid feature name: \`$ac_useropt'"
+      as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
@@ -2193,7 +2381,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-$^=*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid feature name: \`$ac_useropt'"
+      as_fn_error $? "invalid feature name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
@@ -2406,7 +2594,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-$^=*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid package name: \`$ac_useropt'"
+      as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
@@ -2422,7 +2610,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
-      as_fn_error $? "invalid package name: \`$ac_useropt'"
+      as_fn_error $? "invalid package name: '$ac_useropt'"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
     case $ac_user_opts in
@@ -2452,8 +2640,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+  -*) as_fn_error $? "unrecognized option: '$ac_option'
+Try '$0 --help' for more information"
     ;;
 
   *=*)
@@ -2461,7 +2649,7 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | 0-9* | *!_$as_cr_alnum* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: '$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -2511,7 +2699,7 @@
   as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
-# There might be people who depend on the old broken behavior: `$host'
+# There might be people who depend on the old broken behavior: '$host'
 # used to hold the argument of --host etc.
 # FIXME: To remove some day.
 build=$build_alias
@@ -2579,7 +2767,7 @@
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
   as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work"
 ac_abs_confdir=`(
 	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
@@ -2607,7 +2795,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Libidn2 2.3.4 to adapt to many kinds of systems.
+'configure' configures Libidn2 2.3.7 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -2621,11 +2809,11 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
+  -q, --quiet, --silent   do not print 'checking ...' messages
       --cache-file=FILE   cache test results in FILE disabled
-  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -C, --config-cache      alias for '--cache-file=config.cache'
   -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR configure dir or \`..'
+      --srcdir=DIR        find the sources in DIR configure dir or '..'
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -2633,10 +2821,10 @@
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
                           PREFIX
 
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
+By default, 'make install' will install all the files in
+'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than '$ac_default_prefix' using '--prefix',
+for instance '--prefix=\$HOME'.
 
 For better control, use the options below.
 
@@ -2678,7 +2866,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Libidn2 2.3.4:";;
+     short | recursive ) echo "Configuration of Libidn2 2.3.7:";;
    esac
   cat <<\_ACEOF
 
@@ -2693,7 +2881,6 @@
   --disable-dependency-tracking
                           speeds up one-time build
   --disable-largefile     omit support for large files
-  --disable-year2038      omit support for timestamps past the year 2038
   --enable-shared=PKGS  build shared libraries default=yes
   --enable-static=PKGS  build static libraries default=yes
   --enable-fast-install=PKGS
@@ -2712,8 +2899,14 @@
   --enable-gtk-doc-pdf    build documentation in pdf format default=no
   --disable-nls           do not use Native Language Support
   --enable-code-coverage  Whether to enable code coverage support
-  --enable-gcc-warnings   turn on lots of GCC warnings (for developers)
+  --enable-gcc-warnings=TYPE
+                          control generation of GCC warnings. The TYPE 'no'
+                          disables warnings; 'yes' (default) generates cheap
+                          warnings; 'expensive' in addition generates
+                          expensive warnings and 'error' also turn warnings
+                          into errors.
   --disable-doc           don't generate any documentation
+  --enable-year2038       support timestamps after 2038
 
 Optional Packages:
   --with-PACKAGE=ARG    use PACKAGE ARG=yes
@@ -2760,7 +2953,7 @@
   GTKDOC_DEPS_LIBS
               linker flags for GTKDOC_DEPS, overriding pkg-config
 
-Use these variables to override the choices made by `configure' or to help
+Use these variables to override the choices made by 'configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 Report bugs to <help-libidn@gnu.org>.
@@ -2829,10 +3022,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Libidn2 configure 2.3.4
-generated by GNU Autoconf 2.71
+Libidn2 configure 2.3.7
+generated by GNU Autoconf 2.72
 
-Copyright (C) 2021 Free Software Foundation, Inc.
+Copyright (C) 2023 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -2871,11 +3064,12 @@
        } && test -s conftest.$ac_objext
 then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+  e) printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1
+	ac_retval=1 ;;
+esac
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
@@ -2894,8 +3088,8 @@
 if eval test \${$3+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
@@ -2903,10 +3097,12 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   eval "$3=yes"
-else $as_nop
-  eval "$3=no"
+else case e in #(
+  e) eval "$3=no" ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 eval ac_res=\$$3
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -2942,11 +3138,12 @@
        }
 then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+  e) printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-    ac_retval=1
+    ac_retval=1 ;;
+esac
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
@@ -2984,11 +3181,12 @@
        }
 then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+  e) printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1
+	ac_retval=1 ;;
+esac
 fi
   # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
   # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
@@ -3011,15 +3209,15 @@
 if eval test \${$3+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 #define $2 innocuous_$2
 
 /* System header to define __stub macros and hopefully few prototypes,
-   which can conflict with char $2 (); below.  */
+   which can conflict with char $2 (void); below.  */
 
 #include <limits.h>
 #undef $2
@@ -3030,7 +3228,7 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char $2 ();
+char $2 (void);
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
@@ -3049,11 +3247,13 @@
 if ac_fn_c_try_link "$LINENO"
 then :
   eval "$3=yes"
-else $as_nop
-  eval "$3=no"
+else case e in #(
+  e) eval "$3=no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
+    conftest$ac_exeext conftest.$ac_ext ;;
+esac
 fi
 eval ac_res=\$$3
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -3074,8 +3274,8 @@
 if eval test \${$3+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  eval "$3=no"
+else case e in #(
+  e) eval "$3=no"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
@@ -3105,12 +3305,14 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
 
-else $as_nop
-  eval "$3=yes"
+else case e in #(
+  e) eval "$3=yes" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 eval ac_res=\$$3
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -3149,12 +3351,13 @@
   test $ac_status = 0; }; }
 then :
   ac_retval=0
-else $as_nop
-  printf "%s\n" "$as_me: program exited with status $ac_status" >&5
+else case e in #(
+  e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5
        printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_retval=$ac_status
+       ac_retval=$ac_status ;;
+esac
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
@@ -3207,18 +3410,19 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_hi=$ac_mid; break
-else $as_nop
-  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+else case e in #(
+  e) as_fn_arith $ac_mid + 1 && ac_lo=$as_val
 			if test $ac_lo -le $ac_mid; then
 			  ac_lo= ac_hi=
 			  break
 			fi
-			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
+			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   done
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
@@ -3253,20 +3457,23 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_lo=$ac_mid; break
-else $as_nop
-  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+else case e in #(
+  e) as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
 			if test $ac_mid -le $ac_hi; then
 			  ac_lo= ac_hi=
 			  break
 			fi
-			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
+			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   done
-else $as_nop
-  ac_lo= ac_hi=
+else case e in #(
+  e) ac_lo= ac_hi= ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 # Binary search between lo and hi bounds.
@@ -3289,8 +3496,9 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_hi=$ac_mid
-else $as_nop
-  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
+else case e in #(
+  e) as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 done
@@ -3338,8 +3546,9 @@
 if ac_fn_c_try_run "$LINENO"
 then :
   echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-else $as_nop
-  ac_retval=1
+else case e in #(
+  e) ac_retval=1 ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -3357,7 +3566,7 @@
 # accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR.
 ac_fn_check_decl ()
 {
-  ac_save_ac_compile="$ac_compile"
+  ac_saved_ac_compile="$ac_compile"
   if test -n "$ac_compile_for_check_decl"; then
     ac_compile="$ac_compile_for_check_decl"
   fi
@@ -3368,8 +3577,8 @@
 if eval test \${$3+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+else case e in #(
+  e) as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
   eval ac_save_FLAGS=\$$6
   as_fn_append $6 " $5"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3393,18 +3602,20 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   eval "$3=yes"
-else $as_nop
-  eval "$3=no"
+else case e in #(
+  e) eval "$3=no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   eval $6=\$ac_save_FLAGS
-
+ ;;
+esac
 fi
 eval ac_res=\$$3
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  ac_compile="$ac_save_ac_compile"
+  ac_compile="$ac_saved_ac_compile"
 
 } # ac_fn_check_decl
 
@@ -3420,8 +3631,8 @@
 if eval test \${$4+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
@@ -3437,8 +3648,8 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   eval "$4=yes"
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
@@ -3454,12 +3665,15 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   eval "$4=yes"
-else $as_nop
-  eval "$4=no"
+else case e in #(
+  e) eval "$4=no" ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 eval ac_res=\$$4
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -3491,8 +3705,8 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Libidn2 $as_me 2.3.4, which was
-generated by GNU Autoconf 2.71.  Invocation command line was
+It was created by Libidn2 $as_me 2.3.7, which was
+generated by GNU Autoconf 2.72.  Invocation command line was
 
   $ $0$ac_configure_args_raw
 
@@ -3738,10 +3952,10 @@
 printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -3777,9 +3991,7 @@
 /* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
 struct buf { int x; };
 struct buf * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
+static char *e (char **p, int i)
 {
   return pi;
 }
@@ -3793,6 +4005,21 @@
   return s;
 }
 
+/* C89 style stringification. */
+#define noexpand_stringify(a) #a
+const char *stringified = noexpand_stringify(arbitrary+token=sequence);
+
+/* C89 style token pasting.  Exercises some of the corner cases that
+   e.g. old MSVC gets wrong, but not very hard. */
+#define noexpand_concat(a,b) a##b
+#define expand_concat(a,b) noexpand_concat(a,b)
+extern int vA;
+extern int vbee;
+#define aye A
+#define bee B
+int *pvA = &expand_concat(v,aye);
+int *pvbee = &noexpand_concat(v,bee);
+
 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
    function prototypes and stuff, but not \xHH hex character constants.
    These do not provoke an error unfortunately, instead are silently treated
@@ -3820,16 +4047,19 @@
 
 # Test code for whether the C compiler supports C99 (global declarations)
 ac_c_conftest_c99_globals='
-// Does the compiler advertise C99 conformance?
+/* Does the compiler advertise C99 conformance? */
 #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
 # error "Compiler does not advertise C99 conformance"
 #endif
 
+// See if C++-style comments work.
+
 #include <stdbool.h>
 extern int puts (const char *);
 extern int printf (const char *, ...);
 extern int dprintf (int, const char *, ...);
 extern void *malloc (size_t);
+extern void free (void *);
 
 // Check varargs macros.  These examples are taken from C99 6.10.3.5.
 // dprintf is used instead of fprintf to avoid needing to declare
@@ -3879,7 +4109,6 @@
 static inline int
 test_restrict (ccp restrict text)
 {
-  // See if C++-style comments work.
   // Iterate through items via the restricted pointer.
   // Also check for declarations in for loops.
   for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
@@ -3945,6 +4174,8 @@
   ia->datasize = 10;
   for (int i = 0; i < ia->datasize; ++i)
     ia->datai = i * 1.234;
+  // Work around memory leak warnings.
+  free (ia);
 
   // Check named initializers.
   struct named_init ni = {
@@ -3966,7 +4197,7 @@
 
 # Test code for whether the C compiler supports C11 (global declarations)
 ac_c_conftest_c11_globals='
-// Does the compiler advertise C11 conformance?
+/* Does the compiler advertise C11 conformance? */
 #if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
 # error "Compiler does not advertise C11 conformance"
 #endif
@@ -4083,20 +4314,18 @@
 as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H"
 as_fn_append ac_func_c_list " _set_invalid_parameter_handler HAVE__SET_INVALID_PARAMETER_HANDLER"
 as_fn_append ac_header_c_list " sys/socket.h sys_socket_h HAVE_SYS_SOCKET_H"
+as_fn_append ac_header_c_list " error.h error_h HAVE_ERROR_H"
 as_fn_append ac_func_c_list " fcntl HAVE_FCNTL"
 as_fn_append ac_func_c_list " symlink HAVE_SYMLINK"
-as_fn_append ac_func_c_list " getdelim HAVE_GETDELIM"
 as_fn_append ac_func_c_list " getdtablesize HAVE_GETDTABLESIZE"
 gl_getopt_required=GNU
 as_fn_append ac_header_c_list " getopt.h getopt_h HAVE_GETOPT_H"
 as_fn_append ac_header_c_list " sys/cdefs.h sys_cdefs_h HAVE_SYS_CDEFS_H"
-as_fn_append ac_func_c_list " getprogname HAVE_GETPROGNAME"
 as_fn_append ac_func_c_list " getexecname HAVE_GETEXECNAME"
 as_fn_append ac_header_c_list " limits.h limits_h HAVE_LIMITS_H"
 as_fn_append ac_func_c_list " lstat HAVE_LSTAT"
 as_fn_append ac_header_c_list " sys/param.h sys_param_h HAVE_SYS_PARAM_H"
 as_fn_append ac_header_c_list " sys/time.h sys_time_h HAVE_SYS_TIME_H"
-as_fn_append ac_header_c_list " stdalign.h stdalign_h HAVE_STDALIGN_H"
 as_fn_append ac_header_c_list " stdbool.h stdbool_h HAVE_STDBOOL_H"
 as_fn_append ac_header_c_list " stdckdint.h stdckdint_h HAVE_STDCKDINT_H"
 as_fn_append ac_header_c_list " iconv.h iconv_h HAVE_ICONV_H"
@@ -4182,8 +4411,9 @@
 if $as_found
 then :
 
-else $as_nop
-  as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
+else case e in #(
+  e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;;
+esac
 fi
 
 
@@ -4211,12 +4441,12 @@
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
+printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
+printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
@@ -4225,18 +4455,18 @@
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
+printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
+printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-printf "%s\n" "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-printf "%s\n" "$as_me:   current value: \`$ac_new_val'" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
+printf "%s\n" "$as_me:   former value:  '$ac_old_val'" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
+printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
@@ -4252,11 +4482,11 @@
   fi
 done
 if $ac_cache_corrupted; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
+  as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file'
 	    and start over" "$LINENO" 5
 fi
 ## -------------------- ##
@@ -4275,11 +4505,11 @@
 # Interfaces changed/added/removed:   CURRENT++       REVISION=0
 # Interfaces added:                             AGE++
 # Interfaces removed:                           AGE=0
-LT_CURRENT=3
+LT_CURRENT=4
 
-LT_REVISION=8
+LT_REVISION=0
 
-LT_AGE=3
+LT_AGE=4
 
 
 DLL_VERSION=`expr ${LT_CURRENT} - ${LT_AGE}`
@@ -4326,8 +4556,8 @@
 if test ${ac_cv_path_install+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+else case e in #(
+  e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
@@ -4381,7 +4611,8 @@
 IFS=$as_save_IFS
 
 rm -rf conftest.one conftest.two conftest.dir
-
+ ;;
+esac
 fi
   if test ${ac_cv_path_install+y}; then
     INSTALL=$ac_cv_path_install
@@ -4477,7 +4708,7 @@
 test "$program_suffix" != NONE &&
   program_transform_name="s&\$&$program_suffix&;$program_transform_name"
 # Double any \ or $.
-# By default was `s,x,x', remove it if useless.
+# By default was 's,x,x', remove it if useless.
 ac_script='s/\\$/&&/g;s/;s,x,x,$//'
 program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"`
 
@@ -4520,8 +4751,8 @@
 if test ${ac_cv_prog_STRIP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$STRIP"; then
+else case e in #(
+  e) if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4543,7 +4774,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
@@ -4565,8 +4797,8 @@
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_STRIP"; then
+else case e in #(
+  e) if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4588,7 +4820,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
@@ -4624,8 +4857,8 @@
   if test ${ac_cv_path_mkdir+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+else case e in #(
+  e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
 do
   IFS=$as_save_IFS
@@ -4639,7 +4872,7 @@
 	   as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir ('*'coreutils) '* | \
-	     'BusyBox '* | \
+	     *'BusyBox '* | \
 	     'mkdir (fileutils) '4.1*)
 	       ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext
 	       break 3;;
@@ -4648,18 +4881,17 @@
        done
   done
 IFS=$as_save_IFS
-
+ ;;
+esac
 fi
 
   test -d ./--version && rmdir ./--version
   if test ${ac_cv_path_mkdir+y}; then
     MKDIR_P="$ac_cv_path_mkdir -p"
   else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    MKDIR_P="$ac_install_sh -d"
+    # As a last resort, use plain mkdir -p,
+    # in the hope it doesn't have the bugs of ancient mkdir.
+    MKDIR_P='mkdir -p'
   fi
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
@@ -4674,8 +4906,8 @@
 if test ${ac_cv_prog_AWK+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$AWK"; then
+else case e in #(
+  e) if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4697,7 +4929,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
@@ -4719,8 +4952,8 @@
 if eval test \${ac_cv_prog_make_${ac_make}_set+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat >conftest.make <<\_ACEOF
+else case e in #(
+  e) cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
@@ -4732,7 +4965,8 @@
   *)
     eval ac_cv_prog_make_${ac_make}_set=no;;
 esac
-rm -f conftest.make
+rm -f conftest.make ;;
+esac
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -4770,8 +5004,8 @@
 if test ${am_cv_make_support_nested_variables+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if printf "%s\n" 'TRUE=$(BAR$(V))
+else case e in #(
+  e) if printf "%s\n" 'TRUE=$(BAR$(V))
 BAR0=false
 BAR1=true
 V=1
@@ -4781,7 +5015,8 @@
   am_cv_make_support_nested_variables=yes
 else
   am_cv_make_support_nested_variables=no
-fi
+fi ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
 printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
@@ -4816,7 +5051,7 @@
 
 # Define the identity of the package.
  PACKAGE='libidn2'
- VERSION='2.3.4'
+ VERSION='2.3.7'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -4936,8 +5171,8 @@
 if test ${am_cv_make_support_nested_variables+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if printf "%s\n" 'TRUE=$(BAR$(V))
+else case e in #(
+  e) if printf "%s\n" 'TRUE=$(BAR$(V))
 BAR0=false
 BAR1=true
 V=1
@@ -4947,7 +5182,8 @@
   am_cv_make_support_nested_variables=yes
 else
   am_cv_make_support_nested_variables=no
-fi
+fi ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
 printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
@@ -4983,8 +5219,8 @@
 if test ${ac_cv_prog_CC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
+else case e in #(
+  e) if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5006,7 +5242,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
@@ -5028,8 +5265,8 @@
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_CC"; then
+else case e in #(
+  e) if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5051,7 +5288,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
@@ -5086,8 +5324,8 @@
 if test ${ac_cv_prog_CC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
+else case e in #(
+  e) if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5109,7 +5347,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
@@ -5131,8 +5370,8 @@
 if test ${ac_cv_prog_CC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
+else case e in #(
+  e) if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
   ac_prog_rejected=no
@@ -5171,7 +5410,8 @@
     ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
   fi
 fi
-fi
+fi ;;
+esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
@@ -5195,8 +5435,8 @@
 if test ${ac_cv_prog_CC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
+else case e in #(
+  e) if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5218,7 +5458,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
@@ -5244,8 +5485,8 @@
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_CC"; then
+else case e in #(
+  e) if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5267,7 +5508,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
@@ -5305,8 +5547,8 @@
 if test ${ac_cv_prog_CC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$CC"; then
+else case e in #(
+  e) if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5328,7 +5570,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
@@ -5350,8 +5593,8 @@
 if test ${ac_cv_prog_ac_ct_CC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_CC"; then
+else case e in #(
+  e) if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5373,7 +5616,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
@@ -5402,10 +5646,10 @@
 fi
 
 
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -5477,8 +5721,8 @@
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+  # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'.
+# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
 # so that the user can short-circuit this test for compilers unknown to
 # Autoconf.
@@ -5498,7 +5742,7 @@
 	   ac_cv_exeext=`expr "$ac_file" : '^.*$\..*$'`
 	fi
 	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
+	# safe: cross compilers may not add the suffix if given an '-o'
 	# argument, so we may need to know it at that point already.
 	# Even if this section looks crufty: it has the advantage of
 	# actually working.
@@ -5509,8 +5753,9 @@
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
-else $as_nop
-  ac_file=''
+else case e in #(
+  e) ac_file='' ;;
+esac
 fi
 if test -z "$ac_file"
 then :
@@ -5519,13 +5764,14 @@
 printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+See 'config.log' for more details" "$LINENO" 5; }
+else case e in #(
+  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; } ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 printf %s "checking for C compiler default output file name... " >&6; }
@@ -5549,10 +5795,10 @@
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
+  # If both 'conftest.exe' and 'conftest' are 'present' (well, observable)
+# catch 'conftest.exe'.  For instance with Cygwin, 'ls conftest' will
+# work properly (i.e., refer to 'conftest.exe'), while it won't with
+# 'rm'.
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
@@ -5562,11 +5808,12 @@
     * ) break;;
   esac
 done
-else $as_nop
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+else case e in #(
+  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
 fi
 rm -f conftest conftest$ac_cv_exeext
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -5582,6 +5829,8 @@
 main (void)
 {
 FILE *f = fopen ("conftest.out", "w");
+ if (!f)
+  return 1;
  return ferror (f) || fclose (f) != 0;
 
   ;
@@ -5621,26 +5870,27 @@
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
+If you meant to cross compile, use '--host'.
+See 'config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
 printf "%s\n" "$cross_compiling" >&6; }
 
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+rm -f conftest.$ac_ext conftest$ac_cv_exeext \
+  conftest.o conftest.obj conftest.out
 ac_clean_files=$ac_clean_files_save
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 printf %s "checking for suffix of object files... " >&6; }
 if test ${ac_cv_objext+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -5672,16 +5922,18 @@
        break;;
   esac
 done
-else $as_nop
-  printf "%s\n" "$as_me: failed program was:" >&5
+else case e in #(
+  e) printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
 fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
+rm -f conftest.$ac_cv_objext conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
 printf "%s\n" "$ac_cv_objext" >&6; }
@@ -5692,8 +5944,8 @@
 if test ${ac_cv_c_compiler_gnu+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -5710,12 +5962,14 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_compiler_gnu=yes
-else $as_nop
-  ac_compiler_gnu=no
+else case e in #(
+  e) ac_compiler_gnu=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
 printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
@@ -5733,8 +5987,8 @@
 if test ${ac_cv_prog_cc_g+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_save_c_werror_flag=$ac_c_werror_flag
+else case e in #(
+  e) ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
@@ -5752,8 +6006,8 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_prog_cc_g=yes
-else $as_nop
-  CFLAGS=""
+else case e in #(
+  e) CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -5768,8 +6022,8 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
 
-else $as_nop
-  ac_c_werror_flag=$ac_save_c_werror_flag
+else case e in #(
+  e) ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5786,12 +6040,15 @@
 then :
   ac_cv_prog_cc_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
+   ac_c_werror_flag=$ac_save_c_werror_flag ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
 printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
@@ -5818,8 +6075,8 @@
 if test ${ac_cv_prog_cc_c11+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cc_c11=no
+else case e in #(
+  e) ac_cv_prog_cc_c11=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5836,25 +6093,28 @@
   test "x$ac_cv_prog_cc_c11" != "xno" && break
 done
 rm -f conftest.$ac_ext
-CC=$ac_save_CC
+CC=$ac_save_CC ;;
+esac
 fi
 
 if test "x$ac_cv_prog_cc_c11" = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cc_c11" = x
+else case e in #(
+  e) if test "x$ac_cv_prog_cc_c11" = x
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+else case e in #(
+  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
 printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
-     CC="$CC $ac_cv_prog_cc_c11"
+     CC="$CC $ac_cv_prog_cc_c11" ;;
+esac
 fi
   ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
-  ac_prog_cc_stdc=c11
+  ac_prog_cc_stdc=c11 ;;
+esac
 fi
 fi
 if test x$ac_prog_cc_stdc = xno
@@ -5864,8 +6124,8 @@
 if test ${ac_cv_prog_cc_c99+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cc_c99=no
+else case e in #(
+  e) ac_cv_prog_cc_c99=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5882,25 +6142,28 @@
   test "x$ac_cv_prog_cc_c99" != "xno" && break
 done
 rm -f conftest.$ac_ext
-CC=$ac_save_CC
+CC=$ac_save_CC ;;
+esac
 fi
 
 if test "x$ac_cv_prog_cc_c99" = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cc_c99" = x
+else case e in #(
+  e) if test "x$ac_cv_prog_cc_c99" = x
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+else case e in #(
+  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
 printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
-     CC="$CC $ac_cv_prog_cc_c99"
+     CC="$CC $ac_cv_prog_cc_c99" ;;
+esac
 fi
   ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
-  ac_prog_cc_stdc=c99
+  ac_prog_cc_stdc=c99 ;;
+esac
 fi
 fi
 if test x$ac_prog_cc_stdc = xno
@@ -5910,8 +6173,8 @@
 if test ${ac_cv_prog_cc_c89+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_prog_cc_c89=no
+else case e in #(
+  e) ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5928,25 +6191,28 @@
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
-CC=$ac_save_CC
+CC=$ac_save_CC ;;
+esac
 fi
 
 if test "x$ac_cv_prog_cc_c89" = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 printf "%s\n" "unsupported" >&6; }
-else $as_nop
-  if test "x$ac_cv_prog_cc_c89" = x
+else case e in #(
+  e) if test "x$ac_cv_prog_cc_c89" = x
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 printf "%s\n" "none needed" >&6; }
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+else case e in #(
+  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
 printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
-     CC="$CC $ac_cv_prog_cc_c89"
+     CC="$CC $ac_cv_prog_cc_c89" ;;
+esac
 fi
   ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
-  ac_prog_cc_stdc=c89
+  ac_prog_cc_stdc=c89 ;;
+esac
 fi
 fi
 
@@ -5967,8 +6233,8 @@
 if test ${am_cv_prog_cc_c_o+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -5998,7 +6264,8 @@
     fi
   done
   rm -f core conftest*
-  unset am_i
+  unset am_i ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
 printf "%s\n" "$am_cv_prog_cc_c_o" >&6; }
@@ -6023,8 +6290,8 @@
 if test ${gl_cv_compiler_clang+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e)                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
            #ifdef __clang__
@@ -6043,11 +6310,13 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_compiler_clang=no
-else $as_nop
-  gl_cv_compiler_clang=yes
+else case e in #(
+  e) gl_cv_compiler_clang=yes ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_clang" >&5
 printf "%s\n" "$gl_cv_compiler_clang" >&6; }
@@ -6058,9 +6327,9 @@
 if test ${gl_cv_compiler_check_decl_option+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test $gl_cv_compiler_clang = yes; then
-                     save_ac_compile="$ac_compile"
+else case e in #(
+  e) if test $gl_cv_compiler_clang = yes; then
+                     saved_ac_compile="$ac_compile"
        ac_compile="$ac_compile -Werror=implicit-function-declaration"
                      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6076,15 +6345,17 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_compiler_check_decl_option='-Werror=implicit-function-declaration'
-else $as_nop
-  gl_cv_compiler_check_decl_option=none
+else case e in #(
+  e) gl_cv_compiler_check_decl_option=none ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-       ac_compile="$save_ac_compile"
+       ac_compile="$saved_ac_compile"
      else
        gl_cv_compiler_check_decl_option=none
      fi
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_compiler_check_decl_option" >&5
 printf "%s\n" "$gl_cv_compiler_check_decl_option" >&6; }
@@ -6166,8 +6437,8 @@
 if test ${am_cv_CC_dependencies_compiler_type+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+else case e in #(
+  e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
@@ -6271,7 +6542,8 @@
 else
   am_cv_CC_dependencies_compiler_type=none
 fi
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
 printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; }
@@ -6329,8 +6601,8 @@
 if test ${ac_cv_safe_to_define___extensions__+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #         define __EXTENSIONS__ 1
@@ -6346,10 +6618,12 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_safe_to_define___extensions__=yes
-else $as_nop
-  ac_cv_safe_to_define___extensions__=no
+else case e in #(
+  e) ac_cv_safe_to_define___extensions__=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
 printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
@@ -6359,8 +6633,8 @@
 if test ${ac_cv_should_define__xopen_source+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_should_define__xopen_source=no
+else case e in #(
+  e) ac_cv_should_define__xopen_source=no
     if test $ac_cv_header_wchar_h = yes
 then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6379,8 +6653,8 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
             #define _XOPEN_SOURCE 500
@@ -6398,10 +6672,12 @@
 then :
   ac_cv_should_define__xopen_source=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+fi ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
 printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
@@ -6426,6 +6702,8 @@
 
   printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
 
+  printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
+
   printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
 
   printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
@@ -6445,8 +6723,9 @@
 
     printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
 
-else $as_nop
-  MINIX=
+else case e in #(
+  e) MINIX= ;;
+esac
 fi
   if test $ac_cv_safe_to_define___extensions__ = yes
 then :
@@ -6470,15 +6749,16 @@
 if test ${ac_cv_build+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_build_alias=$build_alias
+else case e in #(
+  e) ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
 test "x$ac_build_alias" = x &&
   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
   as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 printf "%s\n" "$ac_cv_build" >&6; }
@@ -6505,14 +6785,15 @@
 if test ${ac_cv_host+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "x$host_alias" = x; then
+else case e in #(
+  e) if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
     as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
 fi
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
 printf "%s\n" "$ac_cv_host" >&6; }
@@ -6561,8 +6842,8 @@
   if test ${ac_cv_prog_CPP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-      # Double quotes because $CC needs to be expanded
+else case e in #(
+  e)     # Double quotes because $CC needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
     do
       ac_preproc_ok=false
@@ -6580,9 +6861,10 @@
 if ac_fn_c_try_cpp "$LINENO"
 then :
 
-else $as_nop
-  # Broken: fails on valid input.
-continue
+else case e in #(
+  e) # Broken: fails on valid input.
+continue ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -6596,15 +6878,16 @@
 then :
   # Broken: success on invalid input.
 continue
-else $as_nop
-  # Passes both tests.
+else case e in #(
+  e) # Passes both tests.
 ac_preproc_ok=:
-break
+break ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok
 then :
@@ -6613,7 +6896,8 @@
 
     done
     ac_cv_prog_CPP=$CPP
-
+   ;;
+esac
 fi
   CPP=$ac_cv_prog_CPP
 else
@@ -6636,9 +6920,10 @@
 if ac_fn_c_try_cpp "$LINENO"
 then :
 
-else $as_nop
-  # Broken: fails on valid input.
-continue
+else case e in #(
+  e) # Broken: fails on valid input.
+continue ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -6652,24 +6937,26 @@
 then :
   # Broken: success on invalid input.
 continue
-else $as_nop
-  # Passes both tests.
+else case e in #(
+  e) # Passes both tests.
 ac_preproc_ok=:
-break
+break ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok
 then :
 
-else $as_nop
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+else case e in #(
+  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
 fi
 
 ac_ext=c
@@ -6679,14 +6966,14 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-printf %s "checking for grep that handles long lines and -e... " >&6; }
-if test ${ac_cv_path_GREP+y}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5
+printf %s "checking for egrep -e... " >&6; }
+if test ${ac_cv_path_EGREP_TRADITIONAL+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
+else case e in #(
+  e) if test -z "$EGREP_TRADITIONAL"; then
+  ac_path_EGREP_TRADITIONAL_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
@@ -6700,13 +6987,14 @@
     for ac_prog in grep ggrep
    do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
+      ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue
+# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found.
+  # Check for GNU $ac_path_EGREP_TRADITIONAL
+case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #(
 *GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+  ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;;
+#(
 *)
   ac_count=0
   printf %s 0123456789 >"conftest.in"
@@ -6715,14 +7003,14 @@
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl"
+    "$ac_path_EGREP_TRADITIONAL" -E 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+    if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then
       # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
+      ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL"
+      ac_path_EGREP_TRADITIONAL_max=$ac_count
     fi
     # 10*(2^10) chars as input seems more than enough
     test $ac_count -gt 10 && break
@@ -6730,35 +7018,24 @@
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-      $ac_path_GREP_found && break 3
+      $ac_path_EGREP_TRADITIONAL_found && break 3
     done
   done
   done
 IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then
+    :
   fi
 else
-  ac_cv_path_GREP=$GREP
+  ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL
 fi
 
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-printf "%s\n" "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-printf %s "checking for egrep... " >&6; }
-if test ${ac_cv_path_EGREP+y}
+    if test "$ac_cv_path_EGREP_TRADITIONAL"
 then :
-  printf %s "(cached) " >&6
-else $as_nop
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
+  ac_cv_path_EGREP_TRADITIONAL="$ac_cv_path_EGREP_TRADITIONAL -E"
+else case e in #(
+  e) if test -z "$EGREP_TRADITIONAL"; then
+  ac_path_EGREP_TRADITIONAL_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
@@ -6772,13 +7049,14 @@
     for ac_prog in egrep
    do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
+      ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue
+# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found.
+  # Check for GNU $ac_path_EGREP_TRADITIONAL
+case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #(
 *GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+  ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;;
+#(
 *)
   ac_count=0
   printf %s 0123456789 >"conftest.in"
@@ -6787,14 +7065,14 @@
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl"
+    "$ac_path_EGREP_TRADITIONAL" 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+    if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then
       # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
+      ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL"
+      ac_path_EGREP_TRADITIONAL_max=$ac_count
     fi
     # 10*(2^10) chars as input seems more than enough
     test $ac_count -gt 10 && break
@@ -6802,24 +7080,25 @@
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-      $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_TRADITIONAL_found && break 3
     done
   done
   done
 IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
+  if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then
     as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
-  ac_cv_path_EGREP=$EGREP
+  ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL
 fi
-
-   fi
+ ;;
+esac
+fi ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-printf "%s\n" "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5
+printf "%s\n" "$ac_cv_path_EGREP_TRADITIONAL" >&6; }
+ EGREP_TRADITIONAL=$ac_cv_path_EGREP_TRADITIONAL
 
 
 
@@ -6829,8 +7108,8 @@
 if test ${gl_cv_c_amsterdam_compiler+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -6840,15 +7119,17 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Amsterdam" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Amsterdam" >/dev/null 2>&1
 then :
   gl_cv_c_amsterdam_compiler=yes
-else $as_nop
-  gl_cv_c_amsterdam_compiler=no
+else case e in #(
+  e) gl_cv_c_amsterdam_compiler=no ;;
+esac
 fi
 rm -rf conftest*
 
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_amsterdam_compiler" >&5
 printf "%s\n" "$gl_cv_c_amsterdam_compiler" >&6; }
@@ -6872,8 +7153,8 @@
 if test ${ac_cv_prog_AR+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$AR"; then
+else case e in #(
+  e) if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6895,7 +7176,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
@@ -6917,8 +7199,8 @@
 if test ${ac_cv_prog_ac_ct_AR+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_AR"; then
+else case e in #(
+  e) if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6940,7 +7222,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
@@ -6984,8 +7267,8 @@
 if test ${ac_cv_prog_RANLIB+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$RANLIB"; then
+else case e in #(
+  e) if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -7007,7 +7290,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
@@ -7029,8 +7313,8 @@
 if test ${ac_cv_prog_ac_ct_RANLIB+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_RANLIB"; then
+else case e in #(
+  e) if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -7052,7 +7336,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
@@ -7082,95 +7367,39 @@
   fi
 
 
-
-
-  case "$host_os" in
-    mingw*)
-
-printf "%s\n" "#define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h
-
-      ;;
-  esac
-
 # Check whether --enable-largefile was given.
 if test ${enable_largefile+y}
 then :
   enableval=$enable_largefile;
 fi
-
-if test "$enable_largefile" != no
+if test "$enable_largefile,$enable_year2038" != no,no
 then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
-printf %s "checking for special C compiler options needed for large files... " >&6; }
-if test ${ac_cv_sys_largefile_CC+y}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable large file support" >&5
+printf %s "checking for $CC option to enable large file support... " >&6; }
+if test ${ac_cv_sys_largefile_opts+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_sys_largefile_CC=no
-     if test "$GCC" != yes; then
-       ac_save_CC=$CC
-       while :; do
-         # IRIX 6.2 and later do not support large files by default,
-         # so use the C compiler's -n32 option if that helps.
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
-  int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1;
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-         if ac_fn_c_try_compile "$LINENO"
-then :
-  break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-         CC="$CC -n32"
-         if ac_fn_c_try_compile "$LINENO"
+else case e in #(
+  e) ac_save_CC="$CC"
+  ac_opt_found=no
+  for ac_opt in "none needed" "-D_FILE_OFFSET_BITS=64" "-D_LARGE_FILES=1" "-n32"; do
+    if test x"$ac_opt" != x"none needed"
 then :
-  ac_cv_sys_largefile_CC=' -n32'; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-         break
-       done
-       CC=$ac_save_CC
-       rm -f conftest.$ac_ext
-    fi
+  CC="$ac_save_CC $ac_opt"
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; }
-  if test "$ac_cv_sys_largefile_CC" != no; then
-    CC=$CC$ac_cv_sys_largefile_CC
-  fi
-
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if test ${ac_cv_sys_file_offset_bits+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+#ifndef FTYPE
+# define FTYPE off_t
+#endif
+ /* Check that FTYPE can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_FTYPE to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
-  int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
+#define LARGE_FTYPE (((FTYPE) 1 << 31 << 31) - 1 + ((FTYPE) 1 << 31 << 31))
+  int FTYPE_is_large(LARGE_FTYPE % 2147483629 == 721
+		       && LARGE_FTYPE % 2147483647 == 1)
 		      ? 1 : -1;
 int
 main (void)
@@ -7182,171 +7411,89 @@
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
-  ac_cv_sys_file_offset_bits=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#undef _FILE_OFFSET_BITS
-#define _FILE_OFFSET_BITS 64
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
-  int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1;
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
+  if test x"$ac_opt" = x"none needed"
 then :
-  ac_cv_sys_file_offset_bits=64; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  ac_cv_sys_file_offset_bits=unknown
-  break
-done
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; }
-case $ac_cv_sys_file_offset_bits in #(
-  no | unknown) ;;
-  *)
-printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h
-;;
-esac
-rm -rf conftest*
-  case $ac_cv_sys_file_offset_bits in #(
-  unknown) :
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-printf %s "checking for _LARGE_FILES value needed for large files... " >&6; }
-if test ${ac_cv_sys_large_files+y}
+  # GNU/Linux s390x and alpha need _FILE_OFFSET_BITS=64 for wide ino_t.
+	 CC="$CC -DFTYPE=ino_t"
+	 if ac_fn_c_try_compile "$LINENO"
 then :
-  printf %s "(cached) " >&6
-else $as_nop
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
-  int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1;
-int
-main (void)
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
+else case e in #(
+  e) CC="$CC -D_FILE_OFFSET_BITS=64"
+	    if ac_fn_c_try_compile "$LINENO"
 then :
-  ac_cv_sys_large_files=no; break
+  ac_opt='-D_FILE_OFFSET_BITS=64'
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#undef _LARGE_FILES
-#define _LARGE_FILES 1
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
-  int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
-		       && LARGE_OFF_T % 2147483647 == 1)
-		      ? 1 : -1;
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_sys_large_files=1; break
+rm -f core conftest.err conftest.$ac_objext conftest.beam ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  ac_cv_sys_large_files=unknown
-  break
-done
+rm -f core conftest.err conftest.$ac_objext conftest.beam
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-printf "%s\n" "$ac_cv_sys_large_files" >&6; }
-case $ac_cv_sys_large_files in #(
-  no | unknown) ;;
-  *)
-printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h
-;;
+      ac_cv_sys_largefile_opts=$ac_opt
+      ac_opt_found=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+    test $ac_opt_found = no || break
+  done
+  CC="$ac_save_CC"
+
+
+    if test $ac_opt_found != yes; then
+      case $host_os in #(
+  mingw* | windows*) :
+    ac_cv_sys_largefile_opts="supported through gnulib"
+           ac_opt_found=yes
+       ;; #(
+  *) :
+     ;;
 esac
-rm -rf conftest* ;; #(
-  64) :
+    fi
 
- # Check whether --enable-year2038 was given.
-if test ${enable_year2038+y}
-then :
-  enableval=$enable_year2038;
+  test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected" ;;
+esac
 fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_opts" >&5
+printf "%s\n" "$ac_cv_sys_largefile_opts" >&6; }
 
- if test "$enable_year2038" != no
-then :
+ac_have_largefile=yes
+case $ac_cv_sys_largefile_opts in #(
+  "none needed") :
+     ;; #(
+  "supported through gnulib") :
+     ;; #(
+  "support not detected") :
+    ac_have_largefile=no ;; #(
+  "-D_FILE_OFFSET_BITS=64") :
 
-                            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for time_t past the year 2038" >&5
-printf %s "checking for time_t past the year 2038... " >&6; }
-if test ${gl_cv_type_time_t_y2038+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h
+ ;; #(
+  "-D_LARGE_FILES=1") :
 
-  #include <time.h>
-  /* Check that time_t can represent 2**32 - 1 correctly.  */
-  #define LARGE_TIME_T \\
-    ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30)))
-  int verify_time_t_range(LARGE_TIME_T / 65537 == 65535
-                           && LARGE_TIME_T % 65537 == 0)
-                          ? 1 : -1;
+printf "%s\n" "#define _LARGE_FILES 1" >>confdefs.h
+ ;; #(
+  "-n32") :
+    CC="$CC -n32" ;; #(
+  *) :
+    as_fn_error $? "internal error: bad value for \$ac_cv_sys_largefile_opts" "$LINENO" 5 ;;
+esac
 
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
+if test "$enable_year2038" != no
 then :
-  gl_cv_type_time_t_y2038=yes
-else $as_nop
-  gl_cv_type_time_t_y2038=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_y2038" >&5
-printf "%s\n" "$gl_cv_type_time_t_y2038" >&6; }
-  if test "$gl_cv_type_time_t_y2038" = no; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit time_t with _TIME_BITS=64" >&5
-printf %s "checking for 64-bit time_t with _TIME_BITS=64... " >&6; }
-if test ${gl_cv_type_time_t_bits_macro+y}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option for timestamps after 2038" >&5
+printf %s "checking for $CC option for timestamps after 2038... " >&6; }
+if test ${ac_cv_sys_year2038_opts+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) ac_save_CPPFLAGS="$CPPFLAGS"
+  ac_opt_found=no
+  for ac_opt in "none needed" "-D_TIME_BITS=64" "-D__MINGW_USE_VC2005_COMPAT" "-U_USE_32_BIT_TIME_T -D__MINGW_USE_VC2005_COMPAT"; do
+    if test x"$ac_opt" != x"none needed"
+then :
+  CPPFLAGS="$ac_save_CPPFLAGS $ac_opt"
+fi
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#define _TIME_BITS 64
-                           #define _FILE_OFFSET_BITS 64
 
   #include <time.h>
   /* Check that time_t can represent 2**32 - 1 correctly.  */
@@ -7356,73 +7503,57 @@
                            && LARGE_TIME_T % 65537 == 0)
                           ? 1 : -1;
 
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
-  gl_cv_type_time_t_bits_macro=yes
-else $as_nop
-  gl_cv_type_time_t_bits_macro=no
+  ac_cv_sys_year2038_opts="$ac_opt"
+      ac_opt_found=yes
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+    test $ac_opt_found = no || break
+  done
+  CPPFLAGS="$ac_save_CPPFLAGS"
+  test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected" ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_time_t_bits_macro" >&5
-printf "%s\n" "$gl_cv_type_time_t_bits_macro" >&6; }
-    if test "$gl_cv_type_time_t_bits_macro" = yes; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_year2038_opts" >&5
+printf "%s\n" "$ac_cv_sys_year2038_opts" >&6; }
 
-printf "%s\n" "#define _TIME_BITS 64" >>confdefs.h
-
-
-printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h
-
-      gl_cv_type_time_t_y2038=yes
-    fi
-  fi
-  if test $gl_cv_type_time_t_y2038 = no; then
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef _USE_32BIT_TIME_T
-             int ok;
-           #else
-             error fail
-           #endif
+ac_have_year2038=yes
+case $ac_cv_sys_year2038_opts in #(
+  "none needed") :
+     ;; #(
+  "support not detected") :
+    ac_have_year2038=no ;; #(
+  "-D_TIME_BITS=64") :
 
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The 'time_t' type stops working after January 2038.
-          Remove _USE_32BIT_TIME_T from the compiler flags.
-See \`config.log' for more details" "$LINENO" 5; }
-else $as_nop
-  # If not cross-compiling and  says we should check,
-       # and 'touch' works with a large timestamp, then evidently wider time_t
-       # is desired and supported, so fail and ask the builder to fix the
-       # problem.  Otherwise, just warn the builder.
-
-       if test "$gl_warned_about_y2038" != yes; then
-         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The 'time_t' type stops working after January 2038,
-            and this package needs a wider 'time_t' type
-            if there is any way to access timestamps after that.
-            Configure with 'CC=\"${CC} -m64\"' perhaps?" >&5
-printf "%s\n" "$as_me: WARNING: The 'time_t' type stops working after January 2038,
-            and this package needs a wider 'time_t' type
-            if there is any way to access timestamps after that.
-            Configure with 'CC=\"${CC} -m64\"' perhaps?" >&2;}
-         gl_warned_about_y2038=yes
-       fi
+printf "%s\n" "#define _TIME_BITS 64" >>confdefs.h
+ ;; #(
+  "-D__MINGW_USE_VC2005_COMPAT") :
 
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  fi
-fi
+printf "%s\n" "#define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h
  ;; #(
+  "-U_USE_32_BIT_TIME_T"*) :
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "the 'time_t' type is currently forced to be 32-bit. It
+will stop working after mid-January 2038. Remove
+_USE_32BIT_TIME_T from the compiler flags.
+See 'config.log' for more details" "$LINENO" 5; } ;; #(
   *) :
-     ;;
+    as_fn_error $? "internal error: bad value for \$ac_cv_sys_year2038_opts" "$LINENO" 5 ;;
 esac
+
 fi
 
+fi
 
 
   # Pre-early section.
@@ -7442,6 +7573,7 @@
   # Code from module dup2:
   # Code from module errno:
   # Code from module error:
+  # Code from module error-h:
   # Code from module extensions:
   # Code from module extern-inline:
   # Code from module fcntl:
@@ -7469,7 +7601,6 @@
   # Code from module intprops:
   # Code from module largefile:
 
-
   # Code from module lib-msvc-compat:
   # Code from module lib-symbol-versions:
   # Code from module lib-symbol-visibility:
@@ -7495,7 +7626,6 @@
   # Code from module stat:
   # Code from module stat-time:
   # Code from module std-gnu11:
-  # Code from module stdalign:
   # Code from module stdarg:
 
 
@@ -7505,6 +7635,11 @@
   # Code from module stddef:
   # Code from module stdint:
   # Code from module stdio:
+
+
+  printf "%s\n" "#define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h
+
+
   # Code from module stdlib:
   # Code from module strchrnul:
   # Code from module strerror:
@@ -7513,7 +7648,7 @@
   # Code from module strverscmp:
   # Code from module sys_stat:
   # Code from module sys_types:
-  # Code from module time:
+  # Code from module time-h:
   # Code from module unistd:
   # Code from module update-copyright:
   # Code from module useless-if-before-free:
@@ -7715,8 +7850,8 @@
 if test ${ac_cv_path_SED+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+else case e in #(
+  e)           ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
      for ac_i in 1 2 3 4 5 6 7; do
        ac_script="$ac_script$as_nl$ac_script"
      done
@@ -7741,9 +7876,10 @@
       as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
+case `"$ac_path_SED" --version 2>&1` in #(
 *GNU*)
   ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+#(
 *)
   ac_count=0
   printf %s 0123456789 >"conftest.in"
@@ -7778,7 +7914,8 @@
 else
   ac_cv_path_SED=$SED
 fi
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
 printf "%s\n" "$ac_cv_path_SED" >&6; }
@@ -7798,13 +7935,161 @@
 
 
 
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+printf %s "checking for grep that handles long lines and -e... " >&6; }
+if test ${ac_cv_path_GREP+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in grep ggrep
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in #(
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+#(
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf "%s\n" 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+printf "%s\n" "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+printf %s "checking for egrep... " >&6; }
+if test ${ac_cv_path_EGREP+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_prog in egrep
+   do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in #(
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+#(
+*)
+  ac_count=0
+  printf %s 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    printf "%s\n" 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+printf "%s\n" "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+         EGREP_TRADITIONAL=$EGREP
+ ac_cv_path_EGREP_TRADITIONAL=$EGREP
+
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 printf %s "checking for fgrep... " >&6; }
 if test ${ac_cv_path_FGREP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+else case e in #(
+  e) if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
    then ac_cv_path_FGREP="$GREP -F"
    else
      if test -z "$FGREP"; then
@@ -7826,9 +8111,10 @@
       as_fn_executable_p "$ac_path_FGREP" || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
   # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
+case `"$ac_path_FGREP" --version 2>&1` in #(
 *GNU*)
   ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+#(
 *)
   ac_count=0
   printf %s 0123456789 >"conftest.in"
@@ -7864,7 +8150,8 @@
   ac_cv_path_FGREP=$FGREP
 fi
 
-   fi
+   fi ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
 printf "%s\n" "$ac_cv_path_FGREP" >&6; }
@@ -7895,8 +8182,9 @@
 if test ${with_gnu_ld+y}
 then :
   withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
-else $as_nop
-  with_gnu_ld=no
+else case e in #(
+  e) with_gnu_ld=no ;;
+esac
 fi
 
 ac_prog=ld
@@ -7941,8 +8229,8 @@
 if test ${lt_cv_path_LD+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -z "$LD"; then
+else case e in #(
+  e) if test -z "$LD"; then
   lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
     IFS=$lt_save_ifs
@@ -7965,7 +8253,8 @@
   IFS=$lt_save_ifs
 else
   lt_cv_path_LD=$LD # Let the user override the test with a path.
-fi
+fi ;;
+esac
 fi
 
 LD=$lt_cv_path_LD
@@ -7982,8 +8271,8 @@
 if test ${lt_cv_prog_gnu_ld+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+else case e in #(
+  e) # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -7991,6 +8280,7 @@
 *)
   lt_cv_prog_gnu_ld=no
   ;;
+esac ;;
 esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
@@ -8010,8 +8300,8 @@
 if test ${lt_cv_path_NM+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$NM"; then
+else case e in #(
+  e) if test -n "$NM"; then
   # Let the user override the test.
   lt_cv_path_NM=$NM
 else
@@ -8058,7 +8348,8 @@
     IFS=$lt_save_ifs
   done
   : ${lt_cv_path_NM=no}
-fi
+fi ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
 printf "%s\n" "$lt_cv_path_NM" >&6; }
@@ -8079,8 +8370,8 @@
 if test ${ac_cv_prog_DUMPBIN+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$DUMPBIN"; then
+else case e in #(
+  e) if test -n "$DUMPBIN"; then
   ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8102,7 +8393,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 DUMPBIN=$ac_cv_prog_DUMPBIN
 if test -n "$DUMPBIN"; then
@@ -8128,8 +8420,8 @@
 if test ${ac_cv_prog_ac_ct_DUMPBIN+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_DUMPBIN"; then
+else case e in #(
+  e) if test -n "$ac_ct_DUMPBIN"; then
   ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8151,7 +8443,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 if test -n "$ac_ct_DUMPBIN"; then
@@ -8205,8 +8498,8 @@
 if test ${lt_cv_nm_interface+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_nm_interface="BSD nm"
+else case e in #(
+  e) lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
   (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
@@ -8219,7 +8512,8 @@
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
   fi
-  rm -f conftest*
+  rm -f conftest* ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
 printf "%s\n" "$lt_cv_nm_interface" >&6; }
@@ -8241,8 +8535,8 @@
 if test ${lt_cv_sys_max_cmd_len+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-    i=0
+else case e in #(
+  e)   i=0
   teststring=ABCD
 
   case $build_os in
@@ -8364,7 +8658,8 @@
     fi
     ;;
   esac
-
+ ;;
+esac
 fi
 
 if test -n "$lt_cv_sys_max_cmd_len"; then
@@ -8421,8 +8716,8 @@
 if test ${lt_cv_to_host_file_cmd+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $host in
+else case e in #(
+  e) case $host in
   *-*-mingw* )
     case $build in
       *-*-mingw* ) # actually msys
@@ -8453,7 +8748,8 @@
     lt_cv_to_host_file_cmd=func_convert_file_noop
     ;;
 esac
-
+ ;;
+esac
 fi
 
 to_host_file_cmd=$lt_cv_to_host_file_cmd
@@ -8469,8 +8765,8 @@
 if test ${lt_cv_to_tool_file_cmd+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  #assume ordinary cross tools, or native build.
+else case e in #(
+  e) #assume ordinary cross tools, or native build.
 lt_cv_to_tool_file_cmd=func_convert_file_noop
 case $host in
   *-*-mingw* )
@@ -8481,7 +8777,8 @@
     esac
     ;;
 esac
-
+ ;;
+esac
 fi
 
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
@@ -8497,8 +8794,9 @@
 if test ${lt_cv_ld_reload_flag+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_ld_reload_flag='-r'
+else case e in #(
+  e) lt_cv_ld_reload_flag='-r' ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
 printf "%s\n" "$lt_cv_ld_reload_flag" >&6; }
@@ -8539,8 +8837,8 @@
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$OBJDUMP"; then
+else case e in #(
+  e) if test -n "$OBJDUMP"; then
   ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8562,7 +8860,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
@@ -8584,8 +8883,8 @@
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_OBJDUMP"; then
+else case e in #(
+  e) if test -n "$ac_ct_OBJDUMP"; then
   ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8607,7 +8906,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
@@ -8645,8 +8945,8 @@
 if test ${lt_cv_deplibs_check_method+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
+else case e in #(
+  e) lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
 lt_cv_deplibs_check_method='unknown'
 # Need to set the preceding variable on all platforms that support
@@ -8839,7 +9139,8 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 esac
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
 printf "%s\n" "$lt_cv_deplibs_check_method" >&6; }
@@ -8891,8 +9192,8 @@
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$DLLTOOL"; then
+else case e in #(
+  e) if test -n "$DLLTOOL"; then
   ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8914,7 +9215,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
@@ -8936,8 +9238,8 @@
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_DLLTOOL"; then
+else case e in #(
+  e) if test -n "$ac_ct_DLLTOOL"; then
   ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8959,7 +9261,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
@@ -8998,8 +9301,8 @@
 if test ${lt_cv_sharedlib_from_linklib_cmd+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_sharedlib_from_linklib_cmd='unknown'
+else case e in #(
+  e) lt_cv_sharedlib_from_linklib_cmd='unknown'
 
 case $host_os in
 cygwin* | mingw* | pw32* | cegcc*)
@@ -9019,7 +9322,8 @@
   lt_cv_sharedlib_from_linklib_cmd=$ECHO
   ;;
 esac
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
 printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
@@ -9042,8 +9346,8 @@
 if test ${ac_cv_prog_AR+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$AR"; then
+else case e in #(
+  e) if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -9065,7 +9369,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
@@ -9091,8 +9396,8 @@
 if test ${ac_cv_prog_ac_ct_AR+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_AR"; then
+else case e in #(
+  e) if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -9114,7 +9419,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
@@ -9160,8 +9466,8 @@
 if test ${lt_cv_ar_at_file+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_ar_at_file=no
+else case e in #(
+  e) lt_cv_ar_at_file=no
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -9198,7 +9504,8 @@
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+   ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
 printf "%s\n" "$lt_cv_ar_at_file" >&6; }
@@ -9223,8 +9530,8 @@
 if test ${ac_cv_prog_STRIP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$STRIP"; then
+else case e in #(
+  e) if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -9246,7 +9553,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
@@ -9268,8 +9576,8 @@
 if test ${ac_cv_prog_ac_ct_STRIP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_STRIP"; then
+else case e in #(
+  e) if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -9291,7 +9599,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
@@ -9332,8 +9641,8 @@
 if test ${ac_cv_prog_RANLIB+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$RANLIB"; then
+else case e in #(
+  e) if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -9355,7 +9664,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
@@ -9377,8 +9687,8 @@
 if test ${ac_cv_prog_ac_ct_RANLIB+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_RANLIB"; then
+else case e in #(
+  e) if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -9400,7 +9710,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
@@ -9511,8 +9822,8 @@
 if test ${lt_cv_sys_global_symbol_pipe+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 # These are sane defaults that work on at least a few old systems.
 # They come from Ultrix.  What could be older than Ultrix?!! ;)
 
@@ -9764,7 +10075,8 @@
     lt_cv_sys_global_symbol_pipe=
   fi
 done
-
+ ;;
+esac
 fi
 
 if test -z "$lt_cv_sys_global_symbol_pipe"; then
@@ -9828,8 +10140,9 @@
 if test ${with_sysroot+y}
 then :
   withval=$with_sysroot;
-else $as_nop
-  with_sysroot=no
+else case e in #(
+  e) with_sysroot=no ;;
+esac
 fi
 
 
@@ -9864,8 +10177,8 @@
 if test ${ac_cv_path_lt_DD+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  printf 0123456789abcdef0123456789abcdef >conftest.i
+else case e in #(
+  e) printf 0123456789abcdef0123456789abcdef >conftest.i
 cat conftest.i conftest.i >conftest2.i
 : ${lt_DD:=$DD}
 if test -z "$lt_DD"; then
@@ -9901,7 +10214,8 @@
   ac_cv_path_lt_DD=$lt_DD
 fi
 
-rm -f conftest.i conftest2.i conftest.out
+rm -f conftest.i conftest2.i conftest.out ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
 printf "%s\n" "$ac_cv_path_lt_DD" >&6; }
@@ -9912,8 +10226,8 @@
 if test ${lt_cv_truncate_bin+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  printf 0123456789abcdef0123456789abcdef >conftest.i
+else case e in #(
+  e) printf 0123456789abcdef0123456789abcdef >conftest.i
 cat conftest.i conftest.i >conftest2.i
 lt_cv_truncate_bin=
 if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
@@ -9921,7 +10235,8 @@
   && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
 fi
 rm -f conftest.i conftest2.i conftest.out
-test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
 printf "%s\n" "$lt_cv_truncate_bin" >&6; }
@@ -10131,8 +10446,8 @@
 if test ${lt_cv_cc_needs_belf+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_ext=c
+else case e in #(
+  e) ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -10152,8 +10467,9 @@
 if ac_fn_c_try_link "$LINENO"
 then :
   lt_cv_cc_needs_belf=yes
-else $as_nop
-  lt_cv_cc_needs_belf=no
+else case e in #(
+  e) lt_cv_cc_needs_belf=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
@@ -10162,7 +10478,8 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
 printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
@@ -10220,8 +10537,8 @@
 if test ${ac_cv_prog_MANIFEST_TOOL+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$MANIFEST_TOOL"; then
+else case e in #(
+  e) if test -n "$MANIFEST_TOOL"; then
   ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10243,7 +10560,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
 if test -n "$MANIFEST_TOOL"; then
@@ -10265,8 +10583,8 @@
 if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_MANIFEST_TOOL"; then
+else case e in #(
+  e) if test -n "$ac_ct_MANIFEST_TOOL"; then
   ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10288,7 +10606,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
 if test -n "$ac_ct_MANIFEST_TOOL"; then
@@ -10320,15 +10639,16 @@
 if test ${lt_cv_path_mainfest_tool+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_path_mainfest_tool=no
+else case e in #(
+  e) lt_cv_path_mainfest_tool=no
   echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
   $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
   cat conftest.err >&5
   if $GREP 'Manifest Tool' conftest.out > /dev/null; then
     lt_cv_path_mainfest_tool=yes
   fi
-  rm -f conftest*
+  rm -f conftest* ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
 printf "%s\n" "$lt_cv_path_mainfest_tool" >&6; }
@@ -10351,8 +10671,8 @@
 if test ${ac_cv_prog_DSYMUTIL+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$DSYMUTIL"; then
+else case e in #(
+  e) if test -n "$DSYMUTIL"; then
   ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10374,7 +10694,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
@@ -10396,8 +10717,8 @@
 if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_DSYMUTIL"; then
+else case e in #(
+  e) if test -n "$ac_ct_DSYMUTIL"; then
   ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10419,7 +10740,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
@@ -10453,8 +10775,8 @@
 if test ${ac_cv_prog_NMEDIT+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$NMEDIT"; then
+else case e in #(
+  e) if test -n "$NMEDIT"; then
   ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10476,7 +10798,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
@@ -10498,8 +10821,8 @@
 if test ${ac_cv_prog_ac_ct_NMEDIT+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_NMEDIT"; then
+else case e in #(
+  e) if test -n "$ac_ct_NMEDIT"; then
   ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10521,7 +10844,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
@@ -10555,8 +10879,8 @@
 if test ${ac_cv_prog_LIPO+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$LIPO"; then
+else case e in #(
+  e) if test -n "$LIPO"; then
   ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10578,7 +10902,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 LIPO=$ac_cv_prog_LIPO
 if test -n "$LIPO"; then
@@ -10600,8 +10925,8 @@
 if test ${ac_cv_prog_ac_ct_LIPO+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_LIPO"; then
+else case e in #(
+  e) if test -n "$ac_ct_LIPO"; then
   ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10623,7 +10948,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 if test -n "$ac_ct_LIPO"; then
@@ -10657,8 +10983,8 @@
 if test ${ac_cv_prog_OTOOL+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$OTOOL"; then
+else case e in #(
+  e) if test -n "$OTOOL"; then
   ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10680,7 +11006,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 OTOOL=$ac_cv_prog_OTOOL
 if test -n "$OTOOL"; then
@@ -10702,8 +11029,8 @@
 if test ${ac_cv_prog_ac_ct_OTOOL+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_OTOOL"; then
+else case e in #(
+  e) if test -n "$ac_ct_OTOOL"; then
   ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10725,7 +11052,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 if test -n "$ac_ct_OTOOL"; then
@@ -10759,8 +11087,8 @@
 if test ${ac_cv_prog_OTOOL64+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$OTOOL64"; then
+else case e in #(
+  e) if test -n "$OTOOL64"; then
   ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10782,7 +11110,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 OTOOL64=$ac_cv_prog_OTOOL64
 if test -n "$OTOOL64"; then
@@ -10804,8 +11133,8 @@
 if test ${ac_cv_prog_ac_ct_OTOOL64+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_OTOOL64"; then
+else case e in #(
+  e) if test -n "$ac_ct_OTOOL64"; then
   ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10827,7 +11156,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 if test -n "$ac_ct_OTOOL64"; then
@@ -10884,8 +11214,8 @@
 if test ${lt_cv_apple_cc_single_mod+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_apple_cc_single_mod=no
+else case e in #(
+  e) lt_cv_apple_cc_single_mod=no
       if test -z "$LT_MULTI_MODULE"; then
 	# By default we will add the -single_module flag. You can override
 	# by either setting the environment variable LT_MULTI_MODULE
@@ -10911,7 +11241,8 @@
 	fi
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
-      fi
+      fi ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
@@ -10921,8 +11252,8 @@
 if test ${lt_cv_ld_exported_symbols_list+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_ld_exported_symbols_list=no
+else case e in #(
+  e) lt_cv_ld_exported_symbols_list=no
       save_LDFLAGS=$LDFLAGS
       echo "_main" > conftest.sym
       LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
@@ -10940,13 +11271,15 @@
 if ac_fn_c_try_link "$LINENO"
 then :
   lt_cv_ld_exported_symbols_list=yes
-else $as_nop
-  lt_cv_ld_exported_symbols_list=no
+else case e in #(
+  e) lt_cv_ld_exported_symbols_list=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 	LDFLAGS=$save_LDFLAGS
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; }
@@ -10956,8 +11289,8 @@
 if test ${lt_cv_ld_force_load+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_ld_force_load=no
+else case e in #(
+  e) lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
 int forced_loaded() { return 2;}
 _LT_EOF
@@ -10982,7 +11315,8 @@
       fi
         rm -f conftest.err libconftest.a conftest conftest.c
         rm -rf conftest.dSYM
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
 printf "%s\n" "$lt_cv_ld_force_load" >&6; }
@@ -11081,8 +11415,8 @@
 if test ${ac_cv_prog_AS+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$AS"; then
+else case e in #(
+  e) if test -n "$AS"; then
   ac_cv_prog_AS="$AS" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11104,7 +11438,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 AS=$ac_cv_prog_AS
 if test -n "$AS"; then
@@ -11126,8 +11461,8 @@
 if test ${ac_cv_prog_ac_ct_AS+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_AS"; then
+else case e in #(
+  e) if test -n "$ac_ct_AS"; then
   ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11149,7 +11484,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_AS=$ac_cv_prog_ac_ct_AS
 if test -n "$ac_ct_AS"; then
@@ -11183,8 +11519,8 @@
 if test ${ac_cv_prog_DLLTOOL+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$DLLTOOL"; then
+else case e in #(
+  e) if test -n "$DLLTOOL"; then
   ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11206,7 +11542,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
@@ -11228,8 +11565,8 @@
 if test ${ac_cv_prog_ac_ct_DLLTOOL+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_DLLTOOL"; then
+else case e in #(
+  e) if test -n "$ac_ct_DLLTOOL"; then
   ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11251,7 +11588,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
@@ -11285,8 +11623,8 @@
 if test ${ac_cv_prog_OBJDUMP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$OBJDUMP"; then
+else case e in #(
+  e) if test -n "$OBJDUMP"; then
   ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11308,7 +11646,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
@@ -11330,8 +11669,8 @@
 if test ${ac_cv_prog_ac_ct_OBJDUMP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_OBJDUMP"; then
+else case e in #(
+  e) if test -n "$ac_ct_OBJDUMP"; then
   ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11353,7 +11692,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
@@ -11426,8 +11766,9 @@
       IFS=$lt_save_ifs
       ;;
     esac
-else $as_nop
-  enable_shared=yes
+else case e in #(
+  e) enable_shared=yes ;;
+esac
 fi
 
 
@@ -11458,8 +11799,9 @@
       IFS=$lt_save_ifs
       ;;
     esac
-else $as_nop
-  enable_static=yes
+else case e in #(
+  e) enable_static=yes ;;
+esac
 fi
 
 
@@ -11490,8 +11832,9 @@
       IFS=$lt_save_ifs
       ;;
     esac
-else $as_nop
-  pic_mode=default
+else case e in #(
+  e) pic_mode=default ;;
+esac
 fi
 
 
@@ -11521,8 +11864,9 @@
       IFS=$lt_save_ifs
       ;;
     esac
-else $as_nop
-  enable_fast_install=yes
+else case e in #(
+  e) enable_fast_install=yes ;;
+esac
 fi
 
 
@@ -11549,15 +11893,17 @@
       ;;
     esac
     lt_cv_with_aix_soname=$with_aix_soname
-else $as_nop
-  if test ${lt_cv_with_aix_soname+y}
+else case e in #(
+  e) if test ${lt_cv_with_aix_soname+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_with_aix_soname=aix
+else case e in #(
+  e) lt_cv_with_aix_soname=aix ;;
+esac
 fi
 
-    with_aix_soname=$lt_cv_with_aix_soname
+    with_aix_soname=$lt_cv_with_aix_soname ;;
+esac
 fi
 
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
@@ -11648,8 +11994,8 @@
 if test ${lt_cv_objdir+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  rm -f .libs 2>/dev/null
+else case e in #(
+  e) rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
 if test -d .libs; then
   lt_cv_objdir=.libs
@@ -11657,7 +12003,8 @@
   # MS-DOS does not allow filenames that begin with a dot.
   lt_cv_objdir=_libs
 fi
-rmdir .libs 2>/dev/null
+rmdir .libs 2>/dev/null ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
 printf "%s\n" "$lt_cv_objdir" >&6; }
@@ -11718,8 +12065,8 @@
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $MAGIC_CMD in
+else case e in #(
+  e) case $MAGIC_CMD in
 \\/* |  ?:\\/*)
   lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
   ;;
@@ -11762,6 +12109,7 @@
   IFS=$lt_save_ifs
   MAGIC_CMD=$lt_save_MAGIC_CMD
   ;;
+esac ;;
 esac
 fi
 
@@ -11785,8 +12133,8 @@
 if test ${lt_cv_path_MAGIC_CMD+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $MAGIC_CMD in
+else case e in #(
+  e) case $MAGIC_CMD in
 \\/* |  ?:\\/*)
   lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
   ;;
@@ -11829,6 +12177,7 @@
   IFS=$lt_save_ifs
   MAGIC_CMD=$lt_save_MAGIC_CMD
   ;;
+esac ;;
 esac
 fi
 
@@ -11928,8 +12277,8 @@
 if test ${lt_cv_prog_compiler_rtti_exceptions+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_rtti_exceptions=no
+else case e in #(
+  e) lt_cv_prog_compiler_rtti_exceptions=no
    ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
@@ -11957,7 +12306,8 @@
      fi
    fi
    $RM conftest*
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
@@ -12328,8 +12678,9 @@
 if test ${lt_cv_prog_compiler_pic+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+else case e in #(
+  e) lt_cv_prog_compiler_pic=$lt_prog_compiler_pic ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
 printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; }
@@ -12344,8 +12695,8 @@
 if test ${lt_cv_prog_compiler_pic_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_pic_works=no
+else case e in #(
+  e) lt_cv_prog_compiler_pic_works=no
    ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
@@ -12373,7 +12724,8 @@
      fi
    fi
    $RM conftest*
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
 printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
@@ -12409,8 +12761,8 @@
 if test ${lt_cv_prog_compiler_static_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_static_works=no
+else case e in #(
+  e) lt_cv_prog_compiler_static_works=no
    save_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -12431,7 +12783,8 @@
    fi
    $RM -r conftest*
    LDFLAGS=$save_LDFLAGS
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
 printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
@@ -12453,8 +12806,8 @@
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_c_o=no
+else case e in #(
+  e) lt_cv_prog_compiler_c_o=no
    $RM -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
@@ -12494,7 +12847,8 @@
    cd ..
    $RM -r conftest
    $RM conftest*
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
 printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
@@ -12509,8 +12863,8 @@
 if test ${lt_cv_prog_compiler_c_o+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler_c_o=no
+else case e in #(
+  e) lt_cv_prog_compiler_c_o=no
    $RM -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
@@ -12550,7 +12904,8 @@
    cd ..
    $RM -r conftest
    $RM conftest*
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
 printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
@@ -13147,8 +13502,8 @@
   if test ${lt_cv_aix_libpath_+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -13180,7 +13535,8 @@
   if test -z "$lt_cv_aix_libpath_"; then
     lt_cv_aix_libpath_=/usr/lib:/lib
   fi
-
+   ;;
+esac
 fi
 
   aix_libpath=$lt_cv_aix_libpath_
@@ -13202,8 +13558,8 @@
   if test ${lt_cv_aix_libpath_+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -13235,7 +13591,8 @@
   if test -z "$lt_cv_aix_libpath_"; then
     lt_cv_aix_libpath_=/usr/lib:/lib
   fi
-
+   ;;
+esac
 fi
 
   aix_libpath=$lt_cv_aix_libpath_
@@ -13486,8 +13843,8 @@
 if test ${lt_cv_prog_compiler__b+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_prog_compiler__b=no
+else case e in #(
+  e) lt_cv_prog_compiler__b=no
    save_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS -b"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -13508,7 +13865,8 @@
    fi
    $RM -r conftest*
    LDFLAGS=$save_LDFLAGS
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
 printf "%s\n" "$lt_cv_prog_compiler__b" >&6; }
@@ -13556,8 +13914,8 @@
 if test ${lt_cv_irix_exported_symbol+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  save_LDFLAGS=$LDFLAGS
+else case e in #(
+  e) save_LDFLAGS=$LDFLAGS
 	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
 	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -13566,12 +13924,14 @@
 if ac_fn_c_try_link "$LINENO"
 then :
   lt_cv_irix_exported_symbol=yes
-else $as_nop
-  lt_cv_irix_exported_symbol=no
+else case e in #(
+  e) lt_cv_irix_exported_symbol=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-           LDFLAGS=$save_LDFLAGS
+           LDFLAGS=$save_LDFLAGS ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
 printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
@@ -13897,8 +14257,8 @@
 if test ${lt_cv_archive_cmds_need_lc+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  $RM conftest*
+else case e in #(
+  e) $RM conftest*
 	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
 	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -13934,7 +14294,8 @@
 	  cat conftest.err 1>&5
 	fi
 	$RM conftest*
-
+	 ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
 printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; }
@@ -14661,8 +15022,8 @@
   if test ${lt_cv_shlibpath_overrides_runpath+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  lt_cv_shlibpath_overrides_runpath=no
+else case e in #(
+  e) lt_cv_shlibpath_overrides_runpath=no
     save_LDFLAGS=$LDFLAGS
     save_libdir=$libdir
     eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
@@ -14689,7 +15050,8 @@
     conftest$ac_exeext conftest.$ac_ext
     LDFLAGS=$save_LDFLAGS
     libdir=$save_libdir
-
+     ;;
+esac
 fi
 
   shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
@@ -15126,16 +15488,22 @@
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
 int
 main (void)
 {
@@ -15147,24 +15515,27 @@
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_dl_dlopen=yes
-else $as_nop
-  ac_cv_lib_dl_dlopen=no
+else case e in #(
+  e) ac_cv_lib_dl_dlopen=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
-else $as_nop
-
+else case e in #(
+  e)
     lt_cv_dlopen=dyld
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
-
+     ;;
+esac
 fi
 
     ;;
@@ -15182,22 +15553,28 @@
 if test "x$ac_cv_func_shl_load" = xyes
 then :
   lt_cv_dlopen=shl_load
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+else case e in #(
+  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 printf %s "checking for shl_load in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_shl_load+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load (void);
 int
 main (void)
 {
@@ -15209,39 +15586,47 @@
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_dld_shl_load=yes
-else $as_nop
-  ac_cv_lib_dld_shl_load=no
+else case e in #(
+  e) ac_cv_lib_dld_shl_load=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
 printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
 if test "x$ac_cv_lib_dld_shl_load" = xyes
 then :
   lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
-else $as_nop
-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+else case e in #(
+  e) ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
 if test "x$ac_cv_func_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+else case e in #(
+  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 printf %s "checking for dlopen in -ldl... " >&6; }
 if test ${ac_cv_lib_dl_dlopen+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
 int
 main (void)
 {
@@ -15253,34 +15638,42 @@
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_dl_dlopen=yes
-else $as_nop
-  ac_cv_lib_dl_dlopen=no
+else case e in #(
+  e) ac_cv_lib_dl_dlopen=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+else case e in #(
+  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 printf %s "checking for dlopen in -lsvld... " >&6; }
 if test ${ac_cv_lib_svld_dlopen+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen (void);
 int
 main (void)
 {
@@ -15292,34 +15685,42 @@
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_svld_dlopen=yes
-else $as_nop
-  ac_cv_lib_svld_dlopen=no
+else case e in #(
+  e) ac_cv_lib_svld_dlopen=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
 printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; }
 if test "x$ac_cv_lib_svld_dlopen" = xyes
 then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+else case e in #(
+  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 printf %s "checking for dld_link in -ldld... " >&6; }
 if test ${ac_cv_lib_dld_dld_link+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_check_lib_save_LIBS=$LIBS
+else case e in #(
+  e) ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-char dld_link ();
+   builtin and then its argument prototype would still apply.
+   The 'extern "C"' is for builds by C++ compilers;
+   although this is not generally supported in C code supporting it here
+   has little cost and some practical benefit (sr 110532).  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link (void);
 int
 main (void)
 {
@@ -15331,12 +15732,14 @@
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_lib_dld_dld_link=yes
-else $as_nop
-  ac_cv_lib_dld_dld_link=no
+else case e in #(
+  e) ac_cv_lib_dld_dld_link=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
 printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; }
@@ -15345,19 +15748,24 @@
   lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
 fi
 
-
+	       ;;
+esac
 fi
 
-
+	     ;;
+esac
 fi
 
-
+	   ;;
+esac
 fi
 
-
+	 ;;
+esac
 fi
 
-
+       ;;
+esac
 fi
 
     ;;
@@ -15385,8 +15793,8 @@
 if test ${lt_cv_dlopen_self+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  	  if test yes = "$cross_compiling"; then :
+else case e in #(
+  e) 	  if test yes = "$cross_compiling"; then :
   lt_cv_dlopen_self=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -15480,7 +15888,8 @@
 fi
 rm -fr conftest*
 
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
 printf "%s\n" "$lt_cv_dlopen_self" >&6; }
@@ -15492,8 +15901,8 @@
 if test ${lt_cv_dlopen_self_static+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  	  if test yes = "$cross_compiling"; then :
+else case e in #(
+  e) 	  if test yes = "$cross_compiling"; then :
   lt_cv_dlopen_self_static=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -15587,7 +15996,8 @@
 fi
 rm -fr conftest*
 
-
+       ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
 printf "%s\n" "$lt_cv_dlopen_self_static" >&6; }
@@ -15750,6 +16160,8 @@
 
 
 
+
+
                         # Check whether --enable-cross-guesses was given.
 if test ${enable_cross_guesses+y}
 then :
@@ -15759,8 +16171,9 @@
        enableval=conservative
      fi
      gl_cross_guesses="$enableval"
-else $as_nop
-  gl_cross_guesses=conservative
+else case e in #(
+  e) gl_cross_guesses=conservative ;;
+esac
 fi
 
   if test $gl_cross_guesses = risky; then
@@ -15778,10 +16191,11 @@
 if test "x$ac_cv_type_size_t" = xyes
 then :
 
-else $as_nop
-
+else case e in #(
+  e)
 printf "%s\n" "#define size_t unsigned int" >>confdefs.h
-
+ ;;
+esac
 fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
@@ -15791,8 +16205,8 @@
 if test ${ac_cv_working_alloca_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <alloca.h>
 int
@@ -15807,11 +16221,13 @@
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_working_alloca_h=yes
-else $as_nop
-  ac_cv_working_alloca_h=no
+else case e in #(
+  e) ac_cv_working_alloca_h=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
+    conftest$ac_exeext conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
 printf "%s\n" "$ac_cv_working_alloca_h" >&6; }
@@ -15826,10 +16242,10 @@
 if test ${ac_cv_func_alloca_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test $ac_cv_working_alloca_h = yes; then
-  ac_cv_func_alloca_works=yes
-else
+else case e in #(
+  e) ac_cv_func_alloca_works=$ac_cv_working_alloca_h
+if test "$ac_cv_func_alloca_works" != yes
+then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
@@ -15860,15 +16276,14 @@
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_func_alloca_works=yes
-else $as_nop
-  ac_cv_func_alloca_works=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
+fi ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
 printf "%s\n" "$ac_cv_func_alloca_works" >&6; }
-fi
 
 if test $ac_cv_func_alloca_works = yes; then
 
@@ -15894,12 +16309,12 @@
 if test ${ac_cv_c_stack_direction+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   ac_cv_c_stack_direction=0
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -15922,13 +16337,16 @@
 if ac_fn_c_try_run "$LINENO"
 then :
   ac_cv_c_stack_direction=1
-else $as_nop
-  ac_cv_c_stack_direction=-1
+else case e in #(
+  e) ac_cv_c_stack_direction=-1 ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
 printf "%s\n" "$ac_cv_c_stack_direction" >&6; }
@@ -15944,8 +16362,8 @@
 if test ${gl_cv_have_include_next+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  rm -rf conftestd1a conftestd1b conftestd2
+else case e in #(
+  e) rm -rf conftestd1a conftestd1b conftestd2
      mkdir conftestd1a conftestd1b conftestd2
                                                   cat <<EOF > conftestd1a/conftest.h
 #define DEFINED_IN_CONFTESTD1
@@ -15972,8 +16390,8 @@
 #endif
 #define DEFINED_IN_CONFTESTD2
 EOF
-     gl_save_CPPFLAGS="$CPPFLAGS"
-     CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2"
+     gl_saved_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$gl_saved_CPPFLAGS -Iconftestd1b -Iconftestd2"
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <conftest.h>
@@ -15981,8 +16399,8 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_have_include_next=yes
-else $as_nop
-  CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
+else case e in #(
+  e) CPPFLAGS="$gl_saved_CPPFLAGS -Iconftestd1a -Iconftestd2"
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <conftest.h>
@@ -15990,16 +16408,19 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_have_include_next=buggy
-else $as_nop
-  gl_cv_have_include_next=no
+else case e in #(
+  e) gl_cv_have_include_next=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+        ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-     CPPFLAGS="$gl_save_CPPFLAGS"
+     CPPFLAGS="$gl_saved_CPPFLAGS"
      rm -rf conftestd1a conftestd1b conftestd2
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have_include_next" >&5
 printf "%s\n" "$gl_cv_have_include_next" >&6; }
@@ -16028,8 +16449,8 @@
 if test ${gl_cv_source_line_length_unlimited+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef __TANDEM
@@ -16038,15 +16459,17 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "choke me" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "choke me" >/dev/null 2>&1
 then :
   gl_cv_source_line_length_unlimited=no
-else $as_nop
-  gl_cv_source_line_length_unlimited=yes
+else case e in #(
+  e) gl_cv_source_line_length_unlimited=yes ;;
+esac
 fi
 rm -rf conftest*
 
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_source_line_length_unlimited" >&5
 printf "%s\n" "$gl_cv_source_line_length_unlimited" >&6; }
@@ -16112,6 +16535,7 @@
   REPLACE_COPY_FILE_RANGE=0;
   REPLACE_DUP=0;
   REPLACE_DUP2=0;
+  REPLACE_DUP3=0;
   REPLACE_EXECL=0;
   REPLACE_EXECLE=0;
   REPLACE_EXECLP=0;
@@ -16120,11 +16544,14 @@
   REPLACE_EXECVP=0;
   REPLACE_EXECVPE=0;
   REPLACE_FACCESSAT=0;
+  REPLACE_FCHDIR=0;
   REPLACE_FCHOWNAT=0;
+  REPLACE_FDATASYNC=0;
   REPLACE_FTRUNCATE=0;
   REPLACE_GETCWD=0;
   REPLACE_GETDOMAINNAME=0;
   REPLACE_GETDTABLESIZE=0;
+  REPLACE_GETENTROPY=0;
   REPLACE_GETLOGIN_R=0;
   REPLACE_GETGROUPS=0;
   REPLACE_GETPAGESIZE=0;
@@ -16135,12 +16562,14 @@
   REPLACE_LINK=0;
   REPLACE_LINKAT=0;
   REPLACE_LSEEK=0;
+  REPLACE_PIPE2=0;
   REPLACE_PREAD=0;
   REPLACE_PWRITE=0;
   REPLACE_READ=0;
   REPLACE_READLINK=0;
   REPLACE_READLINKAT=0;
   REPLACE_RMDIR=0;
+  REPLACE_SETHOSTNAME=0;
   REPLACE_SLEEP=0;
   REPLACE_SYMLINK=0;
   REPLACE_SYMLINKAT=0;
@@ -16183,6 +16612,43 @@
 
 
 
+
+
+    if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
+      REPLACE_CLOSE=1
+    fi
+
+
+
+
+
+
+  if test $ac_cv_header_sys_socket_h != yes; then
+                    ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
+if test "x$ac_cv_header_winsock2_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h
+
+fi
+
+  fi
+  if test "$ac_cv_header_winsock2_h" = yes; then
+    HAVE_WINSOCK2_H=1
+    UNISTD_H_HAVE_WINSOCK2_H=1
+    SYS_IOCTL_H_HAVE_WINSOCK2_H=1
+  else
+    HAVE_WINSOCK2_H=0
+  fi
+
+
+    if test $UNISTD_H_HAVE_WINSOCK2_H = 1; then
+                        REPLACE_CLOSE=1
+    fi
+
+
+
+
+
   GL_GNULIB_ACCESS=0
 
 
@@ -16581,8 +17047,8 @@
 if test ${gl_cv_header_errno_h_complete+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -16641,15 +17107,17 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "booboo" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "booboo" >/dev/null 2>&1
 then :
   gl_cv_header_errno_h_complete=no
-else $as_nop
-  gl_cv_header_errno_h_complete=yes
+else case e in #(
+  e) gl_cv_header_errno_h_complete=yes ;;
+esac
 fi
 rm -rf conftest*
 
-
+   ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_complete" >&5
 printf "%s\n" "$gl_cv_header_errno_h_complete" >&6; }
@@ -16672,8 +17140,8 @@
 if test ${gl_cv_next_errno_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16686,7 +17154,7 @@
   esac
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
                                           gl_dirsep_regex='/\\'
       ;;
     *)
@@ -16709,7 +17177,8 @@
           gl_header=$gl_cv_absolute_errno_h
           gl_cv_next_errno_h='"'$gl_header'"'
 
-
+          ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_errno_h" >&5
 printf "%s\n" "$gl_cv_next_errno_h" >&6; }
@@ -16737,8 +17206,8 @@
 if test ${gl_cv_header_errno_h_EMULTIHOP+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -16749,11 +17218,12 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
 then :
   gl_cv_header_errno_h_EMULTIHOP=yes
-else $as_nop
-  gl_cv_header_errno_h_EMULTIHOP=no
+else case e in #(
+  e) gl_cv_header_errno_h_EMULTIHOP=no ;;
+esac
 fi
 rm -rf conftest*
 
@@ -16769,7 +17239,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
 then :
   gl_cv_header_errno_h_EMULTIHOP=hidden
 fi
@@ -16789,7 +17259,8 @@
 
         fi
       fi
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EMULTIHOP" >&5
 printf "%s\n" "$gl_cv_header_errno_h_EMULTIHOP" >&6; }
@@ -16812,8 +17283,8 @@
 if test ${gl_cv_header_errno_h_ENOLINK+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -16824,11 +17295,12 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
 then :
   gl_cv_header_errno_h_ENOLINK=yes
-else $as_nop
-  gl_cv_header_errno_h_ENOLINK=no
+else case e in #(
+  e) gl_cv_header_errno_h_ENOLINK=no ;;
+esac
 fi
 rm -rf conftest*
 
@@ -16844,7 +17316,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
 then :
   gl_cv_header_errno_h_ENOLINK=hidden
 fi
@@ -16864,7 +17336,8 @@
 
         fi
       fi
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_ENOLINK" >&5
 printf "%s\n" "$gl_cv_header_errno_h_ENOLINK" >&6; }
@@ -16887,8 +17360,8 @@
 if test ${gl_cv_header_errno_h_EOVERFLOW+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -16899,11 +17372,12 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
 then :
   gl_cv_header_errno_h_EOVERFLOW=yes
-else $as_nop
-  gl_cv_header_errno_h_EOVERFLOW=no
+else case e in #(
+  e) gl_cv_header_errno_h_EOVERFLOW=no ;;
+esac
 fi
 rm -rf conftest*
 
@@ -16919,7 +17393,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "yes" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
 then :
   gl_cv_header_errno_h_EOVERFLOW=hidden
 fi
@@ -16939,7 +17413,8 @@
 
         fi
       fi
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EOVERFLOW" >&5
 printf "%s\n" "$gl_cv_header_errno_h_EOVERFLOW" >&6; }
@@ -16956,13 +17431,14 @@
   fi
 
 
+
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
 printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
 if test ${ac_cv_c_undeclared_builtin_options+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_save_CFLAGS=$CFLAGS
+else case e in #(
+  e) ac_save_CFLAGS=$CFLAGS
    ac_cv_c_undeclared_builtin_options='cannot detect'
    for ac_arg in '' -fno-builtin; do
      CFLAGS="$ac_save_CFLAGS $ac_arg"
@@ -16981,8 +17457,8 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
 
-else $as_nop
-  # This test program should compile successfully.
+else case e in #(
+  e) # This test program should compile successfully.
         # No library function is consistently available on
         # freestanding implementations, so test against a dummy
         # declaration.  Include always-available headers on the
@@ -17010,38 +17486,364 @@
   if test x"$ac_arg" = x
 then :
   ac_cv_c_undeclared_builtin_options='none needed'
-else $as_nop
-  ac_cv_c_undeclared_builtin_options=$ac_arg
+else case e in #(
+  e) ac_cv_c_undeclared_builtin_options=$ac_arg ;;
+esac
 fi
           break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
     done
     CFLAGS=$ac_save_CFLAGS
-
+   ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
 printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; }
   case $ac_cv_c_undeclared_builtin_options in #(
   'cannot detect') :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot make $CC report undeclared builtins
-See \`config.log' for more details" "$LINENO" 5; } ;; #(
+See 'config.log' for more details" "$LINENO" 5; } ;; #(
   'none needed') :
     ac_c_undeclared_builtin_options='' ;; #(
   *) :
     ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;;
 esac
 
+
+
+
+
+
+
+
+
+
+
+
+     if test $gl_cv_have_include_next = yes; then
+       gl_cv_next_error_h='<'error.h'>'
+     else
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <error.h>" >&5
+printf %s "checking absolute name of <error.h>... " >&6; }
+if test ${gl_cv_next_error_h+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e)
+             if test $ac_cv_header_error_h = yes; then
+
+
+
+
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <error.h>
+_ACEOF
+                case "$host_os" in
+    aix*) gl_absname_cpp="$ac_cpp -C" ;;
+    *)    gl_absname_cpp="$ac_cpp" ;;
+  esac
+
+  case "$host_os" in
+    mingw* | windows*)
+                                          gl_dirsep_regex='/\\'
+      ;;
+    *)
+      gl_dirsep_regex='\/'
+      ;;
+  esac
+      gl_make_literal_regex_sed='s,$^\\.*/,\\&,g'
+  gl_header_literal_regex=`echo 'error.h' \
+                           | sed -e "$gl_make_literal_regex_sed"`
+  gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+      s/.*"$.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'$".*/\1/
+      s|^/^/|//&|
+      p
+      q
+    }'
+
+        gl_cv_absolute_error_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+  sed -n "$gl_absolute_header_sed"`
+
+          gl_header=$gl_cv_absolute_error_h
+          gl_cv_next_error_h='"'$gl_header'"'
+          else
+               gl_cv_next_error_h='<'error.h'>'
+             fi
+
+          ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_error_h" >&5
+printf "%s\n" "$gl_cv_next_error_h" >&6; }
+     fi
+     NEXT_ERROR_H=$gl_cv_next_error_h
+
+     if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+       gl_next_as_first_directive='<'error.h'>'
+     else
+       # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+       gl_next_as_first_directive=$gl_cv_next_error_h
+     fi
+     NEXT_AS_FIRST_DIRECTIVE_ERROR_H=$gl_next_as_first_directive
+
+
+
+
+  if test $ac_cv_header_error_h = yes; then
+    HAVE_ERROR_H=1
+  else
+    HAVE_ERROR_H=0
+  fi
+
+
+  REPLACE_ERROR=0
+
+
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for error" >&5
+printf %s "checking for error... " >&6; }
+if test ${gl_cv_onwards_func_error+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e)
+  exec 9>&6 6>/dev/null
+
+       case "$host_os" in
+
+         linux*-android*)
+           ac_fn_check_decl "$LINENO" "error" "ac_cv_have_decl_error" "#include <error.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_error" = xyes
+then :
+
+fi
+           if test $ac_cv_have_decl_error = yes; then
+             ac_fn_c_check_func "$LINENO" "error" "ac_cv_func_error"
+if test "x$ac_cv_func_error" = xyes
+then :
+
+fi
+
+             if test $ac_cv_func_error = yes; then
+               gl_cv_onwards_func_error=yes
+             else
+                                                            gl_cv_onwards_func_error='future OS version'
+             fi
+           else
+             gl_cv_onwards_func_error='future OS version'
+           fi
+           ;;
+
+
+         *)
+           ac_fn_c_check_func "$LINENO" "error" "ac_cv_func_error"
+if test "x$ac_cv_func_error" = xyes
+then :
+
+fi
+
+           gl_cv_onwards_func_error=$ac_cv_func_error
+           ;;
+
+       esac
+
+  exec 6>&9 9>&-
+
+     ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_error" >&5
+printf "%s\n" "$gl_cv_onwards_func_error" >&6; }
+
+  case "$gl_cv_onwards_func_error" in
+    future*) ac_cv_func_error=no ;;
+    *)       ac_cv_func_error=$gl_cv_onwards_func_error ;;
+  esac
+  if test $ac_cv_func_error = yes; then
+
+printf "%s\n" "#define HAVE_ERROR 1" >>confdefs.h
+
+  fi
+
+
+  if test $ac_cv_func_error = yes; then
+    HAVE_ERROR=1
+  else
+    HAVE_ERROR=0
+    case "$gl_cv_onwards_func_error" in
+      future*) REPLACE_ERROR=1 ;;
+    esac
+  fi
+
+        ac_fn_check_decl "$LINENO" "error_at_line" "ac_cv_have_decl_error_at_line" "#include <error.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_error_at_line" = xyes
+then :
+
+fi
+  if test $ac_cv_have_decl_error_at_line = yes; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
+printf %s "checking for error_at_line... " >&6; }
+if test ${ac_cv_lib_error_at_line+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <error.h>
+int
+main (void)
+{
+error_at_line (0, 0, "", 0, "an error occurred");
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  ac_cv_lib_error_at_line=yes
+else case e in #(
+  e) ac_cv_lib_error_at_line=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
+printf "%s\n" "$ac_cv_lib_error_at_line" >&6; }
+  else
+    ac_cv_lib_error_at_line=no
+  fi
+  if test $ac_cv_lib_error_at_line = yes; then
+    HAVE_ERROR_AT_LINE=1
+  else
+    HAVE_ERROR_AT_LINE=0
+  fi
+  REPLACE_ERROR_AT_LINE=0
+
+  if test $ac_cv_func_error = yes && test $ac_cv_lib_error_at_line = yes; then
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working error function" >&5
+printf %s "checking for working error function... " >&6; }
+if test ${gl_cv_func_working_error+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) if test $cross_compiling != yes; then
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+              #include <error.h>
+              static void print_no_progname (void) {}
+
+int
+main (void)
+{
+
+              error_print_progname = print_no_progname;
+              error (0, 0, "foo");
+
+  ;
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  rm -f conftest.out
+            if test -s conftest$ac_exeext \
+               && ./conftest$ac_exeext 2> conftest.out; then
+              if grep ' ' conftest.out >/dev/null; then
+                gl_cv_func_working_error=no
+              else
+                gl_cv_func_working_error=yes
+              fi
+            else
+              gl_cv_func_working_error=no
+            fi
+            rm -f conftest.out
+
+else case e in #(
+  e) gl_cv_func_working_error=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+       else
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+              #include <error.h>
+
+int
+main (void)
+{
+
+              error (0, 0, "foo");
+
+  ;
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  case "$host_os" in
+                               # Guess yes on glibc systems.
+              *-gnu* | gnu*)   gl_cv_func_working_error="guessing yes" ;;
+                               # Guess no on Android.
+              linux*-android*) gl_cv_func_working_error="guessing no" ;;
+                               # If we don't know, obey --enable-cross-guesses.
+              *)               gl_cv_func_working_error="$gl_cross_guess_normal" ;;
+            esac
+
+else case e in #(
+  e) gl_cv_func_working_error=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+       fi
+       ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_error" >&5
+printf "%s\n" "$gl_cv_func_working_error" >&6; }
+    case "$gl_cv_func_working_error" in
+      *no)
+        REPLACE_ERROR=1
+        REPLACE_ERROR_AT_LINE=1
+        ;;
+    esac
+  fi
+
+  if test $HAVE_ERROR = 0 || test $REPLACE_ERROR = 1 \
+     || test $HAVE_ERROR_AT_LINE = 0 || test $REPLACE_ERROR_AT_LINE = 1; then
+    COMPILE_ERROR_C=1
+  else
+    COMPILE_ERROR_C=0
+  fi
+
+
+
+
+
+
 ac_fn_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_strerror_r" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
 printf "%s\n" "#define HAVE_DECL_STRERROR_R $ac_have_decl" >>confdefs.h
 
@@ -17060,8 +17862,8 @@
 if test ${ac_cv_func_strerror_r_char_p+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
     ac_cv_func_strerror_r_char_p=no
     if test $ac_cv_have_decl_strerror_r = yes; then
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17087,7 +17889,8 @@
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
     fi
-
+   ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
 printf "%s\n" "$ac_cv_func_strerror_r_char_p" >&6; }
@@ -17106,8 +17909,8 @@
 if test ${gl_cv_have___header_inline+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
                          #ifndef __header_inline
@@ -17118,10 +17921,12 @@
 if ac_fn_c_try_cpp "$LINENO"
 then :
   gl_cv_have___header_inline=yes
-else $as_nop
-  gl_cv_have___header_inline=no
+else case e in #(
+  e) gl_cv_have___header_inline=no ;;
+esac
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_have___header_inline" >&5
 printf "%s\n" "$gl_cv_have___header_inline" >&6; }
@@ -17183,17 +17988,17 @@
 if test ${gl_cv_header_working_fcntl_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
-                  # Guess 'no' on native Windows.
-          mingw*) gl_cv_header_working_fcntl_h='no' ;;
-          *)      gl_cv_header_working_fcntl_h=cross-compiling ;;
+                             # Guess 'no' on native Windows.
+          mingw* | windows*) gl_cv_header_working_fcntl_h='no' ;;
+          *)                 gl_cv_header_working_fcntl_h=cross-compiling ;;
         esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
            #include <sys/stat.h>
@@ -17295,19 +18100,22 @@
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_header_working_fcntl_h=yes
-else $as_nop
-  case $? in #(
+else case e in #(
+  e) case $? in #(
         4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
         64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
         68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
          *) gl_cv_header_working_fcntl_h='no';;
-        esac
+        esac ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_fcntl_h" >&5
 printf "%s\n" "$gl_cv_header_working_fcntl_h" >&6; }
@@ -17334,8 +18142,8 @@
 if test "x$ac_cv_type_pid_t" = xyes
 then :
 
-else $as_nop
-                                          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e)                                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
           #if defined _WIN64 && !defined __CYGWIN__
@@ -17354,14 +18162,16 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_pid_type='int'
-else $as_nop
-  ac_pid_type='__int64'
+else case e in #(
+  e) ac_pid_type='__int64' ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 printf "%s\n" "#define pid_t $ac_pid_type" >>confdefs.h
 
-
+     ;;
+esac
 fi
 
 
@@ -17369,10 +18179,11 @@
 if test "x$ac_cv_type_mode_t" = xyes
 then :
 
-else $as_nop
-
+else case e in #(
+  e)
 printf "%s\n" "#define mode_t int" >>confdefs.h
-
+ ;;
+esac
 fi
 
 
@@ -17394,8 +18205,8 @@
 if test ${gl_cv_next_fcntl_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17408,7 +18219,7 @@
   esac
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
                                           gl_dirsep_regex='/\\'
       ;;
     *)
@@ -17431,7 +18242,8 @@
           gl_header=$gl_cv_absolute_fcntl_h
           gl_cv_next_fcntl_h='"'$gl_header'"'
 
-
+          ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_fcntl_h" >&5
 printf "%s\n" "$gl_cv_next_fcntl_h" >&6; }
@@ -17491,8 +18303,8 @@
 if test ${ac_cv_header_stat_broken+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -17517,10 +18329,12 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_header_stat_broken=no
-else $as_nop
-  ac_cv_header_stat_broken=yes
+else case e in #(
+  e) ac_cv_header_stat_broken=yes ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
 printf "%s\n" "$ac_cv_header_stat_broken" >&6; }
@@ -17533,14 +18347,14 @@
 
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
                         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 64-bit off_t" >&5
 printf %s "checking for 64-bit off_t... " >&6; }
 if test ${gl_cv_type_off_t_64+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
                 int verify_off_t_sizesizeof (off_t) >= 8 ? 1 : -1;
@@ -17556,11 +18370,13 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_type_off_t_64=yes
-else $as_nop
-  gl_cv_type_off_t_64=no
+else case e in #(
+  e) gl_cv_type_off_t_64=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+         ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_off_t_64" >&5
 printf "%s\n" "$gl_cv_type_off_t_64" >&6; }
@@ -17574,8 +18390,8 @@
 if test ${gl_cv_member_st_size_64+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
                 struct stat buf;
@@ -17592,11 +18408,13 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_member_st_size_64=yes
-else $as_nop
-  gl_cv_member_st_size_64=no
+else case e in #(
+  e) gl_cv_member_st_size_64=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+         ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_member_st_size_64" >&5
 printf "%s\n" "$gl_cv_member_st_size_64" >&6; }
@@ -17617,8 +18435,8 @@
 if test ${ac_cv_c_restrict+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_c_restrict=no
+else case e in #(
+  e) ac_cv_c_restrict=no
    # Put '__restrict__' first, to avoid problems with glibc and non-GCC; see:
    # https://lists.gnu.org/archive/html/bug-autoconf/2016-02/msg00006.html
    # Put 'restrict' last, because C++ lacks it.
@@ -17649,7 +18467,8 @@
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      test "$ac_cv_c_restrict" != no && break
    done
-
+   ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
 printf "%s\n" "$ac_cv_c_restrict" >&6; }
@@ -17684,8 +18503,8 @@
 if test ${gl_cv_next_sys_stat_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_sys_stat_h = yes; then
 
 
@@ -17701,7 +18520,7 @@
   esac
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
                                           gl_dirsep_regex='/\\'
       ;;
     *)
@@ -17727,7 +18546,8 @@
                gl_cv_next_sys_stat_h='<'sys/stat.h'>'
              fi
 
-
+          ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_stat_h" >&5
 printf "%s\n" "$gl_cv_next_sys_stat_h" >&6; }
@@ -17765,10 +18585,11 @@
 if test "x$ac_cv_type_nlink_t" = xyes
 then :
 
-else $as_nop
-
+else case e in #(
+  e)
 printf "%s\n" "#define nlink_t int" >>confdefs.h
-
+ ;;
+esac
 fi
 
 
@@ -17781,7 +18602,7 @@
 
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
       ac_fn_c_check_header_compile "$LINENO" "sdkddkver.h" "ac_cv_header_sdkddkver_h" "$ac_includes_default"
 if test "x$ac_cv_header_sdkddkver_h" = xyes
 then :
@@ -17885,7 +18706,9 @@
   HAVE_DECL_FTELLO=1;
   HAVE_DECL_GETDELIM=1;
   HAVE_DECL_GETLINE=1;
+  HAVE_DECL_GETW=1;
   HAVE_DECL_OBSTACK_PRINTF=1;
+  HAVE_DECL_PUTW=1;
   HAVE_DECL_SNPRINTF=1;
   HAVE_DECL_VSNPRINTF=1;
   HAVE_DPRINTF=1;
@@ -17934,14 +18757,14 @@
 if test "x$ac_cv_have_decl_getdelim" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
 printf "%s\n" "#define HAVE_DECL_GETDELIM $ac_have_decl" >>confdefs.h
 
 
 
-
   GL_GNULIB_DPRINTF=0
 
 
@@ -18187,8 +19010,9 @@
 if test "x$ac_cv_have_decl_getdtablesize" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
 printf "%s\n" "#define HAVE_DECL_GETDTABLESIZE $ac_have_decl" >>confdefs.h
 
@@ -18196,8 +19020,9 @@
 if test "x$ac_cv_have_decl_getline" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
 printf "%s\n" "#define HAVE_DECL_GETLINE $ac_have_decl" >>confdefs.h
 
@@ -18223,8 +19048,8 @@
 if test ${gl_cv_next_getopt_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_getopt_h = yes; then
 
 
@@ -18240,7 +19065,7 @@
   esac
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
                                           gl_dirsep_regex='/\\'
       ;;
     *)
@@ -18266,7 +19091,8 @@
                gl_cv_next_getopt_h='<'getopt.h'>'
              fi
 
-
+          ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_getopt_h" >&5
 printf "%s\n" "$gl_cv_next_getopt_h" >&6; }
@@ -18302,8 +19128,9 @@
 then :
   printf "%s\n" "#define HAVE_GETOPT_H 1" >>confdefs.h
 
-else $as_nop
-  gl_replace_getopt=yes
+else case e in #(
+  e) gl_replace_getopt=yes ;;
+esac
 fi
 
 done
@@ -18318,8 +19145,9 @@
 then :
   printf "%s\n" "#define HAVE_GETOPT_LONG_ONLY 1" >>confdefs.h
 
-else $as_nop
-  gl_replace_getopt=yes
+else case e in #(
+  e) gl_replace_getopt=yes ;;
+esac
 fi
 
 done
@@ -18331,17 +19159,17 @@
 if test ${gl_cv_func_getopt_posix+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
                                                 if test $cross_compiling = no; then
                               if test "$cross_compiling" = yes
 then :
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+See 'config.log' for more details" "$LINENO" 5; }
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <unistd.h>
@@ -18373,22 +19201,24 @@
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_getopt_posix=maybe
-else $as_nop
-  gl_cv_func_getopt_posix=no
+else case e in #(
+  e) gl_cv_func_getopt_posix=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
           if test $gl_cv_func_getopt_posix = maybe; then
                                     if test "$cross_compiling" = yes
 then :
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+See 'config.log' for more details" "$LINENO" 5; }
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <unistd.h>
@@ -18434,23 +19264,25 @@
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_getopt_posix=maybe
-else $as_nop
-  gl_cv_func_getopt_posix=no
+else case e in #(
+  e) gl_cv_func_getopt_posix=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
           fi
           if test $gl_cv_func_getopt_posix = maybe; then
                         if test "$cross_compiling" = yes
 then :
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+See 'config.log' for more details" "$LINENO" 5; }
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <unistd.h>
@@ -18478,21 +19310,24 @@
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_getopt_posix=yes
-else $as_nop
-  gl_cv_func_getopt_posix=no
+else case e in #(
+  e) gl_cv_func_getopt_posix=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
           fi
         else
           case "$host_os" in
-            darwin* | aix* | mingw*) gl_cv_func_getopt_posix="guessing no";;
-            *)                       gl_cv_func_getopt_posix="guessing yes";;
+            darwin* | aix* | mingw* | windows*) gl_cv_func_getopt_posix="guessing no";;
+            *)                                  gl_cv_func_getopt_posix="guessing yes";;
           esac
         fi
-
+       ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_posix" >&5
 printf "%s\n" "$gl_cv_func_getopt_posix" >&6; }
@@ -18507,8 +19342,8 @@
 if test ${gl_cv_func_getopt_gnu+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  # Even with POSIXLY_CORRECT, the GNU extension of leading '-' in the
+else case e in #(
+  e) # Even with POSIXLY_CORRECT, the GNU extension of leading '-' in the
        # optstring is necessary for programs like m4 that have POSIX-mandated
        # semantics for supporting options interspersed with files.
        # Also, since getopt_long is a GNU extension, we require optind=0.
@@ -18526,8 +19361,8 @@
 then :
                              gl_cv_func_getopt_gnu="$gl_cross_guess_normal"
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <getopt.h>
                            #include <stddef.h>
@@ -18729,11 +19564,13 @@
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_getopt_gnu=yes
-else $as_nop
-  gl_cv_func_getopt_gnu=no
+else case e in #(
+  e) gl_cv_func_getopt_gnu=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
        case $gl_had_POSIXLY_CORRECT in
@@ -18741,7 +19578,8 @@
          yes) { POSIXLY_CORRECT=; unset POSIXLY_CORRECT;}; POSIXLY_CORRECT=1 ;;
          *) { POSIXLY_CORRECT=; unset POSIXLY_CORRECT;} ;;
        esac
-
+       ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_gnu" >&5
 printf "%s\n" "$gl_cv_func_getopt_gnu" >&6; }
@@ -18753,16 +19591,16 @@
 if test ${gl_cv_func_getopt_long_gnu+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
               case "$host_os" in
               openbsd*) gl_cv_func_getopt_long_gnu="guessing no";;
               *)        gl_cv_func_getopt_long_gnu="guessing yes";;
             esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <getopt.h>
                 #include <stddef.h>
@@ -18798,14 +19636,17 @@
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_getopt_long_gnu=yes
-else $as_nop
-  gl_cv_func_getopt_long_gnu=no
+else case e in #(
+  e) gl_cv_func_getopt_long_gnu=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+         ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getopt_long_gnu" >&5
 printf "%s\n" "$gl_cv_func_getopt_long_gnu" >&6; }
@@ -18818,14 +19659,308 @@
 
 
 
+    HAVE__EXIT=1;
+  HAVE_ALIGNED_ALLOC=1;
+  HAVE_ATOLL=1;
+  HAVE_CANONICALIZE_FILE_NAME=1;
+  HAVE_DECL_ECVT=1;
+  HAVE_DECL_FCVT=1;
+  HAVE_DECL_GCVT=1;
+  HAVE_DECL_GETLOADAVG=1;
+  HAVE_DECL_PROGRAM_INVOCATION_NAME=1;
+  HAVE_GETPROGNAME=1;
+  HAVE_GETSUBOPT=1;
+  HAVE_GRANTPT=1;
+  HAVE_INITSTATE=1;
+  HAVE_DECL_INITSTATE=1;
+  HAVE_MBTOWC=1;
+  HAVE_MKDTEMP=1;
+  HAVE_MKOSTEMP=1;
+  HAVE_MKOSTEMPS=1;
+  HAVE_MKSTEMP=1;
+  HAVE_MKSTEMPS=1;
+  HAVE_POSIX_MEMALIGN=1;
+  HAVE_POSIX_OPENPT=1;
+  HAVE_PTSNAME=1;
+  HAVE_PTSNAME_R=1;
+  HAVE_QSORT_R=1;
+  HAVE_RANDOM=1;
+  HAVE_RANDOM_H=1;
+  HAVE_RANDOM_R=1;
+  HAVE_REALLOCARRAY=1;
+  HAVE_REALPATH=1;
+  HAVE_RPMATCH=1;
+  HAVE_SECURE_GETENV=1;
+  HAVE_SETENV=1;
+  HAVE_DECL_SETENV=1;
+  HAVE_SETSTATE=1;
+  HAVE_DECL_SETSTATE=1;
+  HAVE_STRTOD=1;
+  HAVE_STRTOL=1;
+  HAVE_STRTOLD=1;
+  HAVE_STRTOLL=1;
+  HAVE_STRTOUL=1;
+  HAVE_STRTOULL=1;
+  HAVE_STRUCT_RANDOM_DATA=1;
+  HAVE_SYS_LOADAVG_H=0;
+  HAVE_UNLOCKPT=1;
+  HAVE_DECL_UNSETENV=1;
+  REPLACE__EXIT=0;
+  REPLACE_ALIGNED_ALLOC=0;
+  REPLACE_CALLOC_FOR_CALLOC_GNU=0;
+  REPLACE_CALLOC_FOR_CALLOC_POSIX=0;
+  REPLACE_CANONICALIZE_FILE_NAME=0;
+  REPLACE_FREE=0;
+  REPLACE_GETLOADAVG=0;
+  REPLACE_GETPROGNAME=0;
+  REPLACE_GETSUBOPT=0;
+  REPLACE_INITSTATE=0;
+  REPLACE_MALLOC_FOR_MALLOC_GNU=0;
+  REPLACE_MALLOC_FOR_MALLOC_POSIX=0;
+  REPLACE_MB_CUR_MAX=0;
+  REPLACE_MBSTOWCS=0;
+  REPLACE_MBTOWC=0;
+  REPLACE_MKOSTEMP=0;
+  REPLACE_MKOSTEMPS=0;
+  REPLACE_MKSTEMP=0;
+  REPLACE_POSIX_MEMALIGN=0;
+  REPLACE_POSIX_OPENPT=0;
+  REPLACE_PTSNAME=0;
+  REPLACE_PTSNAME_R=0;
+  REPLACE_PUTENV=0;
+  REPLACE_QSORT_R=0;
+  REPLACE_RAND=0;
+  REPLACE_RANDOM=0;
+  REPLACE_RANDOM_R=0;
+  REPLACE_REALLOC_FOR_REALLOC_GNU=0;
+  REPLACE_REALLOC_FOR_REALLOC_POSIX=0;
+  REPLACE_REALLOCARRAY=0;
+  REPLACE_REALPATH=0;
+  REPLACE_SETENV=0;
+  REPLACE_SETSTATE=0;
+  REPLACE_STRTOD=0;
+  REPLACE_STRTOL=0;
+  REPLACE_STRTOLD=0;
+  REPLACE_STRTOLL=0;
+  REPLACE_STRTOUL=0;
+  REPLACE_STRTOULL=0;
+  REPLACE_UNSETENV=0;
+  REPLACE_WCTOMB=0;
+
+
+
+
+  GL_GNULIB__EXIT=0
+
+
+
+  GL_GNULIB_ALIGNED_ALLOC=0
+
+
+
+  GL_GNULIB_ATOLL=0
+
+
+
+  GL_GNULIB_CALLOC_GNU=0
+
+
+
+  GL_GNULIB_CALLOC_POSIX=0
+
+
+
+  GL_GNULIB_CANONICALIZE_FILE_NAME=0
+
+
+
+  GL_GNULIB_FREE_POSIX=0
+
+
+
+  GL_GNULIB_GETLOADAVG=0
+
+
+
+  GL_GNULIB_GETPROGNAME=0
+
+
+
+  GL_GNULIB_GETSUBOPT=0
+
+
+
+  GL_GNULIB_GRANTPT=0
+
+
+
+  GL_GNULIB_MALLOC_GNU=0
+
+
+
+  GL_GNULIB_MALLOC_POSIX=0
+
+
+
+  GL_GNULIB_MBSTOWCS=0
+
+
+
+  GL_GNULIB_MBTOWC=0
+
+
+
+  GL_GNULIB_MKDTEMP=0
+
+
+
+  GL_GNULIB_MKOSTEMP=0
+
+
+
+  GL_GNULIB_MKOSTEMPS=0
+
+
+
+  GL_GNULIB_MKSTEMP=0
+
+
+
+  GL_GNULIB_MKSTEMPS=0
+
+
+
+  GL_GNULIB_POSIX_MEMALIGN=0
+
+
+
+  GL_GNULIB_POSIX_OPENPT=0
+
+
+
+  GL_GNULIB_PTSNAME=0
+
+
+
+  GL_GNULIB_PTSNAME_R=0
+
+
+
+  GL_GNULIB_PUTENV=0
+
+
+
+  GL_GNULIB_QSORT_R=0
+
+
+
+  GL_GNULIB_RAND=0
+
+
+
+  GL_GNULIB_RANDOM=0
+
+
+
+  GL_GNULIB_RANDOM_R=0
+
+
+
+  GL_GNULIB_REALLOCARRAY=0
+
+
+
+  GL_GNULIB_REALLOC_GNU=0
+
+
+
+  GL_GNULIB_REALLOC_POSIX=0
+
+
+
+  GL_GNULIB_REALPATH=0
+
+
+
+  GL_GNULIB_RPMATCH=0
+
+
+
+  GL_GNULIB_SECURE_GETENV=0
+
+
+
+  GL_GNULIB_SETENV=0
+
+
+
+  GL_GNULIB_STRTOD=0
+
+
+
+  GL_GNULIB_STRTOL=0
+
+
+
+  GL_GNULIB_STRTOLD=0
+
+
+
+  GL_GNULIB_STRTOLL=0
+
+
+
+  GL_GNULIB_STRTOUL=0
+
+
+
+  GL_GNULIB_STRTOULL=0
+
+
+
+  GL_GNULIB_SYSTEM_POSIX=0
+
+
+
+  GL_GNULIB_UNLOCKPT=0
+
+
+
+  GL_GNULIB_UNSETENV=0
+
+
+
+  GL_GNULIB_WCTOMB=0
+
+
+
+  GL_GNULIB_MDA_ECVT=1
+
+
+
+  GL_GNULIB_MDA_FCVT=1
+
+
+
+  GL_GNULIB_MDA_GCVT=1
+
+
+
+  GL_GNULIB_MDA_MKTEMP=1
+
+
+
+  GL_GNULIB_MDA_PUTENV=1
+
+
 
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 printf %s "checking for inline... " >&6; }
 if test ${ac_cv_c_inline+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  ac_cv_c_inline=no
+else case e in #(
+  e) ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -18843,7 +19978,8 @@
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   test "$ac_cv_c_inline" != no && break
 done
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
 printf "%s\n" "$ac_cv_c_inline" >&6; }
@@ -18882,8 +20018,8 @@
 if test ${gl_cv_next_limits_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_limits_h = yes; then
 
 
@@ -18899,7 +20035,7 @@
   esac
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
                                           gl_dirsep_regex='/\\'
       ;;
     *)
@@ -18925,7 +20061,8 @@
                gl_cv_next_limits_h='<'limits.h'>'
              fi
 
-
+          ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_limits_h" >&5
 printf "%s\n" "$gl_cv_next_limits_h" >&6; }
@@ -18950,8 +20087,8 @@
 if test ${gl_cv_header_limits_width+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __STDC_WANT_IEC_60559_BFP_EXT__
              #define __STDC_WANT_IEC_60559_BFP_EXT__ 1
@@ -18961,6 +20098,8 @@
             int wb = WORD_BIT;
             int ullw = ULLONG_WIDTH;
             int bw = BOOL_WIDTH;
+            int bm = BOOL_MAX;
+            int mblm = MB_LEN_MAX;
 
 int
 main (void)
@@ -18973,18 +20112,48 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_header_limits_width=yes
-else $as_nop
-  gl_cv_header_limits_width=no
+else case e in #(
+  e) gl_cv_header_limits_width=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_limits_width" >&5
 printf "%s\n" "$gl_cv_header_limits_width" >&6; }
-  if test "$gl_cv_header_limits_width" = yes; then
-    GL_GENERATE_LIMITS_H=false
-  else
-    GL_GENERATE_LIMITS_H=true
-  fi
+  GL_GENERATE_LIMITS_H=true
+  if test "$gl_cv_header_limits_width" = yes
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether limits.h has SSIZE_MAX" >&5
+printf %s "checking whether limits.h has SSIZE_MAX... " >&6; }
+if test ${gl_cv_header_limits_ssize_max+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+               #ifndef SSIZE_MAX
+                 #error "SSIZE_MAX is not defined"
+               #endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  gl_cv_header_limits_ssize_max=yes
+else case e in #(
+  e) gl_cv_header_limits_ssize_max=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_limits_ssize_max" >&5
+printf "%s\n" "$gl_cv_header_limits_ssize_max" >&6; }
+     if test "$gl_cv_header_limits_ssize_max" = yes; then
+       GL_GENERATE_LIMITS_H=false
+     fi
+fi
 
 
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
@@ -18992,19 +20161,19 @@
 if test ${ac_cv_func_malloc_0_nonnull+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in # ((
 		  # Guess yes on platforms where we know the result.
 		  *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \
-		  | hpux* | solaris* | cygwin* | mingw* | msys* )
+		  | hpux* | solaris* | cygwin* | mingw* | windows* | msys* )
 		    ac_cv_func_malloc_0_nonnull=yes ;;
 		  # If we don't know, assume the worst.
 		  *) ac_cv_func_malloc_0_nonnull=no ;;
 		esac
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
@@ -19022,21 +20191,25 @@
 if ac_fn_c_try_run "$LINENO"
 then :
   ac_cv_func_malloc_0_nonnull=yes
-else $as_nop
-  ac_cv_func_malloc_0_nonnull=no
+else case e in #(
+  e) ac_cv_func_malloc_0_nonnull=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
 printf "%s\n" "$ac_cv_func_malloc_0_nonnull" >&6; }
 if test $ac_cv_func_malloc_0_nonnull = yes
 then :
   gl_cv_func_malloc_0_nonnull=1
-else $as_nop
-  gl_cv_func_malloc_0_nonnull=0
+else case e in #(
+  e) gl_cv_func_malloc_0_nonnull=0 ;;
+esac
 fi
 
 
@@ -19052,8 +20225,8 @@
 if test ${gl_cv_c_multiarch+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_cv_c_multiarch=no
+else case e in #(
+  e) gl_cv_c_multiarch=no
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __APPLE_CC__
@@ -19088,7 +20261,8 @@
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_multiarch" >&5
 printf "%s\n" "$gl_cv_c_multiarch" >&6; }
@@ -19105,8 +20279,8 @@
 if test ${gl_cv_macro_O_CLOEXEC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <fcntl.h>
                           #ifndef O_CLOEXEC
@@ -19124,10 +20298,12 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_macro_O_CLOEXEC=yes
-else $as_nop
-  gl_cv_macro_O_CLOEXEC=no
+else case e in #(
+  e) gl_cv_macro_O_CLOEXEC=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_macro_O_CLOEXEC" >&5
 printf "%s\n" "$gl_cv_macro_O_CLOEXEC" >&6; }
@@ -19140,8 +20316,8 @@
 if test ${gl_cv_promoted_mode_t+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
@@ -19156,11 +20332,13 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_promoted_mode_t='int'
-else $as_nop
-  gl_cv_promoted_mode_t='mode_t'
+else case e in #(
+  e) gl_cv_promoted_mode_t='mode_t' ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+   ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_promoted_mode_t" >&5
 printf "%s\n" "$gl_cv_promoted_mode_t" >&6; }
@@ -19176,6 +20354,7 @@
   HAVE_FFSLL=1;
   HAVE_DECL_MEMMEM=1;
   HAVE_MEMPCPY=1;
+  HAVE_MEMSET_EXPLICIT=1;
   HAVE_DECL_MEMRCHR=1;
   HAVE_RAWMEMCHR=1;
   HAVE_STPCPY=1;
@@ -19197,6 +20376,9 @@
   REPLACE_FFSLL=0;
   REPLACE_MEMCHR=0;
   REPLACE_MEMMEM=0;
+  REPLACE_MEMPCPY=0;
+  REPLACE_MEMSET_EXPLICIT=0;
+  REPLACE_STPCPY=0;
   REPLACE_STPNCPY=0;
   REPLACE_STRCHRNUL=0;
   REPLACE_STRDUP=0;
@@ -19210,6 +20392,7 @@
   REPLACE_STRERROR_R=0;
   REPLACE_STRERRORNAME_NP=0;
   REPLACE_STRSIGNAL=0;
+  REPLACE_STRVERSCMP=0;
   UNDEFINE_STRTOK_R=0;
 
 
@@ -19242,6 +20425,10 @@
 
 
 
+  GL_GNULIB_MEMSET_EXPLICIT=0
+
+
+
   GL_GNULIB_RAWMEMCHR=0
 
 
@@ -19388,278 +20575,6 @@
 
 
 
-  GL_GNULIB__EXIT=0
-
-
-
-  GL_GNULIB_ALIGNED_ALLOC=0
-
-
-
-  GL_GNULIB_ATOLL=0
-
-
-
-  GL_GNULIB_CALLOC_GNU=0
-
-
-
-  GL_GNULIB_CALLOC_POSIX=0
-
-
-
-  GL_GNULIB_CANONICALIZE_FILE_NAME=0
-
-
-
-  GL_GNULIB_FREE_POSIX=0
-
-
-
-  GL_GNULIB_GETLOADAVG=0
-
-
-
-  GL_GNULIB_GETSUBOPT=0
-
-
-
-  GL_GNULIB_GRANTPT=0
-
-
-
-  GL_GNULIB_MALLOC_GNU=0
-
-
-
-  GL_GNULIB_MALLOC_POSIX=0
-
-
-
-  GL_GNULIB_MBTOWC=0
-
-
-
-  GL_GNULIB_MKDTEMP=0
-
-
-
-  GL_GNULIB_MKOSTEMP=0
-
-
-
-  GL_GNULIB_MKOSTEMPS=0
-
-
-
-  GL_GNULIB_MKSTEMP=0
-
-
-
-  GL_GNULIB_MKSTEMPS=0
-
-
-
-  GL_GNULIB_POSIX_MEMALIGN=0
-
-
-
-  GL_GNULIB_POSIX_OPENPT=0
-
-
-
-  GL_GNULIB_PTSNAME=0
-
-
-
-  GL_GNULIB_PTSNAME_R=0
-
-
-
-  GL_GNULIB_PUTENV=0
-
-
-
-  GL_GNULIB_QSORT_R=0
-
-
-
-  GL_GNULIB_RANDOM=0
-
-
-
-  GL_GNULIB_RANDOM_R=0
-
-
-
-  GL_GNULIB_REALLOCARRAY=0
-
-
-
-  GL_GNULIB_REALLOC_GNU=0
-
-
-
-  GL_GNULIB_REALLOC_POSIX=0
-
-
-
-  GL_GNULIB_REALPATH=0
-
-
-
-  GL_GNULIB_RPMATCH=0
-
-
-
-  GL_GNULIB_SECURE_GETENV=0
-
-
-
-  GL_GNULIB_SETENV=0
-
-
-
-  GL_GNULIB_STRTOD=0
-
-
-
-  GL_GNULIB_STRTOL=0
-
-
-
-  GL_GNULIB_STRTOLD=0
-
-
-
-  GL_GNULIB_STRTOLL=0
-
-
-
-  GL_GNULIB_STRTOUL=0
-
-
-
-  GL_GNULIB_STRTOULL=0
-
-
-
-  GL_GNULIB_SYSTEM_POSIX=0
-
-
-
-  GL_GNULIB_UNLOCKPT=0
-
-
-
-  GL_GNULIB_UNSETENV=0
-
-
-
-  GL_GNULIB_WCTOMB=0
-
-
-
-  GL_GNULIB_MDA_ECVT=1
-
-
-
-  GL_GNULIB_MDA_FCVT=1
-
-
-
-  GL_GNULIB_MDA_GCVT=1
-
-
-
-  GL_GNULIB_MDA_MKTEMP=1
-
-
-
-  GL_GNULIB_MDA_PUTENV=1
-
-
-
-
-    HAVE__EXIT=1;
-  HAVE_ALIGNED_ALLOC=1;
-  HAVE_ATOLL=1;
-  HAVE_CANONICALIZE_FILE_NAME=1;
-  HAVE_DECL_ECVT=1;
-  HAVE_DECL_FCVT=1;
-  HAVE_DECL_GCVT=1;
-  HAVE_DECL_GETLOADAVG=1;
-  HAVE_GETSUBOPT=1;
-  HAVE_GRANTPT=1;
-  HAVE_INITSTATE=1;
-  HAVE_DECL_INITSTATE=1;
-  HAVE_MBTOWC=1;
-  HAVE_MKDTEMP=1;
-  HAVE_MKOSTEMP=1;
-  HAVE_MKOSTEMPS=1;
-  HAVE_MKSTEMP=1;
-  HAVE_MKSTEMPS=1;
-  HAVE_POSIX_MEMALIGN=1;
-  HAVE_POSIX_OPENPT=1;
-  HAVE_PTSNAME=1;
-  HAVE_PTSNAME_R=1;
-  HAVE_QSORT_R=1;
-  HAVE_RANDOM=1;
-  HAVE_RANDOM_H=1;
-  HAVE_RANDOM_R=1;
-  HAVE_REALLOCARRAY=1;
-  HAVE_REALPATH=1;
-  HAVE_RPMATCH=1;
-  HAVE_SECURE_GETENV=1;
-  HAVE_SETENV=1;
-  HAVE_DECL_SETENV=1;
-  HAVE_SETSTATE=1;
-  HAVE_DECL_SETSTATE=1;
-  HAVE_STRTOD=1;
-  HAVE_STRTOL=1;
-  HAVE_STRTOLD=1;
-  HAVE_STRTOLL=1;
-  HAVE_STRTOUL=1;
-  HAVE_STRTOULL=1;
-  HAVE_STRUCT_RANDOM_DATA=1;
-  HAVE_SYS_LOADAVG_H=0;
-  HAVE_UNLOCKPT=1;
-  HAVE_DECL_UNSETENV=1;
-  REPLACE_ALIGNED_ALLOC=0;
-  REPLACE_CALLOC_FOR_CALLOC_GNU=0;
-  REPLACE_CALLOC_FOR_CALLOC_POSIX=0;
-  REPLACE_CANONICALIZE_FILE_NAME=0;
-  REPLACE_FREE=0;
-  REPLACE_INITSTATE=0;
-  REPLACE_MALLOC_FOR_MALLOC_GNU=0;
-  REPLACE_MALLOC_FOR_MALLOC_POSIX=0;
-  REPLACE_MBTOWC=0;
-  REPLACE_MKSTEMP=0;
-  REPLACE_POSIX_MEMALIGN=0;
-  REPLACE_PTSNAME=0;
-  REPLACE_PTSNAME_R=0;
-  REPLACE_PUTENV=0;
-  REPLACE_QSORT_R=0;
-  REPLACE_RANDOM=0;
-  REPLACE_RANDOM_R=0;
-  REPLACE_REALLOC_FOR_REALLOC_GNU=0;
-  REPLACE_REALLOC_FOR_REALLOC_POSIX=0;
-  REPLACE_REALLOCARRAY=0;
-  REPLACE_REALPATH=0;
-  REPLACE_SETENV=0;
-  REPLACE_SETSTATE=0;
-  REPLACE_STRTOD=0;
-  REPLACE_STRTOL=0;
-  REPLACE_STRTOLD=0;
-  REPLACE_STRTOLL=0;
-  REPLACE_STRTOUL=0;
-  REPLACE_STRTOULL=0;
-  REPLACE_UNSETENV=0;
-  REPLACE_WCTOMB=0;
-
-
-
-
 
 
     REPLACE_NULL=0;
@@ -19672,8 +20587,8 @@
 if test ${gt_cv_c_wchar_t+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stddef.h>
             wchar_t foo = (wchar_t)'\0';
@@ -19688,10 +20603,12 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gt_cv_c_wchar_t=yes
-else $as_nop
-  gt_cv_c_wchar_t=no
+else case e in #(
+  e) gt_cv_c_wchar_t=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wchar_t" >&5
 printf "%s\n" "$gt_cv_c_wchar_t" >&6; }
@@ -19714,10 +20631,17 @@
 if test ${gl_cv_type_max_align_t+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stddef.h>
+/* On FreeBSD 12.0/x86, max_align_t defined by <stddef.h> has
+               the correct alignment with the default (wrong) definition of
+               _Alignof, but a wrong alignment as soon as we activate an
+               ISO C compliant _Alignof definition.  */
+            #if ((defined __GNUC__ && 4 <= __GNUC__) || defined __clang__) && !defined __cplusplus
+             #define _Alignof(type) __builtin_offsetof (struct { char __a; type __b; }, __b)
+            #endif
+            #include <stddef.h>
             unsigned int s = sizeof (max_align_t);
             #if defined __GNUC__ || defined __clang__ || defined __IBM__ALIGNOF__
             int check12 * (__alignof__ (double) <= __alignof__ (max_align_t)) - 1;
@@ -19742,11 +20666,13 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_type_max_align_t=yes
-else $as_nop
-  gl_cv_type_max_align_t=no
+else case e in #(
+  e) gl_cv_type_max_align_t=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_max_align_t" >&5
 printf "%s\n" "$gl_cv_type_max_align_t" >&6; }
@@ -19765,8 +20691,8 @@
 if test ${gl_cv_decl_null_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stddef.h>
       int test2 * (sizeof NULL == sizeof (void *)) -1;
@@ -19782,10 +20708,12 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_decl_null_works=yes
-else $as_nop
-  gl_cv_decl_null_works=no
+else case e in #(
+  e) gl_cv_decl_null_works=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_null_works" >&5
 printf "%s\n" "$gl_cv_decl_null_works" >&6; }
@@ -19794,6 +20722,43 @@
     GL_GENERATE_STDDEF_H=true
   fi
 
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for unreachable" >&5
+printf %s "checking for unreachable... " >&6; }
+if test ${gl_cv_func_unreachable+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stddef.h>
+
+int
+main (void)
+{
+unreachable ();
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  gl_cv_func_unreachable=yes
+else case e in #(
+  e) gl_cv_func_unreachable=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+     ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_unreachable" >&5
+printf "%s\n" "$gl_cv_func_unreachable" >&6; }
+  if test $gl_cv_func_unreachable = no; then
+    GL_GENERATE_STDDEF_H=true
+  fi
+
   if $GL_GENERATE_STDDEF_H; then
 
 
@@ -19811,8 +20776,8 @@
 if test ${gl_cv_next_stddef_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -19825,7 +20790,7 @@
   esac
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
                                           gl_dirsep_regex='/\\'
       ;;
     *)
@@ -19848,7 +20813,8 @@
           gl_header=$gl_cv_absolute_stddef_h
           gl_cv_next_stddef_h='"'$gl_header'"'
 
-
+          ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
 printf "%s\n" "$gl_cv_next_stddef_h" >&6; }
@@ -19877,8 +20843,8 @@
 if test ${gt_cv_c_wint_t+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <wchar.h>
             wint_t foo = (wchar_t)'\0';
@@ -19893,10 +20859,12 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gt_cv_c_wint_t=yes
-else $as_nop
-  gt_cv_c_wint_t=no
+else case e in #(
+  e) gt_cv_c_wint_t=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_c_wint_t" >&5
 printf "%s\n" "$gt_cv_c_wint_t" >&6; }
@@ -19910,8 +20878,8 @@
 if test ${gl_cv_type_wint_t_large_enough+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <wchar.h>
               int verifysizeof (wint_t) < sizeof (int) ? -1 : 1;
@@ -19927,10 +20895,12 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_type_wint_t_large_enough=yes
-else $as_nop
-  gl_cv_type_wint_t_large_enough=no
+else case e in #(
+  e) gl_cv_type_wint_t_large_enough=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_type_wint_t_large_enough" >&5
 printf "%s\n" "$gl_cv_type_wint_t_large_enough" >&6; }
@@ -19997,8 +20967,8 @@
 if test ${gl_cv_next_stdint_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_stdint_h = yes; then
 
 
@@ -20014,7 +20984,7 @@
   esac
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
                                           gl_dirsep_regex='/\\'
       ;;
     *)
@@ -20040,7 +21010,8 @@
                gl_cv_next_stdint_h='<'stdint.h'>'
              fi
 
-
+          ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdint_h" >&5
 printf "%s\n" "$gl_cv_next_stdint_h" >&6; }
@@ -20072,8 +21043,8 @@
 if test ${gl_cv_header_working_stdint_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_cv_header_working_stdint_h=no
+else case e in #(
+  e) gl_cv_header_working_stdint_h=no
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -20168,7 +21139,10 @@
 uintmax_t j = UINTMAX_MAX;
 
 /* Check that SIZE_MAX has the correct type, if possible.  */
-#if 201112 <= __STDC_VERSION__
+/* ISO C 11 mandates _Generic, but GCC versions < 4.9 lack it.  */
+#if 201112 <= __STDC_VERSION__ \
+    && (!defined __GNUC__ || 4 < __GNUC__ + (9 <= __GNUC_MINOR__) \
+        || defined __clang__)
 int k = _Generic (SIZE_MAX, size_t: 0);
 #elif (2 <= __GNUC__ || 4 <= __clang_major__ || defined __IBM__TYPEOF__ \
        || (0x5110 <= __SUNPRO_C && !__STDC__))
@@ -20249,14 +21223,14 @@
                                                     if test "$cross_compiling" = yes
 then :
   case "$host_os" in
-                         # Guess yes on native Windows.
-                 mingw*) gl_cv_header_working_stdint_h="guessing yes" ;;
-                         # In general, assume it works.
-                 *)      gl_cv_header_working_stdint_h="guessing yes" ;;
+                                    # Guess yes on native Windows.
+                 mingw* | windows*) gl_cv_header_working_stdint_h="guessing yes" ;;
+                                    # In general, assume it works.
+                 *)                 gl_cv_header_working_stdint_h="guessing yes" ;;
                esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -20334,13 +21308,15 @@
   gl_cv_header_working_stdint_h=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+       ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdint_h" >&5
 printf "%s\n" "$gl_cv_header_working_stdint_h" >&6; }
@@ -20358,8 +21334,8 @@
 if test ${gl_cv_header_stdint_without_STDC_macros+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_cv_header_stdint_without_STDC_macros=no
+else case e in #(
+  e) gl_cv_header_stdint_without_STDC_macros=no
          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -20391,7 +21367,8 @@
   gl_cv_header_stdint_without_STDC_macros=yes
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+         ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_without_STDC_macros" >&5
 printf "%s\n" "$gl_cv_header_stdint_without_STDC_macros" >&6; }
@@ -20409,8 +21386,8 @@
 if test ${gl_cv_header_stdint_width+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_cv_header_stdint_width=no
+else case e in #(
+  e) gl_cv_header_stdint_width=no
          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -20441,7 +21418,8 @@
 then :
   gl_cv_header_stdint_width=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_stdint_width" >&5
 printf "%s\n" "$gl_cv_header_stdint_width" >&6; }
@@ -20480,8 +21458,8 @@
 if eval test \${gl_cv_bitsizeof_${gltype}+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
+else case e in #(
+  e) if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
   #include <stddef.h>
   #include <signal.h>
   #if HAVE_WCHAR_H
@@ -20491,12 +21469,14 @@
 #include <limits.h>"
 then :
 
-else $as_nop
-  result=unknown
+else case e in #(
+  e) result=unknown ;;
+esac
 fi
 
        eval gl_cv_bitsizeof_${gltype}=\$result
-
+       ;;
+esac
 fi
 eval ac_res=\$gl_cv_bitsizeof_${gltype}
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -20521,8 +21501,8 @@
 if eval test \${gl_cv_bitsizeof_${gltype}+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
+else case e in #(
+  e) if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
   #include <stddef.h>
   #include <signal.h>
   #if HAVE_WCHAR_H
@@ -20532,12 +21512,14 @@
 #include <limits.h>"
 then :
 
-else $as_nop
-  result=unknown
+else case e in #(
+  e) result=unknown ;;
+esac
 fi
 
        eval gl_cv_bitsizeof_${gltype}=\$result
-
+       ;;
+esac
 fi
 eval ac_res=\$gl_cv_bitsizeof_${gltype}
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -20561,8 +21543,8 @@
 if eval test \${gl_cv_type_${gltype}_signed+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
   #include <stddef.h>
@@ -20583,12 +21565,14 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   result=yes
-else $as_nop
-  result=no
+else case e in #(
+  e) result=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
        eval gl_cv_type_${gltype}_signed=\$result
-
+       ;;
+esac
 fi
 eval ac_res=\$gl_cv_type_${gltype}_signed
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -20616,8 +21600,8 @@
 if eval test \${gl_cv_type_${gltype}_suffix+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  eval gl_cv_type_${gltype}_suffix=no
+else case e in #(
+  e) eval gl_cv_type_${gltype}_suffix=no
        eval result=\$gl_cv_type_${gltype}_signed
        if test "$result" = yes; then
          glsufu=
@@ -20661,7 +21645,8 @@
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
          eval result=\$gl_cv_type_${gltype}_suffix
          test "$result" != no && break
-       done
+       done ;;
+esac
 fi
 eval ac_res=\$gl_cv_type_${gltype}_suffix
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -20684,8 +21669,8 @@
 if eval test \${gl_cv_type_${gltype}_suffix+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  eval gl_cv_type_${gltype}_suffix=no
+else case e in #(
+  e) eval gl_cv_type_${gltype}_suffix=no
        eval result=\$gl_cv_type_${gltype}_signed
        if test "$result" = yes; then
          glsufu=
@@ -20729,7 +21714,8 @@
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
          eval result=\$gl_cv_type_${gltype}_suffix
          test "$result" != no && break
-       done
+       done ;;
+esac
 fi
 eval ac_res=\$gl_cv_type_${gltype}_suffix
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -20760,19 +21746,47 @@
 
 
 
+
+
+  case "$host_os" in
+    *-musl* | midipix*)
+
+printf "%s\n" "#define MUSL_LIBC 1" >>confdefs.h
+
+      ;;
+  esac
+
 ac_fn_check_decl "$LINENO" "fcloseall" "ac_cv_have_decl_fcloseall" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_fcloseall" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
 printf "%s\n" "#define HAVE_DECL_FCLOSEALL $ac_have_decl" >>confdefs.h
 
+ac_fn_check_decl "$LINENO" "getw" "ac_cv_have_decl_getw" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_getw" = xyes
+then :
+  ac_have_decl=1
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
+fi
+printf "%s\n" "#define HAVE_DECL_GETW $ac_have_decl" >>confdefs.h
 
+ac_fn_check_decl "$LINENO" "putw" "ac_cv_have_decl_putw" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_putw" = xyes
+then :
+  ac_have_decl=1
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
+fi
+printf "%s\n" "#define HAVE_DECL_PUTW $ac_have_decl" >>confdefs.h
 
 
-  printf "%s\n" "#define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h
 
 
 
@@ -20790,8 +21804,8 @@
 if test ${gl_cv_next_stdio_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20804,7 +21818,7 @@
   esac
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
                                           gl_dirsep_regex='/\\'
       ;;
     *)
@@ -20827,7 +21841,8 @@
           gl_header=$gl_cv_absolute_stdio_h
           gl_cv_next_stdio_h='"'$gl_header'"'
 
-
+          ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdio_h" >&5
 printf "%s\n" "$gl_cv_next_stdio_h" >&6; }
@@ -20852,8 +21867,8 @@
 if test ${gl_cv_func_printf_attribute_flavor+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
        #define __STDC_FORMAT_MACROS 1
@@ -20878,10 +21893,12 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_func_printf_attribute_flavor=system
-else $as_nop
-  gl_cv_func_printf_attribute_flavor=gnu
+else case e in #(
+  e) gl_cv_func_printf_attribute_flavor=gnu ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_printf_attribute_flavor" >&5
 printf "%s\n" "$gl_cv_func_printf_attribute_flavor" >&6; }
@@ -20903,16 +21920,230 @@
 
 
 
+
+
   if test $ac_cv_have_decl_fcloseall = no; then
     HAVE_DECL_FCLOSEALL=0
   fi
 
+
+  if test $ac_cv_have_decl_getw = no; then
+    HAVE_DECL_GETW=0
+  fi
+
+
+  if test $ac_cv_have_decl_putw = no; then
+    HAVE_DECL_PUTW=0
+  fi
+
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
+printf %s "checking for nl_langinfo and CODESET... " >&6; }
+if test ${am_cv_langinfo_codeset+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <langinfo.h>
+int
+main (void)
+{
+char* cs = nl_langinfo(CODESET); return !cs;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  am_cv_langinfo_codeset=yes
+else case e in #(
+  e) am_cv_langinfo_codeset=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+     ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
+printf "%s\n" "$am_cv_langinfo_codeset" >&6; }
+  if test $am_cv_langinfo_codeset = yes; then
+
+printf "%s\n" "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
+
+  fi
+
+
+
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a french Unicode locale" >&5
+printf %s "checking for a french Unicode locale... " >&6; }
+if test ${gt_cv_locale_fr_utf8+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e)
+    case "$host_os" in
+      *-musl* | midipix*)
+                                        gt_cv_locale_fr_utf8=fr_FR.UTF-8
+        ;;
+      *)
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <time.h>
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+struct tm t;
+char buf16;
+int main () {
+  /* On BeOS and Haiku, locales are not implemented in libc.  Rather, libintl
+     imitates locale dependent behaviour by looking at the environment
+     variables, and all locales use the UTF-8 encoding.  */
+#if !(defined __BEOS__ || defined __HAIKU__)
+  /* Check whether the given locale name is recognized by the system.  */
+# if defined _WIN32 && !defined __CYGWIN__
+  /* On native Windows, setlocale(category, "") looks at the system settings,
+     not at the environment variables.  Also, when an encoding suffix such
+     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
+     category of the locale to "C".  */
+  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
+      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
+    return 1;
+# else
+  if (setlocale (LC_ALL, "") == NULL) return 1;
+# endif
+  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
+     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
+     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
+     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
+     some unit tests fail.  */
+# if HAVE_LANGINFO_CODESET
+  {
+    const char *cs = nl_langinfo (CODESET);
+    if (cs0 == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
+      return 1;
+  }
+# endif
+# ifdef __CYGWIN__
+  /* On Cygwin, avoid locale names without encoding suffix, because the
+     locale_charset() function relies on the encoding suffix.  Note that
+     LC_ALL is set on the command line.  */
+  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
+# endif
+  /* Check whether in the abbreviation of the second month, the second
+     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is
+     two bytes long, with UTF-8 encoding.  */
+  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
+  if (strftime (buf, sizeof (buf), "%b", &t) < 4
+      || buf1 != (char) 0xc3 || buf2 != (char) 0xa9 || buf3 != 'v')
+    return 1;
+#endif
+#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
+  /* Check whether the decimal separator is a comma.
+     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
+     are nl_langinfo(RADIXCHAR) are both ".".  */
+  if (localeconv () ->decimal_point0 != ',') return 1;
+#endif
+  return 0;
+}
+
+_ACEOF
+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest$ac_exeext; then
+          case "$host_os" in
+            # Handle native Windows specially, because there setlocale() interprets
+            # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
+            # "fr" or "fra" as "French" or "French_France.1252",
+            # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
+            # "ja" as "Japanese" or "Japanese_Japan.932",
+            # and similar.
+            mingw* | windows*)
+              # Test for the hypothetical native Windows locale name.
+              if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_fr_utf8=French_France.65001
+              else
+                # None found.
+                gt_cv_locale_fr_utf8=none
+              fi
+              ;;
+            *)
+              # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+              # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
+              # configure script would override the LC_ALL setting. Likewise for
+              # LC_CTYPE, which is also set at the beginning of the configure script.
+              # Test for the usual locale name.
+              if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_fr_utf8=fr_FR
+              else
+                # Test for the locale name with explicit encoding suffix.
+                if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                  gt_cv_locale_fr_utf8=fr_FR.UTF-8
+                else
+                  # Test for the Solaris 7 locale name.
+                  if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                    gt_cv_locale_fr_utf8=fr.UTF-8
+                  else
+                    # None found.
+                    gt_cv_locale_fr_utf8=none
+                  fi
+                fi
+              fi
+              ;;
+          esac
+        fi
+        rm -fr conftest*
+        ;;
+    esac
+   ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_locale_fr_utf8" >&5
+printf "%s\n" "$gt_cv_locale_fr_utf8" >&6; }
+  LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
+  case $LOCALE_FR_UTF8 in #(
+    '' | *:space:\"\$\'**)
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: invalid locale \"$LOCALE_FR_UTF8\"; assuming \"none\"" >&5
+printf "%s\n" "$as_me: WARNING: invalid locale \"$LOCALE_FR_UTF8\"; assuming \"none\"" >&2;}
+      LOCALE_FR_UTF8=none;;
+  esac
+
+
+      case "$host_os" in
+    *-musl* | midipix*)
+                  LC_COLLATE_IMPLEMENTED=false
+      LC_NUMERIC_IMPLEMENTED=false
+      LC_TIME_IMPLEMENTED=false
+      LC_MONETARY_IMPLEMENTED=false
+      ;;
+    *)
+      LC_COLLATE_IMPLEMENTED=true
+      LC_NUMERIC_IMPLEMENTED=true
+      LC_TIME_IMPLEMENTED=true
+      LC_MONETARY_IMPLEMENTED=true
+      ;;
+  esac
+
+
+
+
+
 ac_fn_check_decl "$LINENO" "ecvt" "ac_cv_have_decl_ecvt" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_ecvt" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
 printf "%s\n" "#define HAVE_DECL_ECVT $ac_have_decl" >>confdefs.h
 
@@ -20920,8 +22151,9 @@
 if test "x$ac_cv_have_decl_fcvt" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
 printf "%s\n" "#define HAVE_DECL_FCVT $ac_have_decl" >>confdefs.h
 
@@ -20929,8 +22161,9 @@
 if test "x$ac_cv_have_decl_gcvt" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
 printf "%s\n" "#define HAVE_DECL_GCVT $ac_have_decl" >>confdefs.h
 
@@ -20952,8 +22185,8 @@
 if test ${gl_cv_next_stdlib_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -20966,7 +22199,7 @@
   esac
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
                                           gl_dirsep_regex='/\\'
       ;;
     *)
@@ -20989,7 +22222,8 @@
           gl_header=$gl_cv_absolute_stdlib_h
           gl_cv_next_stdlib_h='"'$gl_header'"'
 
-
+          ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdlib_h" >&5
 printf "%s\n" "$gl_cv_next_stdlib_h" >&6; }
@@ -21016,6 +22250,65 @@
 
 
 
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether MB_CUR_MAX is correct" >&5
+printf %s "checking whether MB_CUR_MAX is correct... " >&6; }
+if test ${gl_cv_macro_MB_CUR_MAX_good+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e)
+                  case "$host_os" in
+                  # Guess no on Solaris.
+        solaris*) gl_cv_macro_MB_CUR_MAX_good="guessing no" ;;
+                  # Guess yes otherwise.
+        *)        gl_cv_macro_MB_CUR_MAX_good="guessing yes" ;;
+      esac
+      if test $LOCALE_FR_UTF8 != none; then
+        if test "$cross_compiling" = yes
+then :
+  :
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <locale.h>
+#include <stdlib.h>
+int main ()
+{
+  int result = 0;
+  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+    {
+      if (MB_CUR_MAX < 4)
+        result |= 1;
+    }
+  return result;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"
+then :
+  gl_cv_macro_MB_CUR_MAX_good=yes
+else case e in #(
+  e) gl_cv_macro_MB_CUR_MAX_good=no ;;
+esac
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+
+      fi
+     ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_macro_MB_CUR_MAX_good" >&5
+printf "%s\n" "$gl_cv_macro_MB_CUR_MAX_good" >&6; }
+  case "$gl_cv_macro_MB_CUR_MAX_good" in
+    *yes) ;;
+    *) REPLACE_MB_CUR_MAX=1 ;;
+  esac
+
+
   if test $ac_cv_have_decl_ecvt = no; then
     HAVE_DECL_ECVT=0
   fi
@@ -21035,22 +22328,22 @@
 if test ${gl_cv_func_strerror_0_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
-                        # Guess yes on glibc systems.
-         *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;;
-                        # Guess yes on musl systems.
-         *-musl*)       gl_cv_func_strerror_0_works="guessing yes" ;;
-                        # Guess yes on native Windows.
-         mingw*)        gl_cv_func_strerror_0_works="guessing yes" ;;
-                        # If we don't know, obey --enable-cross-guesses.
-         *)             gl_cv_func_strerror_0_works="$gl_cross_guess_normal" ;;
+                             # Guess yes on glibc systems.
+         *-gnu* | gnu*)      gl_cv_func_strerror_0_works="guessing yes" ;;
+                             # Guess yes on musl systems.
+         *-musl* | midipix*) gl_cv_func_strerror_0_works="guessing yes" ;;
+                             # Guess yes on native Windows.
+         mingw* | windows*)  gl_cv_func_strerror_0_works="guessing yes" ;;
+                             # If we don't know, obey --enable-cross-guesses.
+         *)                  gl_cv_func_strerror_0_works="$gl_cross_guess_normal" ;;
        esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
            #include <errno.h>
@@ -21074,14 +22367,17 @@
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_strerror_0_works=yes
-else $as_nop
-  gl_cv_func_strerror_0_works=no
+else case e in #(
+  e) gl_cv_func_strerror_0_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+   ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strerror_0_works" >&5
 printf "%s\n" "$gl_cv_func_strerror_0_works" >&6; }
@@ -21113,8 +22409,8 @@
 if test ${gl_cv_next_string_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -21127,7 +22423,7 @@
   esac
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
                                           gl_dirsep_regex='/\\'
       ;;
     *)
@@ -21150,7 +22446,8 @@
           gl_header=$gl_cv_absolute_string_h
           gl_cv_next_string_h='"'$gl_header'"'
 
-
+          ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_string_h" >&5
 printf "%s\n" "$gl_cv_next_string_h" >&6; }
@@ -21207,8 +22504,8 @@
 if test ${gl_cv_next_sys_types_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -21221,7 +22518,7 @@
   esac
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
                                           gl_dirsep_regex='/\\'
       ;;
     *)
@@ -21244,7 +22541,8 @@
           gl_header=$gl_cv_absolute_sys_types_h
           gl_cv_next_sys_types_h='"'$gl_header'"'
 
-
+          ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_types_h" >&5
 printf "%s\n" "$gl_cv_next_sys_types_h" >&6; }
@@ -21285,17 +22583,18 @@
   HAVE_TIMESPEC_GET=1;
   HAVE_TIMESPEC_GETRES=1;
     HAVE_TIMEZONE_T=0;
-        REPLACE_CTIME=GNULIB_PORTCHECK;
-  REPLACE_LOCALTIME_R=GNULIB_PORTCHECK;
-  REPLACE_MKTIME=GNULIB_PORTCHECK;
-  REPLACE_NANOSLEEP=GNULIB_PORTCHECK;
-  REPLACE_STRFTIME=GNULIB_PORTCHECK;
-  REPLACE_TIMEGM=GNULIB_PORTCHECK;
-  REPLACE_TZSET=GNULIB_PORTCHECK;
-
-      : ${GNULIB_GETTIMEOFDAY=0};
-        REPLACE_GMTIME=0;
+  REPLACE_CTIME=0;
+  REPLACE_GMTIME=0;
   REPLACE_LOCALTIME=0;
+  REPLACE_LOCALTIME_R=0;
+  REPLACE_MKTIME=0;
+  REPLACE_NANOSLEEP=0;
+  REPLACE_STRFTIME=0;
+  REPLACE_TIME=0;
+  REPLACE_TIMEGM=0;
+  REPLACE_TIMESPEC_GET=0;
+  REPLACE_TIMESPEC_GETRES=0;
+  REPLACE_TZSET=0;
 
 
 
@@ -21304,8 +22603,8 @@
 if test ${gl_cv_sys_struct_timespec_in_time_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
 
@@ -21320,10 +22619,12 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_sys_struct_timespec_in_time_h=yes
-else $as_nop
-  gl_cv_sys_struct_timespec_in_time_h=no
+else case e in #(
+  e) gl_cv_sys_struct_timespec_in_time_h=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_time_h" >&5
 printf "%s\n" "$gl_cv_sys_struct_timespec_in_time_h" >&6; }
@@ -21340,8 +22641,8 @@
 if test ${gl_cv_sys_struct_timespec_in_sys_time_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/time.h>
 
@@ -21356,10 +22657,12 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_sys_struct_timespec_in_sys_time_h=yes
-else $as_nop
-  gl_cv_sys_struct_timespec_in_sys_time_h=no
+else case e in #(
+  e) gl_cv_sys_struct_timespec_in_sys_time_h=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_sys_time_h" >&5
 printf "%s\n" "$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; }
@@ -21371,8 +22674,8 @@
 if test ${gl_cv_sys_struct_timespec_in_pthread_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
 
@@ -21387,10 +22690,12 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_sys_struct_timespec_in_pthread_h=yes
-else $as_nop
-  gl_cv_sys_struct_timespec_in_pthread_h=no
+else case e in #(
+  e) gl_cv_sys_struct_timespec_in_pthread_h=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_pthread_h" >&5
 printf "%s\n" "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; }
@@ -21402,8 +22707,8 @@
 if test ${gl_cv_sys_struct_timespec_in_unistd_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
 
@@ -21418,10 +22723,12 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_sys_struct_timespec_in_unistd_h=yes
-else $as_nop
-  gl_cv_sys_struct_timespec_in_unistd_h=no
+else case e in #(
+  e) gl_cv_sys_struct_timespec_in_unistd_h=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timespec_in_unistd_h" >&5
 printf "%s\n" "$gl_cv_sys_struct_timespec_in_unistd_h" >&6; }
@@ -21455,8 +22762,8 @@
 if test ${gl_cv_next_time_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -21469,7 +22776,7 @@
   esac
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
                                           gl_dirsep_regex='/\\'
       ;;
     *)
@@ -21492,7 +22799,8 @@
           gl_header=$gl_cv_absolute_time_h
           gl_cv_next_time_h='"'$gl_header'"'
 
-
+          ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_time_h" >&5
 printf "%s\n" "$gl_cv_next_time_h" >&6; }
@@ -21524,8 +22832,8 @@
 if test ${gl_cv_time_h_has_TIME_UTC+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
 
@@ -21540,10 +22848,12 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_time_h_has_TIME_UTC=yes
-else $as_nop
-  gl_cv_time_h_has_TIME_UTC=no
+else case e in #(
+  e) gl_cv_time_h_has_TIME_UTC=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_time_h_has_TIME_UTC" >&5
 printf "%s\n" "$gl_cv_time_h_has_TIME_UTC" >&6; }
@@ -21580,6 +22890,10 @@
 
 
 
+  GL_GNULIB_TIME=0
+
+
+
   GL_GNULIB_TIMEGM=0
 
 
@@ -21612,8 +22926,9 @@
 if test "x$ac_cv_have_decl_execvpe" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
 printf "%s\n" "#define HAVE_DECL_EXECVPE $ac_have_decl" >>confdefs.h
 
@@ -21637,8 +22952,8 @@
 if test ${gl_cv_next_unistd_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_unistd_h = yes; then
 
 
@@ -21654,7 +22969,7 @@
   esac
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
                                           gl_dirsep_regex='/\\'
       ;;
     *)
@@ -21680,7 +22995,8 @@
                gl_cv_next_unistd_h='<'unistd.h'>'
              fi
 
-
+          ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5
 printf "%s\n" "$gl_cv_next_unistd_h" >&6; }
@@ -21726,8 +23042,9 @@
 if test ${enable_valgrind_tests+y}
 then :
   enableval=$enable_valgrind_tests; opt_valgrind_tests=$enableval
-else $as_nop
-  opt_valgrind_tests=${gl_valgrind_tests_default:-yes}
+else case e in #(
+  e) opt_valgrind_tests=${gl_valgrind_tests_default:-yes} ;;
+esac
 fi
 
 
@@ -21742,8 +23059,8 @@
 if test ${ac_cv_prog_VALGRIND+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$VALGRIND"; then
+else case e in #(
+  e) if test -n "$VALGRIND"; then
   ac_cv_prog_VALGRIND="$VALGRIND" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -21765,7 +23082,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 VALGRIND=$ac_cv_prog_VALGRIND
 if test -n "$VALGRIND"; then
@@ -21801,14 +23119,16 @@
 if test ${gl_cv_opt_valgrind_tests+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if $VALGRIND $DEFAULT_VALGRINDFLAGS $VALGRINDFLAGS true
+else case e in #(
+  e) if $VALGRIND $DEFAULT_VALGRINDFLAGS $VALGRINDFLAGS true
 then :
   gl_cv_opt_valgrind_tests="$DEFAULT_VALGRINDFLAGS $VALGRINDFLAGS"
-else $as_nop
-  gl_cv_opt_valgrind_tests=no
+else case e in #(
+  e) gl_cv_opt_valgrind_tests=no ;;
+esac
 fi
-
+         ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_opt_valgrind_tests" >&5
 printf "%s\n" "$gl_cv_opt_valgrind_tests" >&6; }
@@ -21823,15 +23143,15 @@
 if test ${gl_cv_prog_valgrind_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+See 'config.log' for more details" "$LINENO" 5; }
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main () { return 0; }
 _ACEOF
@@ -21844,14 +23164,17 @@
               gl_cv_prog_valgrind_works=no
             fi
 
-else $as_nop
-  gl_cv_prog_valgrind_works=no
+else case e in #(
+  e) gl_cv_prog_valgrind_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+         ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_prog_valgrind_works" >&5
 printf "%s\n" "$gl_cv_prog_valgrind_works" >&6; }
@@ -21877,8 +23200,8 @@
 if test ${gl_cv_cc_wallow+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  rm -f conftest*
+else case e in #(
+  e) rm -f conftest*
      echo 'int dummy;' > conftest.c
      { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c 2>conftest1.err'
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
@@ -21898,7 +23221,8 @@
        gl_cv_cc_wallow=none
      fi
      rm -f conftest*
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_wallow" >&5
 printf "%s\n" "$gl_cv_cc_wallow" >&6; }
@@ -21915,8 +23239,8 @@
 if test ${gl_cv_cxx_wallow+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  rm -f conftest*
+else case e in #(
+  e) rm -f conftest*
        echo 'int dummy;' > conftest.cc
        { ac_try='${CXX-c++} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>conftest1.err'
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
@@ -21936,7 +23260,8 @@
          gl_cv_cxx_wallow=none
        fi
        rm -f conftest*
-
+       ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cxx_wallow" >&5
 printf "%s\n" "$gl_cv_cxx_wallow" >&6; }
@@ -21953,7 +23278,7 @@
 
       GL_CFLAG_GNULIB_WARNINGS=''
   if test -n "$GL_CFLAG_ALLOW_WARNINGS"; then
-                                                                        cat > conftest.c <<\EOF
+                                                                            cat > conftest.c <<\EOF
       #if __GNUC__ >= 3 || (__clang_major__ + (__clang_minor__ >= 9) > 3)
       -Wno-cast-qual
       -Wno-conversion
@@ -21972,6 +23297,9 @@
       #if __GNUC__ + (__GNUC_MINOR__ >= 8) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3)
       -Wno-pedantic
       #endif
+      #if 3 < __clang_major__ + (9 <= __clang_minor__)
+      -Wno-tautological-constant-out-of-range-compare
+      #endif
       #if __GNUC__ + (__GNUC_MINOR__ >= 3) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3)
       -Wno-sign-conversion
       -Wno-type-limits
@@ -22033,8 +23361,8 @@
 if test ${gl_cv_rpl_alloca+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -22044,15 +23372,17 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Need own alloca" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Need own alloca" >/dev/null 2>&1
 then :
   gl_cv_rpl_alloca=yes
-else $as_nop
-  gl_cv_rpl_alloca=no
+else case e in #(
+  e) gl_cv_rpl_alloca=no ;;
+esac
 fi
 rm -rf conftest*
 
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_rpl_alloca" >&5
 printf "%s\n" "$gl_cv_rpl_alloca" >&6; }
@@ -22114,12 +23444,12 @@
 if test ${gl_cv_static_assert+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_save_CFLAGS=$CFLAGS
+else case e in #(
+  e) gl_saved_CFLAGS=$CFLAGS
      for gl_working in "yes, a keyword" "yes, an <assert.h> macro"; do
       case $gl_working in #(
   *assert.h*) :
-    CFLAGS="$gl_save_CFLAGS -DINCLUDE_ASSERT_H" ;; #(
+    CFLAGS="$gl_saved_CFLAGS -DINCLUDE_ASSERT_H" ;; #(
   *) :
      ;;
 esac
@@ -22128,7 +23458,7 @@
 /* end confdefs.h.  */
 #if defined __clang__ && __STDC_VERSION__ < 202311
              #pragma clang diagnostic error "-Wc2x-extensions"
-             #pragma clang diagnostic error "-Wc++17-extensions"
+             #pragma clang diagnostic error "-Wc++1z-extensions"
             #endif
             #ifdef INCLUDE_ASSERT_H
              #include <assert.h>
@@ -22150,13 +23480,15 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_static_assert=$gl_working
-else $as_nop
-  gl_cv_static_assert=no
+else case e in #(
+  e) gl_cv_static_assert=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-      CFLAGS=$gl_save_CFLAGS
+      CFLAGS=$gl_saved_CFLAGS
       test "$gl_cv_static_assert" != no && break
-     done
+     done ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_static_assert" >&5
 printf "%s\n" "$gl_cv_static_assert" >&6; }
@@ -22185,8 +23517,8 @@
 if test ${gl_cv_next_assert_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -22199,7 +23531,7 @@
   esac
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
                                           gl_dirsep_regex='/\\'
       ;;
     *)
@@ -22222,7 +23554,8 @@
           gl_header=$gl_cv_absolute_assert_h
           gl_cv_next_assert_h='"'$gl_header'"'
 
-
+          ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_assert_h" >&5
 printf "%s\n" "$gl_cv_next_assert_h" >&6; }
@@ -22287,42 +23620,6 @@
 
 
 
-
-
-    if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-      REPLACE_CLOSE=1
-    fi
-
-
-
-
-
-
-  if test $ac_cv_header_sys_socket_h != yes; then
-                    ac_fn_c_check_header_compile "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default"
-if test "x$ac_cv_header_winsock2_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h
-
-fi
-
-  fi
-  if test "$ac_cv_header_winsock2_h" = yes; then
-    HAVE_WINSOCK2_H=1
-    UNISTD_H_HAVE_WINSOCK2_H=1
-    SYS_IOCTL_H_HAVE_WINSOCK2_H=1
-  else
-    HAVE_WINSOCK2_H=0
-  fi
-
-
-    if test $UNISTD_H_HAVE_WINSOCK2_H = 1; then
-                        REPLACE_CLOSE=1
-    fi
-
-
-
-
      if test $REPLACE_CLOSE = 1; then
   GL_COND_OBJ_CLOSE_TRUE=
   GL_COND_OBJ_CLOSE_FALSE='#'
@@ -22362,8 +23659,8 @@
 if test ${gl_cv_double_slash_root+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-   if test x"$cross_compiling" = xyes ; then
+else case e in #(
+  e)  if test x"$cross_compiling" = xyes ; then
         # When cross-compiling, there is no way to tell whether // is special
         # short of a list of hosts.  However, the only known hosts to date
         # that have a distinct // are Apollo DomainOS (too old to port to),
@@ -22385,7 +23682,8 @@
         else
           gl_cv_double_slash_root=yes
         fi
-      fi
+      fi ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_double_slash_root" >&5
 printf "%s\n" "$gl_cv_double_slash_root" >&6; }
@@ -22403,11 +23701,11 @@
 if test ${gl_cv_func_dup2_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
-         mingw*) # on this platform, dup2 always returns 0 for success
+         mingw* | windows*) # on this platform, dup2 always returns 0 for success
            gl_cv_func_dup2_works="guessing no" ;;
          cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
            gl_cv_func_dup2_works="guessing no" ;;
@@ -22423,8 +23721,8 @@
            gl_cv_func_dup2_works="guessing no" ;;
          *) gl_cv_func_dup2_works="guessing yes" ;;
        esac
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
        #include <errno.h>
@@ -22494,14 +23792,17 @@
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_dup2_works=yes
-else $as_nop
-  gl_cv_func_dup2_works=no
+else case e in #(
+  e) gl_cv_func_dup2_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_dup2_works" >&5
 printf "%s\n" "$gl_cv_func_dup2_works" >&6; }
@@ -22593,37 +23894,10 @@
 
 
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
-printf %s "checking for error_at_line... " >&6; }
-if test ${ac_cv_lib_error_at_line+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <error.h>
-int
-main (void)
-{
-error_at_line (0, 0, "", 0, "an error occurred");
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  ac_cv_lib_error_at_line=yes
-else $as_nop
-  ac_cv_lib_error_at_line=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
-printf "%s\n" "$ac_cv_lib_error_at_line" >&6; }
 
 
-     if test "$ac_cv_lib_error_at_line" = no; then
+
+     if test $COMPILE_ERROR_C = 1; then
   GL_COND_OBJ_ERROR_TRUE=
   GL_COND_OBJ_ERROR_FALSE='#'
 else
@@ -22660,6 +23934,8 @@
 
 
 
+
+
   if test $ac_cv_func_fcntl = no; then
 
 
@@ -22676,16 +23952,16 @@
 if test ${gl_cv_func_fcntl_f_dupfd_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case $host_os in
             aix* | cygwin* | haiku*)
                gl_cv_func_fcntl_f_dupfd_works="guessing no" ;;
             *) gl_cv_func_fcntl_f_dupfd_works="guessing yes" ;;
           esac
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <errno.h>
               #include <fcntl.h>
@@ -22738,13 +24014,16 @@
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_fcntl_f_dupfd_works=yes
-else $as_nop
-  gl_cv_func_fcntl_f_dupfd_works=no
+else case e in #(
+  e) gl_cv_func_fcntl_f_dupfd_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-
+ ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_works" >&5
 printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_works" >&6; }
@@ -22769,8 +24048,8 @@
 if test ${gl_cv_func_fcntl_f_dupfd_cloexec+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
                      # Guess no on NetBSD.
@@ -22778,8 +24057,8 @@
             *)       gl_cv_func_fcntl_f_dupfd_cloexec="$gl_cross_guess_normal" ;;
           esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <fcntl.h>
               #include <unistd.h>
@@ -22821,19 +24100,23 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_func_fcntl_f_dupfd_cloexec=yes
-else $as_nop
-  gl_cv_func_fcntl_f_dupfd_cloexec="needs runtime check"
+else case e in #(
+  e) gl_cv_func_fcntl_f_dupfd_cloexec="needs runtime check" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
-else $as_nop
-  gl_cv_func_fcntl_f_dupfd_cloexec=no
+else case e in #(
+  e) gl_cv_func_fcntl_f_dupfd_cloexec=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+       ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_fcntl_f_dupfd_cloexec" >&5
 printf "%s\n" "$gl_cv_func_fcntl_f_dupfd_cloexec" >&6; }
@@ -22898,7 +24181,7 @@
 
 
   case "$host_os" in
-    mingw* | solaris*)
+    darwin* | mingw* | windows* | solaris*)
                         REPLACE_FSTAT=1
       ;;
   esac
@@ -22922,7 +24205,7 @@
   if test -z "$GL_COND_OBJ_FSTAT_TRUE"; then :
 
     case "$host_os" in
-      mingw*)
+      mingw* | windows*)
 
 
 
@@ -22969,6 +24252,75 @@
 
 
 
+
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getdelim" >&5
+printf %s "checking for getdelim... " >&6; }
+if test ${gl_cv_onwards_func_getdelim+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e)
+  exec 9>&6 6>/dev/null
+
+       case "$host_os" in
+
+         linux*-android*)
+           ac_fn_check_decl "$LINENO" "getdelim" "ac_cv_have_decl_getdelim" "#include <stdio.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_getdelim" = xyes
+then :
+
+fi
+           if test $ac_cv_have_decl_getdelim = yes; then
+             ac_fn_c_check_func "$LINENO" "getdelim" "ac_cv_func_getdelim"
+if test "x$ac_cv_func_getdelim" = xyes
+then :
+
+fi
+
+             if test $ac_cv_func_getdelim = yes; then
+               gl_cv_onwards_func_getdelim=yes
+             else
+                                                            gl_cv_onwards_func_getdelim='future OS version'
+             fi
+           else
+             gl_cv_onwards_func_getdelim='future OS version'
+           fi
+           ;;
+
+
+         *)
+           ac_fn_c_check_func "$LINENO" "getdelim" "ac_cv_func_getdelim"
+if test "x$ac_cv_func_getdelim" = xyes
+then :
+
+fi
+
+           gl_cv_onwards_func_getdelim=$ac_cv_func_getdelim
+           ;;
+
+       esac
+
+  exec 6>&9 9>&-
+
+     ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_getdelim" >&5
+printf "%s\n" "$gl_cv_onwards_func_getdelim" >&6; }
+
+  case "$gl_cv_onwards_func_getdelim" in
+    future*) ac_cv_func_getdelim=no ;;
+    *)       ac_cv_func_getdelim=$gl_cv_onwards_func_getdelim ;;
+  esac
+  if test $ac_cv_func_getdelim = yes; then
+
+printf "%s\n" "#define HAVE_GETDELIM 1" >>confdefs.h
+
+  fi
+
+
   if test $ac_cv_func_getdelim = yes; then
     HAVE_GETDELIM=1
         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working getdelim function" >&5
@@ -22976,11 +24328,15 @@
 if test ${gl_cv_func_working_getdelim+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
-       if test "$cross_compiling" = yes
+else case e in #(
+  e) case "$host_os" in
+         darwin*)
+                                                                             gl_cv_func_working_getdelim=no ;;
+         *)
+           echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
+           if test "$cross_compiling" = yes
 then :
-                      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+                              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <features.h>
@@ -22992,21 +24348,22 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky GNU user" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Lucky GNU user" >/dev/null 2>&1
 then :
   gl_cv_func_working_getdelim="guessing yes"
-else $as_nop
-  case "$host_os" in
-               *-musl*) gl_cv_func_working_getdelim="guessing yes" ;;
-               *)       gl_cv_func_working_getdelim="$gl_cross_guess_normal" ;;
-             esac
-
+else case e in #(
+  e) case "$host_os" in
+                   *-musl* | midipix*) gl_cv_func_working_getdelim="guessing yes" ;;
+                   *)                  gl_cv_func_working_getdelim="$gl_cross_guess_normal" ;;
+                 esac
+                 ;;
+esac
 fi
 rm -rf conftest*
 
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #    include <stdio.h>
@@ -23044,14 +24401,19 @@
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_working_getdelim=yes
-else $as_nop
-  gl_cv_func_working_getdelim=no
+else case e in #(
+  e) gl_cv_func_working_getdelim=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+           ;;
+       esac
+       ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_getdelim" >&5
 printf "%s\n" "$gl_cv_func_working_getdelim" >&6; }
@@ -23061,6 +24423,9 @@
     esac
   else
     HAVE_GETDELIM=0
+    case "$gl_cv_onwards_func_getdelim" in
+      future*) REPLACE_GETDELIM=1 ;;
+    esac
   fi
 
   if test $ac_cv_have_decl_getdelim = no; then
@@ -23101,8 +24466,9 @@
 if test "x$ac_cv_have_decl_getc_unlocked" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
 printf "%s\n" "#define HAVE_DECL_GETC_UNLOCKED $ac_have_decl" >>confdefs.h
 
@@ -23140,8 +24506,8 @@
 if test ${gl_cv_func_getdtablesize_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-                                                   case "$host_os" in
+else case e in #(
+  e)                                                  case "$host_os" in
          vms*) gl_cv_func_getdtablesize_works="no (limitation)" ;;
          *)
                                                        if test "$cross_compiling" = yes
@@ -23152,8 +24518,8 @@
                 *) gl_cv_func_getdtablesize_works="guessing yes" ;;
               esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
              #include <unistd.h>
@@ -23178,16 +24544,19 @@
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_getdtablesize_works=yes
-else $as_nop
-  gl_cv_func_getdtablesize_works=no
+else case e in #(
+  e) gl_cv_func_getdtablesize_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
            ;;
        esac
-
+       ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getdtablesize_works" >&5
 printf "%s\n" "$gl_cv_func_getdtablesize_works" >&6; }
@@ -23244,23 +24613,83 @@
 
 
 
-  gl_getline_needs_run_time_check=no
-  ac_fn_c_check_func "$LINENO" "getline" "ac_cv_func_getline"
+
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getline" >&5
+printf %s "checking for getline... " >&6; }
+if test ${gl_cv_onwards_func_getline+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e)
+  exec 9>&6 6>/dev/null
+
+       case "$host_os" in
+
+         linux*-android*)
+           ac_fn_check_decl "$LINENO" "getline" "ac_cv_have_decl_getline" "#include <stdio.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_getline" = xyes
+then :
+
+fi
+           if test $ac_cv_have_decl_getline = yes; then
+             ac_fn_c_check_func "$LINENO" "getline" "ac_cv_func_getline"
+if test "x$ac_cv_func_getline" = xyes
+then :
+
+fi
+
+             if test $ac_cv_func_getline = yes; then
+               gl_cv_onwards_func_getline=yes
+             else
+                                                            gl_cv_onwards_func_getline='future OS version'
+             fi
+           else
+             gl_cv_onwards_func_getline='future OS version'
+           fi
+           ;;
+
+
+         *)
+           ac_fn_c_check_func "$LINENO" "getline" "ac_cv_func_getline"
 if test "x$ac_cv_func_getline" = xyes
 then :
-                   gl_getline_needs_run_time_check=yes
-else $as_nop
-  am_cv_func_working_getline=no
+
+fi
+
+           gl_cv_onwards_func_getline=$ac_cv_func_getline
+           ;;
+
+       esac
+
+  exec 6>&9 9>&-
+
+     ;;
+esac
 fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_getline" >&5
+printf "%s\n" "$gl_cv_onwards_func_getline" >&6; }
+
+  case "$gl_cv_onwards_func_getline" in
+    future*) ac_cv_func_getline=no ;;
+    *)       ac_cv_func_getline=$gl_cv_onwards_func_getline ;;
+  esac
+  if test $ac_cv_func_getline = yes; then
+
+printf "%s\n" "#define HAVE_GETLINE 1" >>confdefs.h
+
+  fi
 
-  if test $gl_getline_needs_run_time_check = yes; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working getline function" >&5
+
+  if test $ac_cv_func_getline = yes; then
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working getline function" >&5
 printf %s "checking for working getline function... " >&6; }
 if test ${am_cv_func_working_getline+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
+else case e in #(
+  e) echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
        if test "$cross_compiling" = yes
 then :
                       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -23275,21 +24704,22 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky GNU user" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Lucky GNU user" >/dev/null 2>&1
 then :
   am_cv_func_working_getline="guessing yes"
-else $as_nop
-  case "$host_os" in
-               *-musl*) am_cv_func_working_getline="guessing yes" ;;
-               *)       am_cv_func_working_getline="$gl_cross_guess_normal" ;;
+else case e in #(
+  e) case "$host_os" in
+               *-musl* | midipix*) am_cv_func_working_getline="guessing yes" ;;
+               *)                  am_cv_func_working_getline="$gl_cross_guess_normal" ;;
              esac
-
+             ;;
+esac
 fi
 rm -rf conftest*
 
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #    include <stdio.h>
@@ -23327,17 +24757,25 @@
 if ac_fn_c_try_run "$LINENO"
 then :
   am_cv_func_working_getline=yes
-else $as_nop
-  am_cv_func_working_getline=no
+else case e in #(
+  e) am_cv_func_working_getline=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+       ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_working_getline" >&5
 printf "%s\n" "$am_cv_func_working_getline" >&6; }
+  else
+    am_cv_func_working_getline=no
+    case "$gl_cv_onwards_func_getline" in
+      future*) REPLACE_GETLINE=1 ;;
+    esac
   fi
 
   if test $ac_cv_have_decl_getline = no; then
@@ -23539,14 +24977,128 @@
 
 
 
+
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getprogname" >&5
+printf %s "checking for getprogname... " >&6; }
+if test ${gl_cv_onwards_func_getprogname+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e)
+  exec 9>&6 6>/dev/null
+
+       case "$host_os" in
+
+         linux*-android*)
+           ac_fn_check_decl "$LINENO" "getprogname" "ac_cv_have_decl_getprogname" "#include <stdlib.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_getprogname" = xyes
+then :
+
+fi
+           if test $ac_cv_have_decl_getprogname = yes; then
+             ac_fn_c_check_func "$LINENO" "getprogname" "ac_cv_func_getprogname"
+if test "x$ac_cv_func_getprogname" = xyes
+then :
+
+fi
+
+             if test $ac_cv_func_getprogname = yes; then
+               gl_cv_onwards_func_getprogname=yes
+             else
+                                                            gl_cv_onwards_func_getprogname='future OS version'
+             fi
+           else
+             gl_cv_onwards_func_getprogname='future OS version'
+           fi
+           ;;
+
+
+         *)
+           ac_fn_c_check_func "$LINENO" "getprogname" "ac_cv_func_getprogname"
+if test "x$ac_cv_func_getprogname" = xyes
+then :
+
+fi
+
+           gl_cv_onwards_func_getprogname=$ac_cv_func_getprogname
+           ;;
+
+       esac
+
+  exec 6>&9 9>&-
+
+     ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_getprogname" >&5
+printf "%s\n" "$gl_cv_onwards_func_getprogname" >&6; }
+
+  case "$gl_cv_onwards_func_getprogname" in
+    future*) ac_cv_func_getprogname=no ;;
+    *)       ac_cv_func_getprogname=$gl_cv_onwards_func_getprogname ;;
+  esac
+  if test $ac_cv_func_getprogname = yes; then
+
+printf "%s\n" "#define HAVE_GETPROGNAME 1" >>confdefs.h
+
+  fi
+
+
+  if test $ac_cv_func_getprogname = no; then
+    HAVE_GETPROGNAME=0
+    case "$gl_cv_onwards_func_getprogname" in
+      future*) REPLACE_GETPROGNAME=1 ;;
+    esac
+  fi
+  ac_fn_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_program_invocation_name" = xyes
+then :
+  ac_have_decl=1
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
+fi
+printf "%s\n" "#define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
+if test $ac_have_decl = 1
+then :
+
+else case e in #(
+  e) HAVE_DECL_PROGRAM_INVOCATION_NAME=0 ;;
+esac
+fi
+
+
+
+     if test $HAVE_GETPROGNAME = 0 || test $REPLACE_GETPROGNAME = 1; then
+  GL_COND_OBJ_GETPROGNAME_TRUE=
+  GL_COND_OBJ_GETPROGNAME_FALSE='#'
+else
+  GL_COND_OBJ_GETPROGNAME_TRUE='#'
+  GL_COND_OBJ_GETPROGNAME_FALSE=
+fi
+:
+    if test -z "${GL_COND_OBJ_GETPROGNAME_TRUE}" && test -z "${GL_COND_OBJ_GETPROGNAME_FALSE}"; then
+    GL_COND_OBJ_GETPROGNAME_TRUE='#'
+    GL_COND_OBJ_GETPROGNAME_FALSE='#'
+  fi
+
+  if test -z "$GL_COND_OBJ_GETPROGNAME_TRUE"; then :
+
+
+
+
   ac_found=0
   ac_fn_check_decl "$LINENO" "program_invocation_name" "ac_cv_have_decl_program_invocation_name" "#include <errno.h>
 " "$ac_c_undeclared_builtin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_program_invocation_name" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
 printf "%s\n" "#define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
 if test $ac_have_decl = 1
@@ -23559,8 +25111,9 @@
 if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
 printf "%s\n" "#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h
 if test $ac_have_decl = 1
@@ -23573,8 +25126,9 @@
 if test "x$ac_cv_have_decl___argv" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
 printf "%s\n" "#define HAVE_DECL___ARGV $ac_have_decl" >>confdefs.h
 if test $ac_have_decl = 1
@@ -23592,8 +25146,8 @@
 if test ${gl_cv_var___progname+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
         gl_cv_var___progname=
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -23615,7 +25169,8 @@
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_var___progname" >&5
 printf "%s\n" "$gl_cv_var___progname" >&6; }
@@ -23627,6 +25182,27 @@
   fi
 
 
+fi
+
+
+
+
+
+
+
+
+
+          GL_GNULIB_GETPROGNAME=1
+
+
+
+
+
+printf "%s\n" "#define GNULIB_TEST_GETPROGNAME 1" >>confdefs.h
+
+
+
+
 
   # Autoconf 2.61a.99 and earlier don't support linking a file only
   # in VPATH builds.  But since GNUmakefile is for maintainer use
@@ -23643,8 +25219,8 @@
 if test ${gl_cv_c_inline_effective+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test $ac_cv_c_inline = no; then
+else case e in #(
+  e) if test $ac_cv_c_inline = no; then
        gl_cv_c_inline_effective=no
      else
                                           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -23663,12 +25239,14 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_c_inline_effective=yes
-else $as_nop
-  gl_cv_c_inline_effective=no
+else case e in #(
+  e) gl_cv_c_inline_effective=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      fi
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_inline_effective" >&5
 printf "%s\n" "$gl_cv_c_inline_effective" >&6; }
@@ -23685,8 +25263,8 @@
 if test ${gl_cv_ld_output_def+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$enable_shared" = no; then
+else case e in #(
+  e) if test "$enable_shared" = no; then
        gl_cv_ld_output_def="not needed, shared libraries are disabled"
      else
        gl_ldflags_save=$LDFLAGS
@@ -23705,14 +25283,16 @@
 if ac_fn_c_try_link "$LINENO"
 then :
   gl_cv_ld_output_def=yes
-else $as_nop
-  gl_cv_ld_output_def=no
+else case e in #(
+  e) gl_cv_ld_output_def=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
        rm -f conftest.def
        LDFLAGS="$gl_ldflags_save"
-     fi
+     fi ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_ld_output_def" >&5
 printf "%s\n" "$gl_cv_ld_output_def" >&6; }
@@ -23730,15 +25310,15 @@
 if test ${enable_ld_version_script+y}
 then :
   enableval=$enable_ld_version_script; have_ld_version_script=$enableval
-else $as_nop
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if LD -Wl,--version-script works" >&5
+else case e in #(
+  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if LD -Wl,--version-script works" >&5
 printf %s "checking if LD -Wl,--version-script works... " >&6; }
 if test ${gl_cv_sys_ld_version_script+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_cv_sys_ld_version_script=no
-        save_LDFLAGS=$LDFLAGS
+else case e in #(
+  e) gl_cv_sys_ld_version_script=no
+        saved_LDFLAGS=$LDFLAGS
         LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
         echo foo >conftest.map
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -23755,8 +25335,8 @@
 if ac_fn_c_try_link "$LINENO"
 then :
 
-else $as_nop
-  cat > conftest.map <<EOF
+else case e in #(
+  e) cat > conftest.map <<EOF
 VERS_1 {
         global: sym;
 };
@@ -23781,16 +25361,19 @@
   gl_cv_sys_ld_version_script=yes
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
+    conftest$ac_exeext conftest.$ac_ext ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
         rm -f conftest.map
-        LDFLAGS=$save_LDFLAGS
+        LDFLAGS=$saved_LDFLAGS ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_ld_version_script" >&5
 printf "%s\n" "$gl_cv_sys_ld_version_script" >&6; }
-     have_ld_version_script=$gl_cv_sys_ld_version_script
+     have_ld_version_script=$gl_cv_sys_ld_version_script ;;
+esac
 fi
 
    if test "$have_ld_version_script" = yes; then
@@ -23812,8 +25395,8 @@
 if test ${gl_cv_cc_vis_werror+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_save_CFLAGS="$CFLAGS"
+else case e in #(
+  e) gl_saved_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -Werror"
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -23829,12 +25412,14 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_cc_vis_werror=yes
-else $as_nop
-  gl_cv_cc_vis_werror=no
+else case e in #(
+  e) gl_cv_cc_vis_werror=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-       CFLAGS="$gl_save_CFLAGS"
-
+       CFLAGS="$gl_saved_CFLAGS"
+       ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
 printf "%s\n" "$gl_cv_cc_vis_werror" >&6; }
@@ -23843,8 +25428,8 @@
 if test ${gl_cv_cc_visibility+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_save_CFLAGS="$CFLAGS"
+else case e in #(
+  e) gl_saved_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -fvisibility=hidden"
                                           if test $gl_cv_cc_vis_werror = yes; then
          CFLAGS="$CFLAGS -Werror"
@@ -23873,12 +25458,14 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_cc_visibility=yes
-else $as_nop
-  gl_cv_cc_visibility=no
+else case e in #(
+  e) gl_cv_cc_visibility=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-       CFLAGS="$gl_save_CFLAGS"
-
+       CFLAGS="$gl_saved_CFLAGS"
+       ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
 printf "%s\n" "$gl_cv_cc_visibility" >&6; }
@@ -23899,8 +25486,8 @@
 if test ${gl_cv_c___inline+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 typedef int foo_t;
            static __inline foo_t foo (void) { return 0; }
@@ -23915,10 +25502,12 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_c___inline=yes
-else $as_nop
-  gl_cv_c___inline=no
+else case e in #(
+  e) gl_cv_c___inline=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c___inline" >&5
 printf "%s\n" "$gl_cv_c___inline" >&6; }
@@ -24008,7 +25597,7 @@
 
 
   case "$host_os" in
-    mingw* | pw*)
+    mingw* | windows* | pw*)
       REPLACE_OPEN=1
       ;;
     *)
@@ -24023,8 +25612,8 @@
 if test ${gl_cv_func_open_slash+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  # Assume that if we have lstat, we can also check symlinks.
+else case e in #(
+  e) # Assume that if we have lstat, we can also check symlinks.
      if test $ac_cv_func_lstat = yes; then
        touch conftest.tmp
        ln -s conftest.tmp conftest.lnk
@@ -24039,8 +25628,8 @@
             gl_cv_func_open_slash="guessing yes" ;;
         esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <fcntl.h>
@@ -24066,15 +25655,18 @@
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_open_slash=yes
-else $as_nop
-  gl_cv_func_open_slash=no
+else case e in #(
+  e) gl_cv_func_open_slash=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
      rm -f conftest.sl conftest.tmp conftest.lnk
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_open_slash" >&5
 printf "%s\n" "$gl_cv_func_open_slash" >&6; }
@@ -24145,8 +25737,9 @@
 if test "x$ac_cv_have_decl_program_invocation_name" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
 printf "%s\n" "#define HAVE_DECL_PROGRAM_INVOCATION_NAME $ac_have_decl" >>confdefs.h
 
@@ -24155,8 +25748,9 @@
 if test "x$ac_cv_have_decl_program_invocation_short_name" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
 printf "%s\n" "#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME $ac_have_decl" >>confdefs.h
 
@@ -24221,11 +25815,11 @@
 
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
 printf %s "checking for ssize_t... " >&6; }
-if test ${gt_cv_ssize_t+y}
+if test ${gl_cv_ssize_t+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 int
@@ -24239,17 +25833,55 @@
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
-  gt_cv_ssize_t=yes
-else $as_nop
-  gt_cv_ssize_t=no
+  gl_cv_ssize_t=yes
+else case e in #(
+  e) gl_cv_ssize_t=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_ssize_t" >&5
+printf "%s\n" "$gl_cv_ssize_t" >&6; }
+  if test $gl_cv_ssize_t = no; then
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether size_t is wider than 'long'" >&5
+printf %s "checking whether size_t is wider than 'long'... " >&6; }
+if test ${gl_cv_size_t_large+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+              typedef int array 2 * (sizeof (size_t) > sizeof (long)) - 1;
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  gl_cv_size_t_large=yes
+else case e in #(
+  e) gl_cv_size_t_large=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
-printf "%s\n" "$gt_cv_ssize_t" >&6; }
-  if test $gt_cv_ssize_t = no; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_size_t_large" >&5
+printf "%s\n" "$gl_cv_size_t_large" >&6; }
+    if test $gl_cv_size_t_large = yes; then
+      gl_def_ssize_t='long long'
+    else
+      gl_def_ssize_t='long'
+    fi
 
-printf "%s\n" "#define ssize_t int" >>confdefs.h
+printf "%s\n" "#define ssize_t $gl_def_ssize_t" >>confdefs.h
 
   fi
 
@@ -24258,7 +25890,7 @@
 
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
                   REPLACE_STAT=1
       ;;
     *)
@@ -24267,8 +25899,8 @@
 if test ${gl_cv_func_stat_file_slash+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  touch conftest.tmp
+else case e in #(
+  e) touch conftest.tmp
          # Assume that if we have lstat, we can also check symlinks.
          if test $ac_cv_func_lstat = yes; then
            ln -s conftest.tmp conftest.lnk
@@ -24278,14 +25910,16 @@
   case "$host_os" in
                                # Guess yes on Linux systems.
               linux-* | linux) gl_cv_func_stat_file_slash="guessing yes" ;;
+                               # Guess yes on systems that emulate the Linux system calls.
+              midipix*)        gl_cv_func_stat_file_slash="guessing yes" ;;
                                # Guess yes on glibc systems.
               *-gnu* | gnu*)   gl_cv_func_stat_file_slash="guessing yes" ;;
                                # If we don't know, obey --enable-cross-guesses.
               *)               gl_cv_func_stat_file_slash="$gl_cross_guess_normal" ;;
             esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/stat.h>
 
@@ -24309,14 +25943,17 @@
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_stat_file_slash=yes
-else $as_nop
-  gl_cv_func_stat_file_slash=no
+else case e in #(
+  e) gl_cv_func_stat_file_slash=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-         rm -f conftest.tmp conftest.lnk
+         rm -f conftest.tmp conftest.lnk ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_stat_file_slash" >&5
 printf "%s\n" "$gl_cv_func_stat_file_slash" >&6; }
@@ -24328,7 +25965,7 @@
 ;;
       esac
       case $host_os in
-                solaris*)
+                darwin* | solaris*)
           REPLACE_FSTAT=1 ;;
       esac
       ;;
@@ -24351,7 +25988,7 @@
   if test -z "$GL_COND_OBJ_STAT_TRUE"; then :
 
     case "$host_os" in
-      mingw*)
+      mingw* | windows*)
 
 
 
@@ -24407,8 +26044,8 @@
 if test ${ac_cv_typeof_struct_stat_st_atim_is_struct_timespec+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
             #include <sys/types.h>
@@ -24433,10 +26070,12 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=yes
-else $as_nop
-  ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=no
+else case e in #(
+  e) ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&5
 printf "%s\n" "$ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&6; }
@@ -24445,8 +26084,8 @@
 printf "%s\n" "#define TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC 1" >>confdefs.h
 
      fi
-else $as_nop
-  ac_fn_c_check_member "$LINENO" "struct stat" "st_atimespec.tv_nsec" "ac_cv_member_struct_stat_st_atimespec_tv_nsec" "#include <sys/types.h>
+else case e in #(
+  e) ac_fn_c_check_member "$LINENO" "struct stat" "st_atimespec.tv_nsec" "ac_cv_member_struct_stat_st_atimespec_tv_nsec" "#include <sys/types.h>
         #include <sys/stat.h>
 "
 if test "x$ac_cv_member_struct_stat_st_atimespec_tv_nsec" = xyes
@@ -24455,8 +26094,8 @@
 printf "%s\n" "#define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1" >>confdefs.h
 
 
-else $as_nop
-  ac_fn_c_check_member "$LINENO" "struct stat" "st_atimensec" "ac_cv_member_struct_stat_st_atimensec" "#include <sys/types.h>
+else case e in #(
+  e) ac_fn_c_check_member "$LINENO" "struct stat" "st_atimensec" "ac_cv_member_struct_stat_st_atimensec" "#include <sys/types.h>
            #include <sys/stat.h>
 "
 if test "x$ac_cv_member_struct_stat_st_atimensec" = xyes
@@ -24465,8 +26104,8 @@
 printf "%s\n" "#define HAVE_STRUCT_STAT_ST_ATIMENSEC 1" >>confdefs.h
 
 
-else $as_nop
-  ac_fn_c_check_member "$LINENO" "struct stat" "st_atim.st__tim.tv_nsec" "ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" "#include <sys/types.h>
+else case e in #(
+  e) ac_fn_c_check_member "$LINENO" "struct stat" "st_atim.st__tim.tv_nsec" "ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" "#include <sys/types.h>
               #include <sys/stat.h>
 "
 if test "x$ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" = xyes
@@ -24476,11 +26115,14 @@
 
 
 fi
-
+ ;;
+esac
 fi
-
+ ;;
+esac
 fi
-
+ ;;
+esac
 fi
 
 
@@ -24496,8 +26138,8 @@
 printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1" >>confdefs.h
 
 
-else $as_nop
-  ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimensec" "ac_cv_member_struct_stat_st_birthtimensec" "#include <sys/types.h>
+else case e in #(
+  e) ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimensec" "ac_cv_member_struct_stat_st_birthtimensec" "#include <sys/types.h>
         #include <sys/stat.h>
 "
 if test "x$ac_cv_member_struct_stat_st_birthtimensec" = xyes
@@ -24506,8 +26148,8 @@
 printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1" >>confdefs.h
 
 
-else $as_nop
-  ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtim.tv_nsec" "ac_cv_member_struct_stat_st_birthtim_tv_nsec" "#include <sys/types.h>
+else case e in #(
+  e) ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtim.tv_nsec" "ac_cv_member_struct_stat_st_birthtim_tv_nsec" "#include <sys/types.h>
           #include <sys/stat.h>
 "
 if test "x$ac_cv_member_struct_stat_st_birthtim_tv_nsec" = xyes
@@ -24517,133 +26159,12 @@
 
 
 fi
-
-fi
-
-fi
-
-
-
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alignas and alignof" >&5
-printf %s "checking for alignas and alignof... " >&6; }
-if test ${gl_cv_header_working_stdalign_h+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  gl_save_CFLAGS=$CFLAGS
-     for gl_working in "yes, keywords" "yes, <stdalign.h> macros"; do
-      case $gl_working in #(
-  *stdalign.h*) :
-    CFLAGS="$gl_save_CFLAGS -DINCLUDE_STDALIGN_H" ;; #(
-  *) :
-     ;;
+ ;;
 esac
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdint.h>
-            #ifdef INCLUDE_STDALIGN_H
-             #include <stdalign.h>
-            #endif
-            #include <stddef.h>
-
-            /* Test that alignof yields a result consistent with offsetof.
-               This catches GCC bug 52023
-               <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>.  */
-            #ifdef __cplusplus
-               template <class t> struct alignof_helper { char a; t b; };
-            # define ao(type) offsetof (alignof_helper<type>, b)
-            #else
-            # define ao(type) offsetof (struct { char a; type b; }, b)
-            #endif
-            char test_doubleao (double) % _Alignof (double) == 0 ? 1 : -1;
-            char test_longao (long int) % _Alignof (long int) == 0 ? 1 : -1;
-            char test_alignofalignof (double) == _Alignof (double) ? 1 : -1;
-
-            /* Test alignas only on platforms where gnulib can help.  */
-            #if \
-                ((defined __cplusplus && 201103 <= __cplusplus) \
-                 || (__TINYC__ && defined __attribute__) \
-                 || (defined __APPLE__ && defined __MACH__ \
-                     ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \
-                     : __GNUC__) \
-                 || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \
-                 || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__ \
-                 || 1300 <= _MSC_VER)
-              struct alignas_test { char c; char alignas (8) alignas_8; };
-              char test_alignasoffsetof (struct alignas_test, alignas_8) == 8
-                                ? 1 : -1;
-            #endif
-
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  gl_cv_header_working_stdalign_h=$gl_working
-else $as_nop
-  gl_cv_header_working_stdalign_h=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
-      CFLAGS=$gl_save_CFLAGS
-      test "$gl_cv_header_working_stdalign_h" != no && break
-     done
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_working_stdalign_h" >&5
-printf "%s\n" "$gl_cv_header_working_stdalign_h" >&6; }
-
-  GL_GENERATE_STDALIGN_H=false
-  case $gl_cv_header_working_stdalign_h in #(
-  no) :
-    GL_GENERATE_STDALIGN_H=true ;; #(
-  yes*keyword*) :
-
-printf "%s\n" "#define HAVE_C_ALIGNASOF 1" >>confdefs.h
- ;; #(
-  *) :
-     ;;
+ ;;
 esac
-
-
-
-
-
-
-
-
-
-  case "$GL_GENERATE_STDALIGN_H" in
-    false) STDALIGN_H='' ;;
-    true)
-                  if test -z "$STDALIGN_H"; then
-        STDALIGN_H="${gl_source_base_prefix}stdalign.h"
-      fi
-      ;;
-    *) echo "*** GL_GENERATE_STDALIGN_H is not set correctly" 1>&2; exit 1 ;;
-  esac
-
-
-     if $GL_GENERATE_STDALIGN_H; then
-  GL_GENERATE_STDALIGN_H_TRUE=
-  GL_GENERATE_STDALIGN_H_FALSE='#'
-else
-  GL_GENERATE_STDALIGN_H_TRUE='#'
-  GL_GENERATE_STDALIGN_H_FALSE=
 fi
-:
-    if test -z "${GL_GENERATE_STDALIGN_H_TRUE}" && test -z "${GL_GENERATE_STDALIGN_H_FALSE}"; then
-    GL_GENERATE_STDALIGN_H_TRUE='#'
-    GL_GENERATE_STDALIGN_H_FALSE='#'
-  fi
-
-
-
-
 
 
 
@@ -24654,8 +26175,8 @@
 if test ${gl_cv_func_va_copy+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 int
@@ -24673,11 +26194,13 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_func_va_copy=yes
-else $as_nop
-  gl_cv_func_va_copy=no
+else case e in #(
+  e) gl_cv_func_va_copy=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_va_copy" >&5
 printf "%s\n" "$gl_cv_func_va_copy" >&6; }
@@ -24690,11 +26213,12 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "vaccine" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "vaccine" >/dev/null 2>&1
 then :
   gl_aixcc=yes
-else $as_nop
-  gl_aixcc=no
+else case e in #(
+  e) gl_aixcc=no ;;
+esac
 fi
 rm -rf conftest*
 
@@ -24716,8 +26240,8 @@
 if test ${gl_cv_next_stdarg_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
 
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -24730,7 +26254,7 @@
   esac
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
                                           gl_dirsep_regex='/\\'
       ;;
     *)
@@ -24753,7 +26277,8 @@
           gl_header=$gl_cv_absolute_stdarg_h
           gl_cv_next_stdarg_h='"'$gl_header'"'
 
-
+          ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stdarg_h" >&5
 printf "%s\n" "$gl_cv_next_stdarg_h" >&6; }
@@ -24784,8 +26309,8 @@
     if test ${gl_cv_func___va_copy+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
@@ -24804,10 +26329,12 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_func___va_copy=yes
-else $as_nop
-  gl_cv_func___va_copy=no
+else case e in #(
+  e) gl_cv_func___va_copy=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
 
@@ -24867,8 +26394,8 @@
 if test ${gl_cv_c_bool+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
           #if true == false
@@ -24880,10 +26407,12 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_c_bool=yes
-else $as_nop
-  gl_cv_c_bool=no
+else case e in #(
+  e) gl_cv_c_bool=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_bool" >&5
 printf "%s\n" "$gl_cv_c_bool" >&6; }
@@ -25420,23 +26949,88 @@
 
 
 
-  ac_fn_c_check_func "$LINENO" "strchrnul" "ac_cv_func_strchrnul"
+
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for strchrnul" >&5
+printf %s "checking for strchrnul... " >&6; }
+if test ${gl_cv_onwards_func_strchrnul+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e)
+  exec 9>&6 6>/dev/null
+
+       case "$host_os" in
+
+         linux*-android*)
+           ac_fn_check_decl "$LINENO" "strchrnul" "ac_cv_have_decl_strchrnul" "#include <string.h>
+" "$ac_c_undeclared_builtin_options" "CFLAGS"
+if test "x$ac_cv_have_decl_strchrnul" = xyes
+then :
+
+fi
+           if test $ac_cv_have_decl_strchrnul = yes; then
+             ac_fn_c_check_func "$LINENO" "strchrnul" "ac_cv_func_strchrnul"
+if test "x$ac_cv_func_strchrnul" = xyes
+then :
+
+fi
+
+             if test $ac_cv_func_strchrnul = yes; then
+               gl_cv_onwards_func_strchrnul=yes
+             else
+                                                            gl_cv_onwards_func_strchrnul='future OS version'
+             fi
+           else
+             gl_cv_onwards_func_strchrnul='future OS version'
+           fi
+           ;;
+
+
+         *)
+           ac_fn_c_check_func "$LINENO" "strchrnul" "ac_cv_func_strchrnul"
 if test "x$ac_cv_func_strchrnul" = xyes
 then :
-  printf "%s\n" "#define HAVE_STRCHRNUL 1" >>confdefs.h
 
 fi
 
+           gl_cv_onwards_func_strchrnul=$ac_cv_func_strchrnul
+           ;;
+
+       esac
+
+  exec 6>&9 9>&-
+
+     ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_onwards_func_strchrnul" >&5
+printf "%s\n" "$gl_cv_onwards_func_strchrnul" >&6; }
+
+  case "$gl_cv_onwards_func_strchrnul" in
+    future*) ac_cv_func_strchrnul=no ;;
+    *)       ac_cv_func_strchrnul=$gl_cv_onwards_func_strchrnul ;;
+  esac
+  if test $ac_cv_func_strchrnul = yes; then
+
+printf "%s\n" "#define HAVE_STRCHRNUL 1" >>confdefs.h
+
+  fi
+
+
   if test $ac_cv_func_strchrnul = no; then
     HAVE_STRCHRNUL=0
+    case "$gl_cv_onwards_func_strchrnul" in
+      future*) REPLACE_STRCHRNUL=1 ;;
+    esac
   else
     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strchrnul works" >&5
 printf %s "checking whether strchrnul works... " >&6; }
 if test ${gl_cv_func_strchrnul_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -25452,17 +27046,18 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky user" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Lucky user" >/dev/null 2>&1
 then :
   gl_cv_func_strchrnul_works="guessing yes"
-else $as_nop
-  gl_cv_func_strchrnul_works="guessing no"
+else case e in #(
+  e) gl_cv_func_strchrnul_works="guessing no" ;;
+esac
 fi
 rm -rf conftest*
 
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <string.h> /* for strchrnul */
@@ -25480,14 +27075,17 @@
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_strchrnul_works=yes
-else $as_nop
-  gl_cv_func_strchrnul_works=no
+else case e in #(
+  e) gl_cv_func_strchrnul_works=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+       ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strchrnul_works" >&5
 printf "%s\n" "$gl_cv_func_strchrnul_works" >&6; }
@@ -25551,20 +27149,20 @@
 if test ${gl_cv_func_working_strerror+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test "$cross_compiling" = yes
+else case e in #(
+  e) if test "$cross_compiling" = yes
 then :
   case "$host_os" in
-                          # Guess yes on glibc systems.
-           *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;;
-                          # Guess yes on musl systems.
-           *-musl*)       gl_cv_func_working_strerror="guessing yes" ;;
-                          # If we don't know, obey --enable-cross-guesses.
-           *)             gl_cv_func_working_strerror="$gl_cross_guess_normal" ;;
+                               # Guess yes on glibc systems.
+           *-gnu* | gnu*)      gl_cv_func_working_strerror="guessing yes" ;;
+                               # Guess yes on musl systems.
+           *-musl* | midipix*) gl_cv_func_working_strerror="guessing yes" ;;
+                               # If we don't know, obey --enable-cross-guesses.
+           *)                  gl_cv_func_working_strerror="$gl_cross_guess_normal" ;;
          esac
 
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
@@ -25579,14 +27177,17 @@
 if ac_fn_c_try_run "$LINENO"
 then :
   gl_cv_func_working_strerror=yes
-else $as_nop
-  gl_cv_func_working_strerror=no
+else case e in #(
+  e) gl_cv_func_working_strerror=no ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_strerror" >&5
 printf "%s\n" "$gl_cv_func_working_strerror" >&6; }
@@ -25711,10 +27312,62 @@
 
   if test $ac_cv_func_strverscmp = no; then
     HAVE_STRVERSCMP=0
+  else
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strverscmp works" >&5
+printf %s "checking whether strverscmp works... " >&6; }
+if test ${gl_cv_func_strverscmp_works+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e)        if test "$cross_compiling" = yes
+then :
+  case "$host_os" in
+                                # Guess yes on glibc systems.
+            *-gnu* | gnu*)      gl_cv_func_strverscmp_works="guessing yes" ;;
+                                # Guess no on musl systems.
+            *-musl* | midipix*) gl_cv_func_strverscmp_works="guessing no" ;;
+                                # Guess no on Cygwin.
+            cygwin*)            gl_cv_func_strverscmp_works="guessing no" ;;
+                                # If we don't know, obey --enable-cross-guesses.
+            *)                  gl_cv_func_strverscmp_works="$gl_cross_guess_normal" ;;
+          esac
+
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <string.h>
+int main ()
+{
+  return strverscmp ("UNKNOWN", "2.2.0") <= 0;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"
+then :
+  gl_cv_func_strverscmp_works=yes
+else case e in #(
+  e) gl_cv_func_strverscmp_works=no ;;
+esac
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+
+       ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strverscmp_works" >&5
+printf "%s\n" "$gl_cv_func_strverscmp_works" >&6; }
+    case "$gl_cv_func_strverscmp_works" in
+      *yes) ;;
+      *) REPLACE_STRVERSCMP=1 ;;
+    esac
   fi
 
 
-     if test $HAVE_STRVERSCMP = 0; then
+     if test $HAVE_STRVERSCMP = 0 || test $REPLACE_STRVERSCMP = 1; then
   GL_COND_OBJ_STRVERSCMP_TRUE=
   GL_COND_OBJ_STRVERSCMP_FALSE='#'
 else
@@ -25793,20 +27446,19 @@
 if test ${ac_cv_c_vararrays+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC_NO_VLA__
-	defined
+	#ifndef __STDC_NO_VLA__
+	#error __STDC_NO_VLA__ not defined
 	#endif
 
 _ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "defined" >/dev/null 2>&1
+if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_c_vararrays='no: __STDC_NO_VLA__ is defined'
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Test for VLA support.  This test is partly inspired
 		  from examples in the C standard.  Use at least two VLA
@@ -25849,13 +27501,15 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   ac_cv_c_vararrays=yes
-else $as_nop
-  ac_cv_c_vararrays=no
+else case e in #(
+  e) ac_cv_c_vararrays=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-rm -rf conftest*
-
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_vararrays" >&5
 printf "%s\n" "$ac_cv_c_vararrays" >&6; }
@@ -26000,6 +27654,10 @@
 
 
 
+  GL_UNISTRING_GNULIB_GETPROGNAME=0
+
+
+
   GL_UNISTRING_GNULIB_GETSUBOPT=0
 
 
@@ -26016,6 +27674,10 @@
 
 
 
+  GL_UNISTRING_GNULIB_MBSTOWCS=0
+
+
+
   GL_UNISTRING_GNULIB_MBTOWC=0
 
 
@@ -26064,6 +27726,10 @@
 
 
 
+  GL_UNISTRING_GNULIB_RAND=0
+
+
+
   GL_UNISTRING_GNULIB_RANDOM=0
 
 
@@ -26171,10 +27837,10 @@
   else
     acl_final_exec_prefix="$exec_prefix"
   fi
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
   eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
+  prefix="$acl_saved_prefix"
 
 
 
@@ -26182,8 +27848,9 @@
 if test ${with_gnu_ld+y}
 then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else $as_nop
-  with_gnu_ld=no
+else case e in #(
+  e) with_gnu_ld=no ;;
+esac
 fi
 
 # Prepare PATH_SEPARATOR.
@@ -26219,14 +27886,14 @@
   if test ${acl_cv_path_LD+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
     acl_cv_path_LD= # Final result of this test
     ac_prog=ld # Program to search in $PATH
     if test "$GCC" = yes; then
       # Check if gcc -print-prog-name=ld gives a path.
       case $host in
-        *-*-mingw*)
+        *-*-mingw* | windows*)
           # gcc leaves a trailing carriage return which upsets mingw
           acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
         *)
@@ -26256,9 +27923,9 @@
     fi
     if test -n "$ac_prog"; then
       # Search for $ac_prog in $PATH.
-      acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+      acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
       for ac_dir in $PATH; do
-        IFS="$acl_save_ifs"
+        IFS="$acl_saved_IFS"
         test -z "$ac_dir" && ac_dir=.
         if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
           acl_cv_path_LD="$ac_dir/$ac_prog"
@@ -26275,7 +27942,7 @@
           esac
         fi
       done
-      IFS="$acl_save_ifs"
+      IFS="$acl_saved_IFS"
     fi
     case $host in
       *-*-aix*)
@@ -26313,19 +27980,21 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
 
-else $as_nop
-  # The compiler produces 32-bit code. Add option '-m elf32_sparc'
+else case e in #(
+  e) # The compiler produces 32-bit code. Add option '-m elf32_sparc'
            # so that the linker groks 32-bit object files.
            case "$acl_cv_path_LD " in
              *" -m elf32_sparc "*) ;;
              *) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;;
            esac
-
+           ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
         ;;
     esac
-
+   ;;
+esac
 fi
 
   LD="$acl_cv_path_LD"
@@ -26343,8 +28012,8 @@
 if test ${acl_cv_prog_gnu_ld+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+else case e in #(
+  e) # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   acl_cv_prog_gnu_ld=yes
@@ -26352,6 +28021,7 @@
 *)
   acl_cv_prog_gnu_ld=no
   ;;
+esac ;;
 esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
@@ -26367,14 +28037,15 @@
 if test ${acl_cv_rpath+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
     CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
     ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
     . ./conftest.sh
     rm -f ./conftest.sh
     acl_cv_rpath=done
-
+   ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
 printf "%s\n" "$acl_cv_rpath" >&6; }
@@ -26391,8 +28062,9 @@
 if test ${enable_rpath+y}
 then :
   enableval=$enable_rpath; :
-else $as_nop
-  enable_rpath=yes
+else case e in #(
+  e) enable_rpath=yes ;;
+esac
 fi
 
 
@@ -26403,12 +28075,12 @@
 if test ${gl_cv_host_cpu_c_abi_32bit+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$gl_cv_host_cpu_c_abi"; then
-       case "$gl_cv_host_cpu_c_abi" in
+else case e in #(
+  e) if test -n "$gl_cv_host_cpu_c_abi"; then
+              case "$gl_cv_host_cpu_c_abi" in
          i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
            gl_cv_host_cpu_c_abi_32bit=yes ;;
-         x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 )
+         x86_64 | alpha | arm64 | aarch64c | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 )
            gl_cv_host_cpu_c_abi_32bit=no ;;
          *)
            gl_cv_host_cpu_c_abi_32bit=unknown ;;
@@ -26468,13 +28140,14 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_host_cpu_c_abi_32bit=no
-else $as_nop
-  gl_cv_host_cpu_c_abi_32bit=yes
+else case e in #(
+  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            ;;
 
-         arm* | aarch64 )
+         arm* | aarch64 | aarch64c )
            # Assume arm with EABI.
            # On arm64 systems, the C compiler may be generating code in one of
            # these ABIs:
@@ -26493,8 +28166,9 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_host_cpu_c_abi_32bit=no
-else $as_nop
-  gl_cv_host_cpu_c_abi_32bit=yes
+else case e in #(
+  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            ;;
@@ -26514,8 +28188,9 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_host_cpu_c_abi_32bit=no
-else $as_nop
-  gl_cv_host_cpu_c_abi_32bit=yes
+else case e in #(
+  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            ;;
@@ -26535,8 +28210,9 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_host_cpu_c_abi_32bit=yes
-else $as_nop
-  gl_cv_host_cpu_c_abi_32bit=no
+else case e in #(
+  e) gl_cv_host_cpu_c_abi_32bit=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            ;;
@@ -26556,8 +28232,9 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_host_cpu_c_abi_32bit=no
-else $as_nop
-  gl_cv_host_cpu_c_abi_32bit=yes
+else case e in #(
+  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            ;;
@@ -26581,8 +28258,9 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_host_cpu_c_abi_32bit=no
-else $as_nop
-  gl_cv_host_cpu_c_abi_32bit=yes
+else case e in #(
+  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            ;;
@@ -26606,8 +28284,9 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_host_cpu_c_abi_32bit=no
-else $as_nop
-  gl_cv_host_cpu_c_abi_32bit=yes
+else case e in #(
+  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            ;;
@@ -26627,8 +28306,9 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_host_cpu_c_abi_32bit=no
-else $as_nop
-  gl_cv_host_cpu_c_abi_32bit=yes
+else case e in #(
+  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            ;;
@@ -26648,8 +28328,9 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_host_cpu_c_abi_32bit=no
-else $as_nop
-  gl_cv_host_cpu_c_abi_32bit=yes
+else case e in #(
+  e) gl_cv_host_cpu_c_abi_32bit=yes ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            ;;
@@ -26659,7 +28340,8 @@
            ;;
        esac
      fi
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5
 printf "%s\n" "$gl_cv_host_cpu_c_abi_32bit" >&6; }
@@ -26675,8 +28357,8 @@
 if test ${gl_cv_elf+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #if defined __ELF__ || (defined __linux__ && defined __EDG__)
         Extensible Linking Format
@@ -26684,15 +28366,17 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Extensible Linking Format" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "Extensible Linking Format" >/dev/null 2>&1
 then :
   gl_cv_elf=yes
-else $as_nop
-  gl_cv_elf=no
+else case e in #(
+  e) gl_cv_elf=no ;;
+esac
 fi
 rm -rf conftest*
 
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5
 printf "%s\n" "$gl_cv_elf" >&6; }
@@ -26751,8 +28435,8 @@
 if test ${acl_cv_libdirstems+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-            acl_libdirstem=lib
+else case e in #(
+  e)           acl_libdirstem=lib
      acl_libdirstem2=
      acl_libdirstem3=
      case "$host_os" in
@@ -26781,7 +28465,7 @@
            fi
          fi
          if test -n "$searchpath"; then
-           acl_save_IFS="${IFS= 	}"; IFS=":"
+           acl_saved_IFS="${IFS= 	}"; IFS=":"
            for searchdir in $searchpath; do
              if test -d "$searchdir"; then
                case "$searchdir" in
@@ -26798,7 +28482,7 @@
                esac
              fi
            done
-           IFS="$acl_save_IFS"
+           IFS="$acl_saved_IFS"
            if test $HOST_CPU_C_ABI_32BIT = yes; then
              # 32-bit ABI.
              acl_libdirstem3=
@@ -26813,7 +28497,8 @@
      test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
      test -n "$acl_libdirstem3" || acl_libdirstem3="$acl_libdirstem"
      acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2,$acl_libdirstem3"
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5
 printf "%s\n" "$acl_cv_libdirstems" >&6; }
@@ -26833,9 +28518,9 @@
 
     use_additional=yes
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
 
     eval additional_includedir=\"$includedir\"
@@ -26843,8 +28528,8 @@
     eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
     eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
 
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
 
 # Check whether --with-libiconv-prefix was given.
@@ -26856,9 +28541,9 @@
     else
       if test "X$withval" = "X"; then
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
 
           eval additional_includedir=\"$includedir\"
@@ -26866,8 +28551,8 @@
           eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
           eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
 
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       else
         additional_includedir="$withval/include"
@@ -26979,13 +28664,13 @@
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBICONV; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
               case "$x" in
                 -L*)
@@ -27073,13 +28758,13 @@
                                                                                 haveit=
                     for x in $LDFLAGS $LIBICONV; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                       if test "X$x" = "X-L$found_dir"; then
                         haveit=yes
@@ -27141,13 +28826,13 @@
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCICONV; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                     if test "X$x" = "X-I$additional_includedir"; then
                       haveit=yes
@@ -27163,12 +28848,12 @@
               fi
             fi
                         if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
+                                                        saved_libdir="$libdir"
               case "$found_la" in
                 */* | *\\*) . "$found_la" ;;
                 *) . "./$found_la" ;;
               esac
-              libdir="$save_libdir"
+              libdir="$saved_libdir"
                             for dep in $dependency_libs; do
                 case "$dep" in
                   -L*)
@@ -27190,13 +28875,13 @@
                         haveit=
                         for x in $LDFLAGS $LIBICONV; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -27211,13 +28896,13 @@
                         haveit=
                         for x in $LDFLAGS $LTLIBICONV; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -27291,17 +28976,17 @@
       for found_dir in $rpathdirs; do
         alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
-            acl_save_libdir="$libdir"
+            acl_saved_libdir="$libdir"
       libdir="$alldirs"
       eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
+      libdir="$acl_saved_libdir"
       LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
     else
             for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
+        acl_saved_libdir="$libdir"
         libdir="$found_dir"
         eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
+        libdir="$acl_saved_libdir"
         LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
       done
     fi
@@ -27334,19 +29019,19 @@
 
 
 
-          am_save_CPPFLAGS="$CPPFLAGS"
+          gl_saved_CPPFLAGS="$CPPFLAGS"
 
   for element in $INCICONV; do
     haveit=
     for x in $CPPFLAGS; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       if test "X$x" = "X$element"; then
         haveit=yes
@@ -27364,8 +29049,8 @@
 if test ${am_cv_func_iconv+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27391,7 +29076,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
+      gl_saved_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -27416,9 +29101,10 @@
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
     fi
-
+   ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
 printf "%s\n" "$am_cv_func_iconv" >&6; }
@@ -27428,9 +29114,9 @@
 if test ${am_cv_func_iconv_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
-                  am_save_LIBS="$LIBS"
+else case e in #(
+  e)
+                  gl_saved_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
@@ -27442,8 +29128,8 @@
              aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
              *)            am_cv_func_iconv_works="guessing yes" ;;
            esac
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <iconv.h>
@@ -27572,13 +29258,15 @@
   am_cv_func_iconv_works=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
         test "$am_cv_func_iconv_works" = no || break
       done
-      LIBS="$am_save_LIBS"
-
+      LIBS="$gl_saved_LIBS"
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
 printf "%s\n" "$am_cv_func_iconv_works" >&6; }
@@ -27600,7 +29288,7 @@
     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
 printf "%s\n" "$LIBICONV" >&6; }
   else
-            CPPFLAGS="$am_save_CPPFLAGS"
+            CPPFLAGS="$gl_saved_CPPFLAGS"
     LIBICONV=
     LTLIBICONV=
   fi
@@ -27613,8 +29301,8 @@
 if test ${gl_cv_iconv_nonconst+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdlib.h>
@@ -27636,11 +29324,13 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_iconv_nonconst=yes
-else $as_nop
-  gl_cv_iconv_nonconst=no
+else case e in #(
+  e) gl_cv_iconv_nonconst=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+       ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_iconv_nonconst" >&5
 printf "%s\n" "$gl_cv_iconv_nonconst" >&6; }
@@ -27702,8 +29392,8 @@
 if test ${gl_cv_next_iconv_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_iconv_h = yes; then
 
 
@@ -27719,7 +29409,7 @@
   esac
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
                                           gl_dirsep_regex='/\\'
       ;;
     *)
@@ -27745,7 +29435,8 @@
                gl_cv_next_iconv_h='<'iconv.h'>'
              fi
 
-
+          ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_iconv_h" >&5
 printf "%s\n" "$gl_cv_next_iconv_h" >&6; }
@@ -27777,6 +29468,10 @@
   HAVE_DECL_STRTOIMAX=1;
   HAVE_DECL_STRTOUMAX=1;
   HAVE_IMAXDIV_T=1;
+  HAVE_IMAXABS=1;
+  HAVE_IMAXDIV=1;
+  REPLACE_IMAXABS=0;
+  REPLACE_IMAXDIV=0;
   REPLACE_STRTOIMAX=0;
   REPLACE_STRTOUMAX=0;
   INT32_MAX_LT_INTMAX_MAX=1;
@@ -27807,8 +29502,8 @@
 if test ${gl_cv_next_inttypes_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_inttypes_h = yes; then
 
 
@@ -27824,7 +29519,7 @@
   esac
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
                                           gl_dirsep_regex='/\\'
       ;;
     *)
@@ -27850,7 +29545,8 @@
                gl_cv_next_inttypes_h='<'inttypes.h'>'
              fi
 
-
+          ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_inttypes_h" >&5
 printf "%s\n" "$gl_cv_next_inttypes_h" >&6; }
@@ -27909,8 +29605,9 @@
 if test ${with_included_libunistring+y}
 then :
   withval=$with_included_libunistring; gl_libunistring_force_included=$withval
-else $as_nop
-  gl_libunistring_force_included=no
+else case e in #(
+  e) gl_libunistring_force_included=no ;;
+esac
 fi
 
       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_libunistring_force_included" >&5
@@ -27940,9 +29637,9 @@
 
     use_additional=yes
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
 
     eval additional_includedir=\"$includedir\"
@@ -27950,8 +29647,8 @@
     eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
     eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
 
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
 
 # Check whether --with-libunistring-prefix was given.
@@ -27963,9 +29660,9 @@
     else
       if test "X$withval" = "X"; then
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
 
           eval additional_includedir=\"$includedir\"
@@ -27973,8 +29670,8 @@
           eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
           eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
 
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       else
         additional_includedir="$withval/include"
@@ -28086,13 +29783,13 @@
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBUNISTRING; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
               case "$x" in
                 -L*)
@@ -28180,13 +29877,13 @@
                                                                                 haveit=
                     for x in $LDFLAGS $LIBUNISTRING; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                       if test "X$x" = "X-L$found_dir"; then
                         haveit=yes
@@ -28248,13 +29945,13 @@
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCUNISTRING; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                     if test "X$x" = "X-I$additional_includedir"; then
                       haveit=yes
@@ -28270,12 +29967,12 @@
               fi
             fi
                         if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
+                                                        saved_libdir="$libdir"
               case "$found_la" in
                 */* | *\\*) . "$found_la" ;;
                 *) . "./$found_la" ;;
               esac
-              libdir="$save_libdir"
+              libdir="$saved_libdir"
                             for dep in $dependency_libs; do
                 case "$dep" in
                   -L*)
@@ -28297,13 +29994,13 @@
                         haveit=
                         for x in $LDFLAGS $LIBUNISTRING; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -28318,13 +30015,13 @@
                         haveit=
                         for x in $LDFLAGS $LTLIBUNISTRING; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -28398,17 +30095,17 @@
       for found_dir in $rpathdirs; do
         alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
-            acl_save_libdir="$libdir"
+            acl_saved_libdir="$libdir"
       libdir="$alldirs"
       eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
+      libdir="$acl_saved_libdir"
       LIBUNISTRING="${LIBUNISTRING}${LIBUNISTRING:+ }$flag"
     else
             for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
+        acl_saved_libdir="$libdir"
         libdir="$found_dir"
         eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
+        libdir="$acl_saved_libdir"
         LIBUNISTRING="${LIBUNISTRING}${LIBUNISTRING:+ }$flag"
       done
     fi
@@ -28424,19 +30121,19 @@
 
 
 
-        ac_save_CPPFLAGS="$CPPFLAGS"
+        acl_saved_CPPFLAGS="$CPPFLAGS"
 
   for element in $INCUNISTRING; do
     haveit=
     for x in $CPPFLAGS; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       if test "X$x" = "X$element"; then
         haveit=yes
@@ -28454,9 +30151,9 @@
 if test ${ac_cv_libunistring+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
-    ac_save_LIBS="$LIBS"
+else case e in #(
+  e)
+    acl_saved_LIBS="$LIBS"
                                 case " $LIBUNISTRING" in
       *" -l"*) LIBS="$LIBS $LIBUNISTRING" ;;
       *)       LIBS="$LIBUNISTRING $LIBS" ;;
@@ -28475,13 +30172,15 @@
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_libunistring=yes
-else $as_nop
-  ac_cv_libunistring='no, trying again together with libiconv'
+else case e in #(
+  e) ac_cv_libunistring='no, trying again together with libiconv' ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-    LIBS="$ac_save_LIBS"
-
+    LIBS="$acl_saved_LIBS"
+   ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libunistring" >&5
 printf "%s\n" "$ac_cv_libunistring" >&6; }
@@ -28496,7 +30195,7 @@
 printf "%s\n" "$LIBUNISTRING" >&6; }
   else
     HAVE_LIBUNISTRING=no
-            CPPFLAGS="$ac_save_CPPFLAGS"
+            CPPFLAGS="$acl_saved_CPPFLAGS"
     LIBUNISTRING=
     LTLIBUNISTRING=
     LIBUNISTRING_PREFIX=
@@ -28510,7 +30209,7 @@
 
     if test "$ac_cv_libunistring" != yes; then
                         unset ac_cv_libunistring
-      glus_save_LIBS="$LIBS"
+      glus_saved_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
 
 
@@ -28526,9 +30225,9 @@
 
     use_additional=yes
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
 
     eval additional_includedir=\"$includedir\"
@@ -28536,8 +30235,8 @@
     eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
     eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
 
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
 
 # Check whether --with-libunistring-prefix was given.
@@ -28549,9 +30248,9 @@
     else
       if test "X$withval" = "X"; then
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
 
           eval additional_includedir=\"$includedir\"
@@ -28559,8 +30258,8 @@
           eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
           eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
 
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       else
         additional_includedir="$withval/include"
@@ -28672,13 +30371,13 @@
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBUNISTRING; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
               case "$x" in
                 -L*)
@@ -28766,13 +30465,13 @@
                                                                                 haveit=
                     for x in $LDFLAGS $LIBUNISTRING; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                       if test "X$x" = "X-L$found_dir"; then
                         haveit=yes
@@ -28834,13 +30533,13 @@
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCUNISTRING; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                     if test "X$x" = "X-I$additional_includedir"; then
                       haveit=yes
@@ -28856,12 +30555,12 @@
               fi
             fi
                         if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
+                                                        saved_libdir="$libdir"
               case "$found_la" in
                 */* | *\\*) . "$found_la" ;;
                 *) . "./$found_la" ;;
               esac
-              libdir="$save_libdir"
+              libdir="$saved_libdir"
                             for dep in $dependency_libs; do
                 case "$dep" in
                   -L*)
@@ -28883,13 +30582,13 @@
                         haveit=
                         for x in $LDFLAGS $LIBUNISTRING; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -28904,13 +30603,13 @@
                         haveit=
                         for x in $LDFLAGS $LTLIBUNISTRING; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -28984,17 +30683,17 @@
       for found_dir in $rpathdirs; do
         alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
-            acl_save_libdir="$libdir"
+            acl_saved_libdir="$libdir"
       libdir="$alldirs"
       eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
+      libdir="$acl_saved_libdir"
       LIBUNISTRING="${LIBUNISTRING}${LIBUNISTRING:+ }$flag"
     else
             for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
+        acl_saved_libdir="$libdir"
         libdir="$found_dir"
         eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
+        libdir="$acl_saved_libdir"
         LIBUNISTRING="${LIBUNISTRING}${LIBUNISTRING:+ }$flag"
       done
     fi
@@ -29010,19 +30709,19 @@
 
 
 
-        ac_save_CPPFLAGS="$CPPFLAGS"
+        acl_saved_CPPFLAGS="$CPPFLAGS"
 
   for element in $INCUNISTRING; do
     haveit=
     for x in $CPPFLAGS; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       if test "X$x" = "X$element"; then
         haveit=yes
@@ -29040,9 +30739,9 @@
 if test ${ac_cv_libunistring+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
-    ac_save_LIBS="$LIBS"
+else case e in #(
+  e)
+    acl_saved_LIBS="$LIBS"
                                 case " $LIBUNISTRING" in
       *" -l"*) LIBS="$LIBS $LIBUNISTRING" ;;
       *)       LIBS="$LIBUNISTRING $LIBS" ;;
@@ -29061,13 +30760,15 @@
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_libunistring=yes
-else $as_nop
-  ac_cv_libunistring='no, consider installing GNU libunistring'
+else case e in #(
+  e) ac_cv_libunistring='no, consider installing GNU libunistring' ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-    LIBS="$ac_save_LIBS"
-
+    LIBS="$acl_saved_LIBS"
+   ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libunistring" >&5
 printf "%s\n" "$ac_cv_libunistring" >&6; }
@@ -29082,7 +30783,7 @@
 printf "%s\n" "$LIBUNISTRING" >&6; }
   else
     HAVE_LIBUNISTRING=no
-            CPPFLAGS="$ac_save_CPPFLAGS"
+            CPPFLAGS="$acl_saved_CPPFLAGS"
     LIBUNISTRING=
     LTLIBUNISTRING=
     LIBUNISTRING_PREFIX=
@@ -29098,7 +30799,7 @@
         LIBUNISTRING="$LIBUNISTRING $LIBICONV"
         LTLIBUNISTRING="$LTLIBUNISTRING $LTLIBICONV"
       fi
-      LIBS="$glus_save_LIBS"
+      LIBS="$glus_saved_LIBS"
     fi
   else
 
@@ -29115,9 +30816,9 @@
 
     use_additional=yes
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
 
     eval additional_includedir=\"$includedir\"
@@ -29125,8 +30826,8 @@
     eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
     eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
 
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
 
 # Check whether --with-libunistring-prefix was given.
@@ -29138,9 +30839,9 @@
     else
       if test "X$withval" = "X"; then
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
 
           eval additional_includedir=\"$includedir\"
@@ -29148,8 +30849,8 @@
           eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
           eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
 
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       else
         additional_includedir="$withval/include"
@@ -29261,13 +30962,13 @@
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBUNISTRING; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
               case "$x" in
                 -L*)
@@ -29355,13 +31056,13 @@
                                                                                 haveit=
                     for x in $LDFLAGS $LIBUNISTRING; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                       if test "X$x" = "X-L$found_dir"; then
                         haveit=yes
@@ -29423,13 +31124,13 @@
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCUNISTRING; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                     if test "X$x" = "X-I$additional_includedir"; then
                       haveit=yes
@@ -29445,12 +31146,12 @@
               fi
             fi
                         if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
+                                                        saved_libdir="$libdir"
               case "$found_la" in
                 */* | *\\*) . "$found_la" ;;
                 *) . "./$found_la" ;;
               esac
-              libdir="$save_libdir"
+              libdir="$saved_libdir"
                             for dep in $dependency_libs; do
                 case "$dep" in
                   -L*)
@@ -29472,13 +31173,13 @@
                         haveit=
                         for x in $LDFLAGS $LIBUNISTRING; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -29493,13 +31194,13 @@
                         haveit=
                         for x in $LDFLAGS $LTLIBUNISTRING; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -29573,17 +31274,17 @@
       for found_dir in $rpathdirs; do
         alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
-            acl_save_libdir="$libdir"
+            acl_saved_libdir="$libdir"
       libdir="$alldirs"
       eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
+      libdir="$acl_saved_libdir"
       LIBUNISTRING="${LIBUNISTRING}${LIBUNISTRING:+ }$flag"
     else
             for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
+        acl_saved_libdir="$libdir"
         libdir="$found_dir"
         eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
+        libdir="$acl_saved_libdir"
         LIBUNISTRING="${LIBUNISTRING}${LIBUNISTRING:+ }$flag"
       done
     fi
@@ -29599,19 +31300,19 @@
 
 
 
-        ac_save_CPPFLAGS="$CPPFLAGS"
+        acl_saved_CPPFLAGS="$CPPFLAGS"
 
   for element in $INCUNISTRING; do
     haveit=
     for x in $CPPFLAGS; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       if test "X$x" = "X$element"; then
         haveit=yes
@@ -29629,9 +31330,9 @@
 if test ${ac_cv_libunistring+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
-    ac_save_LIBS="$LIBS"
+else case e in #(
+  e)
+    acl_saved_LIBS="$LIBS"
                                 case " $LIBUNISTRING" in
       *" -l"*) LIBS="$LIBS $LIBUNISTRING" ;;
       *)       LIBS="$LIBUNISTRING $LIBS" ;;
@@ -29650,13 +31351,15 @@
 if ac_fn_c_try_link "$LINENO"
 then :
   ac_cv_libunistring=yes
-else $as_nop
-  ac_cv_libunistring='no, consider installing GNU libunistring'
+else case e in #(
+  e) ac_cv_libunistring='no, consider installing GNU libunistring' ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-    LIBS="$ac_save_LIBS"
-
+    LIBS="$acl_saved_LIBS"
+   ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libunistring" >&5
 printf "%s\n" "$ac_cv_libunistring" >&6; }
@@ -29671,7 +31374,7 @@
 printf "%s\n" "$LIBUNISTRING" >&6; }
   else
     HAVE_LIBUNISTRING=no
-            CPPFLAGS="$ac_save_CPPFLAGS"
+            CPPFLAGS="$acl_saved_CPPFLAGS"
     LIBUNISTRING=
     LTLIBUNISTRING=
     LIBUNISTRING_PREFIX=
@@ -29690,8 +31393,8 @@
 if test ${gl_cv_libunistring_version+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if ac_fn_c_compute_int "$LINENO" "_LIBUNISTRING_VERSION" "gl_libunistring_hexversion"        "#include <unistring/version.h>"
+else case e in #(
+  e) if ac_fn_c_compute_int "$LINENO" "_LIBUNISTRING_VERSION" "gl_libunistring_hexversion"        "#include <unistring/version.h>"
 then :
 
 fi
@@ -29711,8 +31414,9 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_libunistring_version092=true
-else $as_nop
-  gl_cv_libunistring_version092=false
+else case e in #(
+  e) gl_cv_libunistring_version092=false ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
          if $gl_cv_libunistring_version092; then
@@ -29728,7 +31432,7 @@
   esac
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
                                           gl_dirsep_regex='/\\'
       ;;
     *)
@@ -29770,8 +31474,9 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_libunistring_version091=true
-else $as_nop
-  gl_cv_libunistring_version091=false
+else case e in #(
+  e) gl_cv_libunistring_version091=false ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
            if $gl_cv_libunistring_version091; then
@@ -29785,7 +31490,8 @@
        gl_libunistring_minor=`expr $gl_libunistring_hexversion / 256 % 256`
        gl_libunistring_subminor=`expr $gl_libunistring_hexversion % 256`
        gl_cv_libunistring_version="$gl_libunistring_major.$gl_libunistring_minor.$gl_libunistring_subminor"
-
+       ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_libunistring_version" >&5
 printf "%s\n" "$gl_cv_libunistring_version" >&6; }
@@ -29801,42 +31507,6 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
-printf %s "checking for nl_langinfo and CODESET... " >&6; }
-if test ${am_cv_langinfo_codeset+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <langinfo.h>
-int
-main (void)
-{
-char* cs = nl_langinfo(CODESET); return !cs;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  am_cv_langinfo_codeset=yes
-else $as_nop
-  am_cv_langinfo_codeset=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
-printf "%s\n" "$am_cv_langinfo_codeset" >&6; }
-  if test $am_cv_langinfo_codeset = yes; then
-
-printf "%s\n" "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
-
-  fi
-
-
 
 
 
@@ -29868,6 +31538,10 @@
 
 
 
+  GL_UNISTRING_GNULIB_MEMSET_EXPLICIT=0
+
+
+
   GL_UNISTRING_GNULIB_RAWMEMCHR=0
 
 
@@ -30043,6 +31717,580 @@
     LIBUNISTRING_VERSION_SUBMINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_subminor"`
   fi
 
+                if test "$HAVE_LIBUNISTRING" = yes; then
+              for ac_header in unistring/woe32dll.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "unistring/woe32dll.h" "ac_cv_header_unistring_woe32dll_h" "$ac_includes_default"
+if test "x$ac_cv_header_unistring_woe32dll_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_UNISTRING_WOE32DLL_H 1" >>confdefs.h
+ HAVE_UNISTRING_WOE32DLL_H=1
+else case e in #(
+  e) HAVE_UNISTRING_WOE32DLL_H=0 ;;
+esac
+fi
+
+done
+     else
+       HAVE_UNISTRING_WOE32DLL_H=0
+     fi
+
+
+
+
+
+
+
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+
+
+
+
+
+
+
+  GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
+  GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE='LIBUNISTRING_DLL_VARIABLE'
+
+
+
 
 
   GL_UNISTRING_GNULIB_ACCESS=0
@@ -30438,7 +32686,12 @@
   REPLACE_WCWIDTH=0;
   REPLACE_WCSWIDTH=0;
   REPLACE_WCSFTIME=0;
+  REPLACE_WCSCMP=0;
+  REPLACE_WCSNCMP=0;
+  REPLACE_WCSSTR=0;
   REPLACE_WCSTOK=0;
+  REPLACE_WMEMCMP=0;
+  REPLACE_WMEMPCPY=0;
 
 
 
@@ -30447,8 +32700,8 @@
 if test ${gl_cv_header_wchar_h_correct_inline+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_cv_header_wchar_h_correct_inline=yes
+else case e in #(
+  e) gl_cv_header_wchar_h_correct_inline=yes
      case "$host_os" in
        *-gnu* | gnu*)
          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -30461,8 +32714,8 @@
              int main () { return zero(); }
 
 _ACEOF
-                                                      save_ac_compile="$ac_compile"
-         ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/`
+                                                      saved_ac_compile="$ac_compile"
+         ac_compile=`echo "$saved_ac_compile" | sed s/conftest/conftest1/`
          if echo '#include "conftest.c"' >conftest1.c \
             && { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -30478,7 +32731,7 @@
                int zero (void) { return 0; }
 
 _ACEOF
-                      ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/`
+                      ac_compile=`echo "$saved_ac_compile" | sed s/conftest/conftest2/`
            if echo '#include "conftest.c"' >conftest2.c \
               && { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
@@ -30492,11 +32745,12 @@
              fi
            fi
          fi
-         ac_compile="$save_ac_compile"
+         ac_compile="$saved_ac_compile"
          rm -f conftest12.c conftest12.$ac_objext conftest$ac_exeext
          ;;
      esac
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_wchar_h_correct_inline" >&5
 printf "%s\n" "$gl_cv_header_wchar_h_correct_inline" >&6; }
@@ -30552,8 +32806,8 @@
 if test ${gl_cv_next_wchar_h+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
              if test $ac_cv_header_wchar_h = yes; then
 
 
@@ -30569,7 +32823,7 @@
   esac
 
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
                                           gl_dirsep_regex='/\\'
       ;;
     *)
@@ -30595,7 +32849,8 @@
                gl_cv_next_wchar_h='<'wchar.h'>'
              fi
 
-
+          ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_wchar_h" >&5
 printf "%s\n" "$gl_cv_next_wchar_h" >&6; }
@@ -30646,8 +32901,9 @@
 if test "x$ac_cv_have_decl_wcsdup" = xyes
 then :
   ac_have_decl=1
-else $as_nop
-  ac_have_decl=0
+else case e in #(
+  e) ac_have_decl=0 ;;
+esac
 fi
 printf "%s\n" "#define HAVE_DECL_WCSDUP $ac_have_decl" >>confdefs.h
 
@@ -30669,6 +32925,10 @@
 
 
 
+  GL_UNISTRING_GNULIB_MBSZERO=0
+
+
+
   GL_UNISTRING_GNULIB_MBRTOWC=0
 
 
@@ -30821,6 +33081,10 @@
 
 
 
+  GL_UNISTRING_GNULIB_WGETCWD=0
+
+
+
   GL_UNISTRING_GNULIB_MDA_WCSDUP=1
 
 
@@ -30859,8 +33123,8 @@
 if test ${gl_cv_func_free_preserves_errno+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
@@ -30881,11 +33145,13 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_func_free_preserves_errno=yes
-else $as_nop
-  gl_cv_func_free_preserves_errno=no
+else case e in #(
+  e) gl_cv_func_free_preserves_errno=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_free_preserves_errno" >&5
 printf "%s\n" "$gl_cv_func_free_preserves_errno" >&6; }
@@ -31015,11 +33281,12 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "gnu_iconv" >/dev/null 2>&1
+  $EGREP_TRADITIONAL "gnu_iconv" >/dev/null 2>&1
 then :
   gl_func_iconv_gnu=yes
-else $as_nop
-  gl_func_iconv_gnu=no
+else case e in #(
+  e) gl_func_iconv_gnu=no ;;
+esac
 fi
 rm -rf conftest*
 
@@ -31120,8 +33387,8 @@
 if test ${gl_cv_c_inline_effective+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test $ac_cv_c_inline = no; then
+else case e in #(
+  e) if test $ac_cv_c_inline = no; then
        gl_cv_c_inline_effective=no
      else
                                           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -31140,12 +33407,14 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_c_inline_effective=yes
-else $as_nop
-  gl_cv_c_inline_effective=no
+else case e in #(
+  e) gl_cv_c_inline_effective=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
      fi
-
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_inline_effective" >&5
 printf "%s\n" "$gl_cv_c_inline_effective" >&6; }
@@ -31213,11 +33482,11 @@
 
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ssize_t" >&5
 printf %s "checking for ssize_t... " >&6; }
-if test ${gt_cv_ssize_t+y}
+if test ${gl_cv_ssize_t+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 int
@@ -31231,17 +33500,55 @@
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
-  gt_cv_ssize_t=yes
-else $as_nop
-  gt_cv_ssize_t=no
+  gl_cv_ssize_t=yes
+else case e in #(
+  e) gl_cv_ssize_t=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_ssize_t" >&5
+printf "%s\n" "$gl_cv_ssize_t" >&6; }
+  if test $gl_cv_ssize_t = no; then
+            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether size_t is wider than 'long'" >&5
+printf %s "checking whether size_t is wider than 'long'... " >&6; }
+if test ${gl_cv_size_t_large+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+              typedef int array 2 * (sizeof (size_t) > sizeof (long)) - 1;
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+  gl_cv_size_t_large=yes
+else case e in #(
+  e) gl_cv_size_t_large=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_ssize_t" >&5
-printf "%s\n" "$gt_cv_ssize_t" >&6; }
-  if test $gt_cv_ssize_t = no; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_size_t_large" >&5
+printf "%s\n" "$gl_cv_size_t_large" >&6; }
+    if test $gl_cv_size_t_large = yes; then
+      gl_def_ssize_t='long long'
+    else
+      gl_def_ssize_t='long'
+    fi
 
-printf "%s\n" "#define ssize_t int" >>confdefs.h
+printf "%s\n" "#define ssize_t $gl_def_ssize_t" >>confdefs.h
 
   fi
 
@@ -31251,8 +33558,8 @@
 if test ${gl_cv_c_bool+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
           #if true == false
@@ -31264,10 +33571,12 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_c_bool=yes
-else $as_nop
-  gl_cv_c_bool=no
+else case e in #(
+  e) gl_cv_c_bool=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_c_bool" >&5
 printf "%s\n" "$gl_cv_c_bool" >&6; }
@@ -31628,11 +33937,11 @@
 
 
 
-            test $LIBUNISTRING_VERSION_MAJOR -lt 0 \
-            || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
-                 && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
-                      || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 11
+            test $LIBUNISTRING_VERSION_MAJOR -lt 1 \
+            || { test $LIBUNISTRING_VERSION_MAJOR -eq 1 \
+                 && { test $LIBUNISTRING_VERSION_MINOR -lt 2 \
+                      || { test $LIBUNISTRING_VERSION_MINOR -eq 2 \
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
                          }
                     }
                }
@@ -31654,6 +33963,12 @@
 
 
 
+
+
+
+
+
+
      if  { test "$HAVE_LIBUNISTRING" != yes \
     || {
 
@@ -31689,6 +34004,12 @@
 
 
 
+
+
+
+
+
+
      if  { test "$HAVE_LIBUNISTRING" != yes \
     || {
 
@@ -31721,39 +34042,9 @@
   fi
 
 
-
-
-
-     if  { test "$HAVE_LIBUNISTRING" != yes \
-    || {
-
-
-
-            test $LIBUNISTRING_VERSION_MAJOR -lt 0 \
-            || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
-                 && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
-                      || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 8
-                         }
-                    }
-               }
-
-
-
-
-       }
-  }; then
-  LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NONE_TRUE=
-  LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NONE_FALSE='#'
-else
-  LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NONE_TRUE='#'
-  LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NONE_FALSE=
-fi
-:
-    if test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NONE_TRUE}" && test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NONE_FALSE}"; then
-    LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NONE_TRUE='#'
-    LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NONE_FALSE='#'
-  fi
+  if test -z "${LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_M_TRUE}"; then
+       GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE=
+     fi
 
 
 
@@ -31940,11 +34231,11 @@
 
 
 
-            test $LIBUNISTRING_VERSION_MAJOR -lt 0 \
-            || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
-                 && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
-                      || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 11
+            test $LIBUNISTRING_VERSION_MAJOR -lt 1 \
+            || { test $LIBUNISTRING_VERSION_MAJOR -eq 1 \
+                 && { test $LIBUNISTRING_VERSION_MINOR -lt 2 \
+                      || { test $LIBUNISTRING_VERSION_MINOR -eq 2 \
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
                          }
                     }
                }
@@ -31966,6 +34257,12 @@
 
 
 
+
+
+
+
+
+
      if  { test "$HAVE_LIBUNISTRING" != yes \
     || {
 
@@ -32037,6 +34334,12 @@
 
 
 
+
+
+
+
+
+
      if  { test "$HAVE_LIBUNISTRING" != yes \
     || {
 
@@ -32069,6 +34372,17 @@
   fi
 
 
+  if test -z "${LIBUNISTRING_COMPILE_UNINORM_NFC_TRUE}"; then
+       GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE=
+     fi
+
+
+
+
+
+
+
+
 
 
 
@@ -32104,6 +34418,11 @@
   fi
 
 
+  if test -z "${LIBUNISTRING_COMPILE_UNINORM_NFD_TRUE}"; then
+       GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE=
+     fi
+
+
 
 
 printf "%s\n" "#define GNULIB_TEST_UNINORM_U32_NORMALIZE 1" >>confdefs.h
@@ -32158,11 +34477,11 @@
 
 
 
-            test $LIBUNISTRING_VERSION_MAJOR -lt 0 \
-            || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
-                 && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
-                      || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 11
+            test $LIBUNISTRING_VERSION_MAJOR -lt 1 \
+            || { test $LIBUNISTRING_VERSION_MAJOR -eq 1 \
+                 && { test $LIBUNISTRING_VERSION_MINOR -lt 2 \
+                      || { test $LIBUNISTRING_VERSION_MINOR -eq 2 \
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
                          }
                     }
                }
@@ -32519,11 +34838,11 @@
 
 
 
-            test $LIBUNISTRING_VERSION_MAJOR -lt 0 \
-            || { test $LIBUNISTRING_VERSION_MAJOR -eq 0 \
-                 && { test $LIBUNISTRING_VERSION_MINOR -lt 9 \
-                      || { test $LIBUNISTRING_VERSION_MINOR -eq 9 \
-                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 4
+            test $LIBUNISTRING_VERSION_MAJOR -lt 1 \
+            || { test $LIBUNISTRING_VERSION_MAJOR -eq 1 \
+                 && { test $LIBUNISTRING_VERSION_MINOR -lt 2 \
+                      || { test $LIBUNISTRING_VERSION_MINOR -eq 2 \
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt 0
                          }
                     }
                }
@@ -32918,8 +35237,8 @@
 if test ${ac_cv_path_PKG_CONFIG+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $PKG_CONFIG in
+else case e in #(
+  e) case $PKG_CONFIG in
   \\/* | ?:\\/*)
   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
   ;;
@@ -32944,6 +35263,7 @@
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
@@ -32966,8 +35286,8 @@
 if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $ac_pt_PKG_CONFIG in
+else case e in #(
+  e) case $ac_pt_PKG_CONFIG in
   \\/* | ?:\\/*)
   ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
   ;;
@@ -32992,6 +35312,7 @@
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
@@ -33068,8 +35389,8 @@
 if test ${ac_cv_prog_GTKDOC_CHECK+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$GTKDOC_CHECK"; then
+else case e in #(
+  e) if test -n "$GTKDOC_CHECK"; then
   ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -33091,7 +35412,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK
 if test -n "$GTKDOC_CHECK"; then
@@ -33110,8 +35432,8 @@
 if test ${ac_cv_path_GTKDOC_CHECK_PATH+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $GTKDOC_CHECK_PATH in
+else case e in #(
+  e) case $GTKDOC_CHECK_PATH in
   \\/* | ?:\\/*)
   ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path.
   ;;
@@ -33136,6 +35458,7 @@
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH
@@ -33157,8 +35480,8 @@
 if test ${ac_cv_path_GTKDOC_REBASE+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $GTKDOC_REBASE in
+else case e in #(
+  e) case $GTKDOC_REBASE in
   \\/* | ?:\\/*)
   ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path.
   ;;
@@ -33183,6 +35506,7 @@
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
@@ -33206,8 +35530,8 @@
 if test ${ac_cv_path_GTKDOC_MKPDF+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $GTKDOC_MKPDF in
+else case e in #(
+  e) case $GTKDOC_MKPDF in
   \\/* | ?:\\/*)
   ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path.
   ;;
@@ -33232,6 +35556,7 @@
 IFS=$as_save_IFS
 
   ;;
+esac ;;
 esac
 fi
 GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
@@ -33250,8 +35575,9 @@
 if test ${with_html_dir+y}
 then :
   withval=$with_html_dir;
-else $as_nop
-  with_html_dir='${datadir}/gtk-doc/html'
+else case e in #(
+  e) with_html_dir='${datadir}/gtk-doc/html' ;;
+esac
 fi
 
   HTML_DIR="$with_html_dir"
@@ -33261,8 +35587,9 @@
 if test ${enable_gtk_doc+y}
 then :
   enableval=$enable_gtk_doc;
-else $as_nop
-  enable_gtk_doc=no
+else case e in #(
+  e) enable_gtk_doc=no ;;
+esac
 fi
 
 
@@ -33356,16 +35683,18 @@
 if test ${enable_gtk_doc_html+y}
 then :
   enableval=$enable_gtk_doc_html;
-else $as_nop
-  enable_gtk_doc_html=yes
+else case e in #(
+  e) enable_gtk_doc_html=yes ;;
+esac
 fi
 
     # Check whether --enable-gtk-doc-pdf was given.
 if test ${enable_gtk_doc_pdf+y}
 then :
   enableval=$enable_gtk_doc_pdf;
-else $as_nop
-  enable_gtk_doc_pdf=no
+else case e in #(
+  e) enable_gtk_doc_pdf=no ;;
+esac
 fi
 
 
@@ -33447,8 +35776,9 @@
 if test ${enable_nls+y}
 then :
   enableval=$enable_nls; USE_NLS=$enableval
-else $as_nop
-  USE_NLS=yes
+else case e in #(
+  e) USE_NLS=yes ;;
+esac
 fi
 
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
@@ -33496,8 +35826,8 @@
 if test ${ac_cv_path_MSGFMT+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case "$MSGFMT" in
+else case e in #(
+  e) case "$MSGFMT" in
   \\/* | ?:\\/*)
     ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
     ;;
@@ -33520,6 +35850,7 @@
     IFS="$ac_save_IFS"
   test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
     ;;
+esac ;;
 esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
@@ -33538,8 +35869,8 @@
 if test ${ac_cv_path_GMSGFMT+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case $GMSGFMT in
+else case e in #(
+  e) case $GMSGFMT in
   \\/* | ?:\\/*)
   ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
   ;;
@@ -33565,6 +35896,7 @@
 
   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
   ;;
+esac ;;
 esac
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
@@ -33624,8 +35956,8 @@
 if test ${ac_cv_path_XGETTEXT+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case "$XGETTEXT" in
+else case e in #(
+  e) case "$XGETTEXT" in
   \\/* | ?:\\/*)
     ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
     ;;
@@ -33648,6 +35980,7 @@
     IFS="$ac_save_IFS"
   test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
     ;;
+esac ;;
 esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
@@ -33702,8 +36035,8 @@
 if test ${ac_cv_path_MSGMERGE+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  case "$MSGMERGE" in
+else case e in #(
+  e) case "$MSGMERGE" in
   \\/* | ?:\\/*)
     ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
     ;;
@@ -33725,6 +36058,7 @@
     IFS="$ac_save_IFS"
   test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
     ;;
+esac ;;
 esac
 fi
 MSGMERGE="$ac_cv_path_MSGMERGE"
@@ -33775,8 +36109,8 @@
 if test ${gt_cv_func_CFPreferencesCopyAppValue+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gt_save_LIBS="$LIBS"
+else case e in #(
+  e) gt_save_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -33792,12 +36126,14 @@
 if ac_fn_c_try_link "$LINENO"
 then :
   gt_cv_func_CFPreferencesCopyAppValue=yes
-else $as_nop
-  gt_cv_func_CFPreferencesCopyAppValue=no
+else case e in #(
+  e) gt_cv_func_CFPreferencesCopyAppValue=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-     LIBS="$gt_save_LIBS"
+     LIBS="$gt_save_LIBS" ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
 printf "%s\n" "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
@@ -33811,8 +36147,8 @@
 if test ${gt_cv_func_CFLocaleCopyCurrent+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gt_save_LIBS="$LIBS"
+else case e in #(
+  e) gt_save_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -33828,12 +36164,14 @@
 if ac_fn_c_try_link "$LINENO"
 then :
   gt_cv_func_CFLocaleCopyCurrent=yes
-else $as_nop
-  gt_cv_func_CFLocaleCopyCurrent=no
+else case e in #(
+  e) gt_cv_func_CFLocaleCopyCurrent=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-     LIBS="$gt_save_LIBS"
+     LIBS="$gt_save_LIBS" ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
 printf "%s\n" "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
@@ -33889,21 +36227,26 @@
 if eval test \${$gt_func_gnugettext_libc+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 
 int
 main (void)
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
   ;
   return 0;
@@ -33912,11 +36255,13 @@
 if ac_fn_c_try_link "$LINENO"
 then :
   eval "$gt_func_gnugettext_libc=yes"
-else $as_nop
-  eval "$gt_func_gnugettext_libc=no"
+else case e in #(
+  e) eval "$gt_func_gnugettext_libc=no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
+    conftest$ac_exeext conftest.$ac_ext ;;
+esac
 fi
 eval ac_res=\$$gt_func_gnugettext_libc
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -33928,19 +36273,19 @@
 
 
 
-          am_save_CPPFLAGS="$CPPFLAGS"
+          gl_saved_CPPFLAGS="$CPPFLAGS"
 
   for element in $INCICONV; do
     haveit=
     for x in $CPPFLAGS; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       if test "X$x" = "X$element"; then
         haveit=yes
@@ -33958,8 +36303,8 @@
 if test ${am_cv_func_iconv+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
+else case e in #(
+  e)
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -33985,7 +36330,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
+      gl_saved_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -34010,9 +36355,10 @@
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
     fi
-
+   ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
 printf "%s\n" "$am_cv_func_iconv" >&6; }
@@ -34022,9 +36368,9 @@
 if test ${am_cv_func_iconv_works+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
-                  am_save_LIBS="$LIBS"
+else case e in #(
+  e)
+                  gl_saved_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
@@ -34036,8 +36382,8 @@
              aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
              *)            am_cv_func_iconv_works="guessing yes" ;;
            esac
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <iconv.h>
@@ -34166,13 +36512,15 @@
   am_cv_func_iconv_works=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
         test "$am_cv_func_iconv_works" = no || break
       done
-      LIBS="$am_save_LIBS"
-
+      LIBS="$gl_saved_LIBS"
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
 printf "%s\n" "$am_cv_func_iconv_works" >&6; }
@@ -34194,7 +36542,7 @@
     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
 printf "%s\n" "$LIBICONV" >&6; }
   else
-            CPPFLAGS="$am_save_CPPFLAGS"
+            CPPFLAGS="$gl_saved_CPPFLAGS"
     LIBICONV=
     LTLIBICONV=
   fi
@@ -34210,9 +36558,9 @@
 
     use_additional=yes
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
 
     eval additional_includedir=\"$includedir\"
@@ -34220,8 +36568,8 @@
     eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
     eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
 
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
 
 # Check whether --with-libintl-prefix was given.
@@ -34233,9 +36581,9 @@
     else
       if test "X$withval" = "X"; then
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
 
           eval additional_includedir=\"$includedir\"
@@ -34243,8 +36591,8 @@
           eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
           eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
 
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       else
         additional_includedir="$withval/include"
@@ -34356,13 +36704,13 @@
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBINTL; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
               case "$x" in
                 -L*)
@@ -34450,13 +36798,13 @@
                                                                                 haveit=
                     for x in $LDFLAGS $LIBINTL; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                       if test "X$x" = "X-L$found_dir"; then
                         haveit=yes
@@ -34518,13 +36866,13 @@
                 if test -z "$haveit"; then
                   for x in $CPPFLAGS $INCINTL; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                     if test "X$x" = "X-I$additional_includedir"; then
                       haveit=yes
@@ -34540,12 +36888,12 @@
               fi
             fi
                         if test -n "$found_la"; then
-                                                        save_libdir="$libdir"
+                                                        saved_libdir="$libdir"
               case "$found_la" in
                 */* | *\\*) . "$found_la" ;;
                 *) . "./$found_la" ;;
               esac
-              libdir="$save_libdir"
+              libdir="$saved_libdir"
                             for dep in $dependency_libs; do
                 case "$dep" in
                   -L*)
@@ -34567,13 +36915,13 @@
                         haveit=
                         for x in $LDFLAGS $LIBINTL; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -34588,13 +36936,13 @@
                         haveit=
                         for x in $LDFLAGS $LTLIBINTL; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
                           if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
@@ -34668,17 +37016,17 @@
       for found_dir in $rpathdirs; do
         alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
-            acl_save_libdir="$libdir"
+            acl_saved_libdir="$libdir"
       libdir="$alldirs"
       eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
+      libdir="$acl_saved_libdir"
       LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
     else
             for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
+        acl_saved_libdir="$libdir"
         libdir="$found_dir"
         eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
+        libdir="$acl_saved_libdir"
         LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
       done
     fi
@@ -34698,8 +37046,8 @@
 if eval test \${$gt_func_gnugettext_libintl+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gt_save_CPPFLAGS="$CPPFLAGS"
+else case e in #(
+  e) gt_save_CPPFLAGS="$CPPFLAGS"
             CPPFLAGS="$CPPFLAGS $INCINTL"
             gt_save_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
@@ -34707,20 +37055,25 @@
 /* end confdefs.h.  */
 
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 
 int
 main (void)
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
   ;
   return 0;
@@ -34729,8 +37082,9 @@
 if ac_fn_c_try_link "$LINENO"
 then :
   eval "$gt_func_gnugettext_libintl=yes"
-else $as_nop
-  eval "$gt_func_gnugettext_libintl=no"
+else case e in #(
+  e) eval "$gt_func_gnugettext_libintl=no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
@@ -34740,20 +37094,25 @@
 /* end confdefs.h.  */
 
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 
 int
 main (void)
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
   ;
   return 0;
@@ -34770,7 +37129,8 @@
     conftest$ac_exeext conftest.$ac_ext
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"
+            LIBS="$gt_save_LIBS" ;;
+esac
 fi
 eval ac_res=\$$gt_func_gnugettext_libintl
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -34841,13 +37201,13 @@
     haveit=
     for x in $CPPFLAGS; do
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   eval x=\"$x\"
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 
       if test "X$x" = "X$element"; then
         haveit=yes
@@ -34903,8 +37263,9 @@
 if test ${with_gcov+y}
 then :
   withval=$with_gcov; _AX_CODE_COVERAGE_GCOV_PROG_WITH=$with_gcov
-else $as_nop
-  _AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov
+else case e in #(
+  e) _AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov ;;
+esac
 fi
 
 
@@ -34914,8 +37275,9 @@
 if test ${enable_code_coverage+y}
 then :
   enableval=$enable_code_coverage;
-else $as_nop
-  enable_code_coverage=no
+else case e in #(
+  e) enable_code_coverage=no ;;
+esac
 fi
 
 
@@ -34945,8 +37307,8 @@
 if test ${ac_cv_prog_AWK+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$AWK"; then
+else case e in #(
+  e) if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -34968,7 +37330,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
@@ -34988,8 +37351,8 @@
 if test ${_cv_gnu_make_command+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-      _cv_gnu_make_command="" ;
+else case e in #(
+  e)     _cv_gnu_make_command="" ;
     for a in "$MAKE" make gmake gnumake ; do
       if test -z "$a" ; then continue ; fi ;
       if "$a" --version 2> /dev/null | grep GNU 2>&1 > /dev/null ; then
@@ -34998,27 +37361,31 @@
         ax_check_gnu_make_version=$(echo ${AX_CHECK_GNU_MAKE_HEADLINE} | ${AWK} -F " " '{ print $(NF); }')
         break ;
       fi
-    done ;
+    done ; ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $_cv_gnu_make_command" >&5
 printf "%s\n" "$_cv_gnu_make_command" >&6; }
   if test "x$_cv_gnu_make_command" = x""
 then :
   ifGNUmake="#"
-else $as_nop
-  ifGNUmake=""
+else case e in #(
+  e) ifGNUmake="" ;;
+esac
 fi
   if test "x$_cv_gnu_make_command" = x""
 then :
   ifnGNUmake=""
-else $as_nop
-  ifnGNUmake="#"
+else case e in #(
+  e) ifnGNUmake="#" ;;
+esac
 fi
   if test "x$_cv_gnu_make_command" = x""
 then :
   { ax_cv_gnu_make_command=; unset ax_cv_gnu_make_command;}
-else $as_nop
-  ax_cv_gnu_make_command=${_cv_gnu_make_command}
+else case e in #(
+  e) ax_cv_gnu_make_command=${_cv_gnu_make_command} ;;
+esac
 fi
   if test "x$_cv_gnu_make_command" = x""
 then :
@@ -35037,8 +37404,8 @@
 if test ${ac_cv_prog_GCOV+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$GCOV"; then
+else case e in #(
+  e) if test -n "$GCOV"; then
   ac_cv_prog_GCOV="$GCOV" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -35060,7 +37427,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 GCOV=$ac_cv_prog_GCOV
 if test -n "$GCOV"; then
@@ -35082,8 +37450,8 @@
 if test ${ac_cv_prog_ac_ct_GCOV+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$ac_ct_GCOV"; then
+else case e in #(
+  e) if test -n "$ac_ct_GCOV"; then
   ac_cv_prog_ac_ct_GCOV="$ac_ct_GCOV" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -35105,7 +37473,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_GCOV=$ac_cv_prog_ac_ct_GCOV
 if test -n "$ac_ct_GCOV"; then
@@ -35151,8 +37520,8 @@
 if test ${ac_cv_prog_LCOV+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$LCOV"; then
+else case e in #(
+  e) if test -n "$LCOV"; then
   ac_cv_prog_LCOV="$LCOV" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -35174,7 +37543,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 LCOV=$ac_cv_prog_LCOV
 if test -n "$LCOV"; then
@@ -35193,8 +37563,8 @@
 if test ${ac_cv_prog_GENHTML+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  if test -n "$GENHTML"; then
+else case e in #(
+  e) if test -n "$GENHTML"; then
   ac_cv_prog_GENHTML="$GENHTML" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -35216,7 +37586,8 @@
   done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 GENHTML=$ac_cv_prog_GENHTML
 if test -n "$GENHTML"; then
@@ -35270,18 +37641,11 @@
 # Check whether --enable-gcc-warnings was given.
 if test ${enable_gcc_warnings+y}
 then :
-  enableval=$enable_gcc_warnings; case $enableval in
-     yes|no) ;;
-     *)      as_fn_error $? "bad value $enableval for gcc-warnings option" "$LINENO" 5 ;;
-   esac
-   gl_gcc_warnings=$enableval
-else $as_nop
-  gl_gcc_warnings=yes
-
+  enableval=$enable_gcc_warnings;
 fi
 
 
-if test "$gl_gcc_warnings" = yes; then
+# https://www.gnu.org/software/gnulib//manual/html_node/manywarnings.html
 
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -35290,18 +37654,89 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror -Wunknown-warning-option" >&5
+printf %s "checking whether C compiler handles -Werror -Wunknown-warning-option... " >&6; }
+if test ${gl_cv_warn_c__Werror__Wunknown_warning_option+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e)
+  gl_saved_compiler_FLAGS="$CFLAGS"
+  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Werror -Wunknown-warning-option"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  gl_cv_warn_c__Werror__Wunknown_warning_option=yes
+else case e in #(
+  e) gl_cv_warn_c__Werror__Wunknown_warning_option=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+  CFLAGS="$gl_saved_compiler_FLAGS"
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Werror__Wunknown_warning_option" >&5
+printf "%s\n" "$gl_cv_warn_c__Werror__Wunknown_warning_option" >&6; }
+if test "x$gl_cv_warn_c__Werror__Wunknown_warning_option" = xyes
+then :
+  gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror'
+else case e in #(
+  e) gl_unknown_warnings_are_errors= ;;
+esac
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test -n "$GCC"; then
 
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -Wno-missing-field-initializers is supported" >&5
-printf %s "checking whether -Wno-missing-field-initializers is supported... " >&6; }
-if test ${gl_cv_cc_nomfi_supported+y}
+if test "$enable_gcc_warnings" != no
+then :
+
+   # Set up the list of unwanted warning options.
+   nw=
+   if test "$enable_gcc_warnings" = yes; then
+     nw="$nw -fanalyzer"
+   fi
+   nw="$nw -Wbad-function-cast" # Casting a function's result is not more
+                                # dangerous than casting any other value.
+   nw="$nw -Winline"            # It's OK to not inline.
+   nw="$nw -Wsign-compare"      # Too many false alarms.
+   nw="$nw -Wstrict-overflow"   # It's OK to optimize strictly.
+   nw="$nw -Wsystem-headers"    # Don't warn in system headers.
+
+   # https://github.com/pi-hole/FTL/pull/1428
+   nw="$nw -Wsuggest-attribute=pure"
+   nw="$nw -Wsuggest-attribute=const"
+
+
+   if test "$enable_gcc_warnings" = error; then
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror" >&5
+printf %s "checking whether C compiler handles -Werror... " >&6; }
+if test ${gl_cv_warn_c__Werror+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_save_CFLAGS="$CFLAGS"
-       CFLAGS="$CFLAGS -Wextra -Werror -Wno-missing-field-initializers"
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e)
+  gl_saved_compiler_FLAGS="$CFLAGS"
+  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Werror"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -35312,36 +37747,195 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
+if ac_fn_c_try_link "$LINENO"
 then :
-  gl_cv_cc_nomfi_supported=yes
-else $as_nop
-  gl_cv_cc_nomfi_supported=no
+  gl_cv_warn_c__Werror=yes
+else case e in #(
+  e) gl_cv_warn_c__Werror=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-       CFLAGS="$gl_save_CFLAGS"
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+  CFLAGS="$gl_saved_compiler_FLAGS"
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Werror" >&5
+printf "%s\n" "$gl_cv_warn_c__Werror" >&6; }
+if test "x$gl_cv_warn_c__Werror" = xyes
+then :
+  as_fn_append WERROR_CFLAGS " -Werror"
+fi
+
+
+
 
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-error=analyzer-use-of-uninitialized-value" >&5
+printf %s "checking whether C compiler handles -Wno-error=analyzer-use-of-uninitialized-value... " >&6; }
+if test ${gl_cv_warn_c__Wno_error_analyzer_use_of_uninitialized_value+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e)
+  gl_saved_compiler_FLAGS="$CFLAGS"
+  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Werror=analyzer-use-of-uninitialized-value"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  gl_cv_warn_c__Wno_error_analyzer_use_of_uninitialized_value=yes
+else case e in #(
+  e) gl_cv_warn_c__Wno_error_analyzer_use_of_uninitialized_value=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+  CFLAGS="$gl_saved_compiler_FLAGS"
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_error_analyzer_use_of_uninitialized_value" >&5
+printf "%s\n" "$gl_cv_warn_c__Wno_error_analyzer_use_of_uninitialized_value" >&6; }
+if test "x$gl_cv_warn_c__Wno_error_analyzer_use_of_uninitialized_value" = xyes
+then :
+  as_fn_append WERROR_CFLAGS " -Wno-error=analyzer-use-of-uninitialized-value"
+fi
+
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-error=missing-field-initializers" >&5
+printf %s "checking whether C compiler handles -Wno-error=missing-field-initializers... " >&6; }
+if test ${gl_cv_warn_c__Wno_error_missing_field_initializers+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e)
+  gl_saved_compiler_FLAGS="$CFLAGS"
+  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Werror=missing-field-initializers"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  gl_cv_warn_c__Wno_error_missing_field_initializers=yes
+else case e in #(
+  e) gl_cv_warn_c__Wno_error_missing_field_initializers=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+  CFLAGS="$gl_saved_compiler_FLAGS"
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_error_missing_field_initializers" >&5
+printf "%s\n" "$gl_cv_warn_c__Wno_error_missing_field_initializers" >&6; }
+if test "x$gl_cv_warn_c__Wno_error_missing_field_initializers" = xyes
+then :
+  as_fn_append WERROR_TESTS_CFLAGS " -Wno-error=missing-field-initializers"
+fi
+
+
+     # GCC 11.4 false positive: test-glib.c: double-'free' of 'naemchen_bytes' -Werror=analyzer-double-free
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-error=analyzer-double-free" >&5
+printf %s "checking whether C compiler handles -Wno-error=analyzer-double-free... " >&6; }
+if test ${gl_cv_warn_c__Wno_error_analyzer_double_free+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e)
+  gl_saved_compiler_FLAGS="$CFLAGS"
+  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Werror=analyzer-double-free"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main (void)
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  gl_cv_warn_c__Wno_error_analyzer_double_free=yes
+else case e in #(
+  e) gl_cv_warn_c__Wno_error_analyzer_double_free=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+  CFLAGS="$gl_saved_compiler_FLAGS"
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_error_analyzer_double_free" >&5
+printf "%s\n" "$gl_cv_warn_c__Wno_error_analyzer_double_free" >&6; }
+if test "x$gl_cv_warn_c__Wno_error_analyzer_double_free" = xyes
+then :
+  as_fn_append WERROR_TESTS_CFLAGS " -Wno-error=analyzer-double-free"
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_nomfi_supported" >&5
-printf "%s\n" "$gl_cv_cc_nomfi_supported" >&6; }
 
-    if test "$gl_cv_cc_nomfi_supported" = yes; then
-                  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -Wno-missing-field-initializers is needed" >&5
+
+   fi
+
+   # Setup the list of meaningful warning options for the C compiler.
+   # The list comes from manywarnings.m4. Warning options that are not
+   # generally meaningful have already been filtered out (cf.
+   # build-aux/gcc-warning.spec).
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+  if test -n "$GCC"
+then :
+
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -Wno-missing-field-initializers is needed" >&5
 printf %s "checking whether -Wno-missing-field-initializers is needed... " >&6; }
 if test ${gl_cv_cc_nomfi_needed+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_save_CFLAGS="$CFLAGS"
-         CFLAGS="$CFLAGS -Wextra -Werror"
-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+  e) gl_cv_cc_nomfi_needed=no
+       gl_saved_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -Wextra -Werror"
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-int f (void)
-                {
-                  typedef struct { int a; int b; } s_t;
-                  s_t s1 = { 0, };
-                  return s1.b;
-                }
+struct file_data { int desc, name; };
+              struct cmp { struct file_data file1; };
+              void f (struct cmp *r)
+              {
+                typedef struct { int a; int b; } s_t;
+                s_t s1 = { 0, };
+                struct cmp cmp = { .file0.desc = r->file0.desc + s1.a };
+                *r = cmp;
+              }
 
 int
 main (void)
@@ -35353,25 +37947,31 @@
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
-  gl_cv_cc_nomfi_needed=no
-else $as_nop
+
+else case e in #(
+  e) CFLAGS="$CFLAGS -Wno-missing-field-initializers"
+          if ac_fn_c_try_compile "$LINENO"
+then :
   gl_cv_cc_nomfi_needed=yes
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam ;;
+esac
+fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-         CFLAGS="$gl_save_CFLAGS"
-
+       CFLAGS="$gl_saved_CFLAGS"
+     ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_nomfi_needed" >&5
 printf "%s\n" "$gl_cv_cc_nomfi_needed" >&6; }
-    fi
 
                 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -Wuninitialized is supported" >&5
 printf %s "checking whether -Wuninitialized is supported... " >&6; }
 if test ${gl_cv_cc_uninitialized_supported+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-  gl_save_CFLAGS="$CFLAGS"
+else case e in #(
+  e) gl_saved_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -Werror -Wuninitialized"
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -35387,28 +37987,30 @@
 if ac_fn_c_try_compile "$LINENO"
 then :
   gl_cv_cc_uninitialized_supported=yes
-else $as_nop
-  gl_cv_cc_uninitialized_supported=no
+else case e in #(
+  e) gl_cv_cc_uninitialized_supported=no ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-       CFLAGS="$gl_save_CFLAGS"
-
+       CFLAGS="$gl_saved_CFLAGS"
+       ;;
+esac
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_uninitialized_supported" >&5
 printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; }
 
-  fi
+fi
 
   # List all gcc warning categories.
   # To compare this list to your installed GCC's, run this Bash command:
   #
   # comm -3 \
   #  <((sed -n 's/^  *$-^ 0-9^ *$.*/\1/p' manywarnings.m4; \
-  #     awk '/^^#/ {print warnings}' ../build-aux/gcc-warning.spec) | sort) \
+  #     awk '/^^#/ {print possible_warning_options}' ../build-aux/gcc-warning.spec) | sort) \
   #  <(LC_ALL=C gcc --help=warnings | sed -n 's/^  $-^ *$ .*/\1/p' | sort)
 
-  warnings=
-  for gl_manywarn_item in -fanalyzer -fno-common \
+  possible_warning_options=
+  for gl_manywarn_item in -fanalyzer -fstrict-flex-arrays \
     -Wall \
     -Warith-conversion \
     -Wbad-function-cast \
@@ -35436,6 +38038,7 @@
     -Wpointer-arith \
     -Wshadow \
     -Wstack-protector \
+    -Wstrict-flex-arrays \
     -Wstrict-overflow \
     -Wstrict-prototypes \
     -Wsuggest-attribute=cold \
@@ -35459,46 +38062,51 @@
     -Wwrite-strings \
     \
     ; do
-    as_fn_append warnings " $gl_manywarn_item"
+    as_fn_append possible_warning_options " $gl_manywarn_item"
   done
 
   # gcc --help=warnings outputs an unusual form for these options; list
   # them here so that the above 'comm' command doesn't report a false match.
-  as_fn_append warnings ' -Warray-bounds=2'
-  as_fn_append warnings ' -Wattribute-alias=2'
-  as_fn_append warnings ' -Wbidi-chars=any,ucn'
-  as_fn_append warnings ' -Wformat-overflow=2'
-  as_fn_append warnings ' -Wformat=2'
-  as_fn_append warnings ' -Wformat-truncation=2'
-  as_fn_append warnings ' -Wimplicit-fallthrough=5'
-  as_fn_append warnings ' -Wshift-overflow=2'
-  as_fn_append warnings ' -Wuse-after-free=3'
-  as_fn_append warnings ' -Wunused-const-variable=2'
-  as_fn_append warnings ' -Wvla-larger-than=4031'
+  as_fn_append possible_warning_options ' -Warray-bounds=2'
+  as_fn_append possible_warning_options ' -Wattribute-alias=2'
+  as_fn_append possible_warning_options ' -Wbidi-chars=any,ucn'
+  as_fn_append possible_warning_options ' -Wformat-overflow=2'
+  as_fn_append possible_warning_options ' -Wformat=2'
+  as_fn_append possible_warning_options ' -Wformat-truncation=2'
+  as_fn_append possible_warning_options ' -Wimplicit-fallthrough=5'
+  as_fn_append possible_warning_options ' -Wshift-overflow=2'
+  as_fn_append possible_warning_options ' -Wuse-after-free=3'
+  as_fn_append possible_warning_options ' -Wunused-const-variable=2'
+  as_fn_append possible_warning_options ' -Wvla-larger-than=4031'
 
   # These are needed for older GCC versions.
-  if test -n "$GCC"; then
-    case `($CC --version) 2>/dev/null` in
+  if test -n "$GCC" && gl_gcc_version=`($CC --version) 2>/dev/null`; then
+    case $gl_gcc_version in
       'gcc (GCC) '0-3.* | \
       'gcc (GCC) '4.0-7.*)
-        as_fn_append warnings ' -fdiagnostics-show-option'
-        as_fn_append warnings ' -funit-at-a-time'
+        as_fn_append possible_warning_options ' -fdiagnostics-show-option'
+        as_fn_append possible_warning_options ' -funit-at-a-time'
+          ;;
+    esac
+    case $gl_gcc_version in
+      'gcc (GCC) '0-9.*)
+        as_fn_append possible_warning_options ' -fno-common'
           ;;
     esac
   fi
 
   # Disable specific options as needed.
   if test "$gl_cv_cc_nomfi_needed" = yes; then
-    as_fn_append warnings ' -Wno-missing-field-initializers'
+    as_fn_append possible_warning_options ' -Wno-missing-field-initializers'
   fi
 
   if test "$gl_cv_cc_uninitialized_supported" = no; then
-    as_fn_append warnings ' -Wno-uninitialized'
+    as_fn_append possible_warning_options ' -Wno-uninitialized'
   fi
 
   # This warning have too many false alarms in GCC 11.2.1.
   # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101713
-  as_fn_append warnings ' -Wno-analyzer-malloc-leak'
+  as_fn_append possible_warning_options ' -Wno-analyzer-malloc-leak'
 
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -35507,21 +38115,11 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-  nw=
-  nw="$nw -Wsystem-headers"       # Don't let system headers trigger warnings
-  nw="$nw -Wundef"                # All compiler preprocessors support #if UNDEF
-  nw="$nw -Wtraditional"          # All compilers nowadays support ANSI C
-  nw="$nw -Wconversion"           # These warnings usually don't point to mistakes.
-  nw="$nw -Wpadded"               # Padding internal structs doesn't help.
-  nw="$nw -Wc++-compat"           # Compile using a C compiler.
-  nw="$nw -Wtraditional-conversion" # Too many complaints for now.
-  nw="$nw -Wunreachable-code"     # gcc bug 40412
-  nw="$nw -Wswitch-default"       # Nothing wrong with default-less switch?
-  nw="$nw -Wmissing-field-initializers" # Avoid spamming in tests/ directory
 
+   # Compute the list of warning options that are desired.
 
   gl_warn_set=
-  set x $warnings; shift
+  set x $possible_warning_options; shift
   for gl_warn_item
   do
     case " $nw " in
@@ -35532,67 +38130,33 @@
         ;;
     esac
   done
-  warnings=$gl_warn_set
-
-  for w in $warnings; do
-
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror -Wunknown-warning-option" >&5
-printf %s "checking whether C compiler handles -Werror -Wunknown-warning-option... " >&6; }
-if test ${gl_cv_warn_c__Werror__Wunknown_warning_option+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Werror -Wunknown-warning-option"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
+  desired_warning_options=$gl_warn_set
 
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  gl_cv_warn_c__Werror__Wunknown_warning_option=yes
-else $as_nop
-  gl_cv_warn_c__Werror__Wunknown_warning_option=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Werror__Wunknown_warning_option" >&5
-printf "%s\n" "$gl_cv_warn_c__Werror__Wunknown_warning_option" >&6; }
-if test "x$gl_cv_warn_c__Werror__Wunknown_warning_option" = xyes
-then :
-  gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror'
-else $as_nop
-  gl_unknown_warnings_are_errors=
-fi
+   # Compute the list of remaining undesired warning options.
+   # Namely those, that were not in manywarnings.m4 because they were
+   # already listed in build-aux/gcc-warning.spec; this includes those
+   # that are implied by -Wall.
 
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+  gl_warn_set=
+  set x $nw; shift
+  for gl_warn_item
+  do
+    case " $possible_warning_options " in
+      *" $gl_warn_item "*)
+        ;;
+      *)
+        as_fn_append gl_warn_set " $gl_warn_item"
+        ;;
+    esac
+  done
+  remaining_undesired_warning_options=$gl_warn_set
 
 
+   # Add the desired warning options to WARN_CFLAGS.
+   for w in $desired_warning_options; do
 
 
-as_gl_Warn=`printf "%s\n" "gl_cv_warn_c_$w" | $as_tr_sh`
+as_gl_Warn=`printf "%s\n" "gl_cv_warn_c_$w" | sed "$as_sed_sh"`
 gl_positive="$w"
 case $gl_positive in
   -Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-$.*$'` ;;
@@ -35602,9 +38166,9 @@
 if eval test \${$as_gl_Warn+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
-  gl_save_compiler_FLAGS="$CFLAGS"
+else case e in #(
+  e)
+  gl_saved_compiler_FLAGS="$CFLAGS"
   as_fn_append CFLAGS " $gl_unknown_warnings_are_errors $gl_positive"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -35620,13 +38184,15 @@
 if ac_fn_c_try_link "$LINENO"
 then :
   eval "$as_gl_Warn=yes"
-else $as_nop
-  eval "$as_gl_Warn=no"
+else case e in #(
+  e) eval "$as_gl_Warn=no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
+  CFLAGS="$gl_saved_compiler_FLAGS"
+ ;;
+esac
 fi
 eval ac_res=\$$as_gl_Warn
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -35637,60 +38203,27 @@
 fi
 
 
-  done
-
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -fdiagnostics-show-option" >&5
-printf %s "checking whether C compiler handles -fdiagnostics-show-option... " >&6; }
-if test ${gl_cv_warn_c__fdiagnostics_show_option+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fdiagnostics-show-option"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  gl_cv_warn_c__fdiagnostics_show_option=yes
-else $as_nop
-  gl_cv_warn_c__fdiagnostics_show_option=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__fdiagnostics_show_option" >&5
-printf "%s\n" "$gl_cv_warn_c__fdiagnostics_show_option" >&6; }
-if test "x$gl_cv_warn_c__fdiagnostics_show_option" = xyes
-then :
-  as_fn_append WARN_CFLAGS " -fdiagnostics-show-option"
-fi
-
+   done
 
+   # Add the opposites of the remaining undesired warning options to
+   # WARN_CFLAGS.
+   for w in `echo "$remaining_undesired_warning_options" | sed -e 's/-W/-Wno-/g'`; do
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -fdiagnostics-color=always" >&5
-printf %s "checking whether C compiler handles -fdiagnostics-color=always... " >&6; }
-if test ${gl_cv_warn_c__fdiagnostics_color_always+y}
+as_gl_Warn=`printf "%s\n" "gl_cv_warn_c_$w" | sed "$as_sed_sh"`
+gl_positive="$w"
+case $gl_positive in
+  -Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-$.*$'` ;;
+esac
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles $w" >&5
+printf %s "checking whether C compiler handles $w... " >&6; }
+if eval test \${$as_gl_Warn+y}
 then :
   printf %s "(cached) " >&6
-else $as_nop
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fdiagnostics-color=always"
+else case e in #(
+  e)
+  gl_saved_compiler_FLAGS="$CFLAGS"
+  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors $gl_positive"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -35704,72 +38237,37 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
 then :
-  gl_cv_warn_c__fdiagnostics_color_always=yes
-else $as_nop
-  gl_cv_warn_c__fdiagnostics_color_always=no
+  eval "$as_gl_Warn=yes"
+else case e in #(
+  e) eval "$as_gl_Warn=no" ;;
+esac
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
+  CFLAGS="$gl_saved_compiler_FLAGS"
+ ;;
+esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__fdiagnostics_color_always" >&5
-printf "%s\n" "$gl_cv_warn_c__fdiagnostics_color_always" >&6; }
-if test "x$gl_cv_warn_c__fdiagnostics_color_always" = xyes
+eval ac_res=\$$as_gl_Warn
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_gl_Warn"\" = x"yes"
 then :
-  as_fn_append WARN_CFLAGS " -fdiagnostics-color=always"
+  as_fn_append WARN_CFLAGS " $w"
 fi
 
-      # colors even when using ccache
-
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-missing-field-initializers" >&5
-printf %s "checking whether C compiler handles -Wno-missing-field-initializers... " >&6; }
-if test ${gl_cv_warn_c__Wno_missing_field_initializers+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-
-  gl_save_compiler_FLAGS="$CFLAGS"
-  as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wmissing-field-initializers"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  gl_cv_warn_c__Wno_missing_field_initializers=yes
-else $as_nop
-  gl_cv_warn_c__Wno_missing_field_initializers=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext
-  CFLAGS="$gl_save_compiler_FLAGS"
-
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_missing_field_initializers" >&5
-printf "%s\n" "$gl_cv_warn_c__Wno_missing_field_initializers" >&6; }
-if test "x$gl_cv_warn_c__Wno_missing_field_initializers" = xyes
-then :
-  as_fn_append WARN_CFLAGS " -Wno-missing-field-initializers"
-fi
+   done
 
- # # Avoid spamming in tests/ directory
 fi
 
 # Check whether --enable-doc was given.
 if test ${enable_doc+y}
 then :
   enableval=$enable_doc; enable_doc=$enableval
-else $as_nop
-  enable_doc=yes
+else case e in #(
+  e) enable_doc=yes ;;
+esac
 fi
 
  if test "$enable_doc" != "no"; then
@@ -35798,8 +38296,8 @@
 # config.status only pays attention to the cache file if you give it
 # the --recheck option to rerun configure.
 #
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# 'ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* 'ac_cv_foo' will be assigned the
 # following values.
 
 _ACEOF
@@ -35829,14 +38327,14 @@
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
+      # 'set' does not quote correctly, so add quotes: double-quote
       # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\$_$as_cr_alnum*_cv__$as_cr_alnum*\$=\$.*\$/\\1='\\2'/p"
       ;; #(
     *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      # 'set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n "/^_$as_cr_alnum*_cv__$as_cr_alnum*=/p"
       ;;
     esac |
@@ -35921,6 +38419,12 @@
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+# Check whether --enable-year2038 was given.
+if test ${enable_year2038+y}
+then :
+  enableval=$enable_year2038;
+fi
+
 if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then
   as_fn_error $? "conditional \"GL_COND_LIBTOOL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -36116,7 +38620,6 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-as_nop=:
 if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
 then :
   emulate sh
@@ -36125,12 +38628,13 @@
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else $as_nop
-  case `(set -o) 2>/dev/null` in #(
+else case e in #(
+  e) case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
+esac ;;
 esac
 fi
 
@@ -36202,7 +38706,7 @@
 
      ;;
 esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
+# We did not find ourselves, most probably we were run as 'sh COMMAND'
 # in which case we are not to be found in the path.
 if test "x$as_myself" = x; then
   as_myself=$0
@@ -36231,7 +38735,6 @@
 } # as_fn_error
 
 
-
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -36271,11 +38774,12 @@
   {
     eval $1+=\$2
   }'
-else $as_nop
-  as_fn_append ()
+else case e in #(
+  e) as_fn_append ()
   {
     eval $1=\$$1\$2
-  }
+  } ;;
+esac
 fi # as_fn_append
 
 # as_fn_arith ARG...
@@ -36289,11 +38793,12 @@
   {
     as_val=$(( $* ))
   }'
-else $as_nop
-  as_fn_arith ()
+else case e in #(
+  e) as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
-  }
+  } ;;
+esac
 fi # as_fn_arith
 
 
@@ -36376,9 +38881,9 @@
   if ln -s conf$$.file conf$$ 2>/dev/null; then
     as_ln_s='ln -s'
     # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable.
+    # In both cases, we have to default to 'cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
       as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
@@ -36459,10 +38964,12 @@
 as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g'"
+as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g"
+as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated
 
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%^_$as_cr_alnum%_%g'"
+as_sed_sh="y%*+%pp%;s%^_$as_cr_alnum%_%g"
+as_tr_sh="eval sed '$as_sed_sh'" # deprecated
 
 
 exec 6>&1
@@ -36477,8 +38984,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Libidn2 $as_me 2.3.4, which was
-generated by GNU Autoconf 2.71.  Invocation command line was
+This file was extended by Libidn2 $as_me 2.3.7, which was
+generated by GNU Autoconf 2.72.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -36511,7 +39018,7 @@
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
+'$as_me' instantiates files and other configuration actions
 from templates according to the current configuration.  Unless the files
 and actions are specified as TAGs, all are instantiated by default.
 
@@ -36551,11 +39058,11 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-Libidn2 config.status 2.3.4
-configured by $0, generated by GNU Autoconf 2.71,
+Libidn2 config.status 2.3.7
+configured by $0, generated by GNU Autoconf 2.72,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2021 Free Software Foundation, Inc.
+Copyright (C) 2023 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -36617,8 +39124,8 @@
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
+    as_fn_error $? "ambiguous option: '$1'
+Try '$0 --help' for more information.";;
   --help | --hel | -h )
     printf "%s\n" "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
@@ -36626,8 +39133,8 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
+  -*) as_fn_error $? "unrecognized option: '$1'
+Try '$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
      ac_need_defaults=false ;;
@@ -36993,7 +39500,7 @@
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
     "fuzz/Makefile") CONFIG_FILES="$CONFIG_FILES fuzz/Makefile" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -37014,7 +39521,7 @@
 # creating and moving files from /tmp can sometimes cause problems.
 # Hook for its removal unless debugging.
 # Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
+# after its creation but before its name has been assigned to '$tmp'.
 $debug ||
 {
   tmp= ac_tmp=
@@ -37038,7 +39545,7 @@
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
+# This happens for instance with './config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
 
@@ -37196,13 +39703,13 @@
 
 # Set up the scripts for CONFIG_HEADERS section.
 # No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
+# This happens for instance with './config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
 cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
-# Transform confdefs.h into an awk script `defines.awk', embedded as
+# Transform confdefs.h into an awk script 'defines.awk', embedded as
 # here-document in config.status, that substitutes the proper values into
 # config.h.in to produce config.h.
 
@@ -37312,7 +39819,7 @@
   esac
   case $ac_mode$ac_tag in
   :FHL*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;;
   :FH-) ac_tag=-:-;;
   :FH*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -37334,19 +39841,19 @@
       -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
+	 # because $ac_f cannot contain ':'.
 	 test -f "$ac_f" ||
 	   case $ac_f in
 	   \\/$*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # Let's still pretend it is 'configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
@@ -37479,7 +39986,7 @@
 esac
 _ACEOF
 
-# Neutralize VPATH when `$srcdir' = `.'.
+# Neutralize VPATH when '$srcdir' = '.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -37510,9 +40017,9 @@
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^	 *datarootdir	 *:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -37698,15 +40205,15 @@
    (exit $ac_status); } || am_rc=$?
   done
   if test $am_rc -ne 0; then
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "Something went wrong bootstrapping makefile fragments
     for automatic dependency tracking.  If GNU make was not used, consider
     re-running the configure script with MAKE=\"gmake\" (or whatever is
     necessary).  You can also try re-running configure with the
     '--disable-dependency-tracking' option to at least be able to build
     the package (albeit without support for automatic dependency tracking).
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; }
   fi
   { am_dirpart=; unset am_dirpart;}
   { am_filepart=; unset am_filepart;}
@@ -38414,42 +40921,70 @@
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Summary of build options:
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: summary of main build options:
+
+  Version:            ${VERSION}
+  Libtool version     $LT_CURRENT:$LT_REVISION:$LT_AGE
+  DLL version:        $DLL_VERSION
+  Header version:     major $MAJOR_VERSION minor $MINOR_VERSION patch $PATCH_VERSION number $NUMBER_VERSION
+  Build system:       ${build}
+  Host/Target system: ${host}
+  Install prefix:     ${prefix}
+  Compiler:           ${CC}
+  CFLAGS:             ${CFLAGS}
+  CPPFLAGS:           ${CPPFLAGS}
+  LDFLAGS:            ${LDFLAGS}
+  Library types:      Shared=${enable_shared}, Static=${enable_static}
+
+  Warning flags:      $enable_gcc_warnings
+      WERROR_CFLAGS:  $WERROR_CFLAGS
+WERROR_TESTS_CFLAGS:  $WERROR_TESTS_CFLAGS
+        WARN_CFLAGS:  $WARN_CFLAGS
+
+  Documentation:      ${enable_doc}
+
+  nl_langinfo:        $am_cv_langinfo_codeset
+  Libiconv:           $am_cv_func_iconv_summary
+         LTLIBICONV:  $LTLIBICONV
+  Libunistring:       $ac_cv_libunistring
+            VERSION:  $LIBUNISTRING_VERSION
+     LTLIBUNISTRING:  $LTLIBUNISTRING
 
-  Version:           ${VERSION}
-  Libtool version    $LT_CURRENT:$LT_REVISION:$LT_AGE
-  DLL version:       $DLL_VERSION
-  Header version:    major $MAJOR_VERSION minor $MINOR_VERSION patch $PATCH_VERSION number $NUMBER_VERSION
-  Build/host system: ${build} / ${host}
-  Install prefix:    ${prefix}
-  Compiler:          ${CC}
-  Warning flags:     ${WARN_CFLAGS}
-  CFLAGS:            ${CFLAGS} ${CPPFLAGS}
-  LDFlags:           ${LDFLAGS}
-  Documentation:     ${enable_doc}
-  Library types:     Shared=${enable_shared}, Static=${enable_static}
-  iconv:             $am_cv_func_iconv_summary $LTLIBICONV
-  Libunistring:      $ac_cv_libunistring $LIBUNISTRING_VERSION $LTLIBUNISTRING
-  Valgrind:          $gl_cv_prog_valgrind_works $VALGRIND_PROGRAM $DEFAULT_VALGRINDFLAGS $VALGRINDFLAGS
-  Version script:    $have_ld_version_script
+  Version script:     $have_ld_version_script
+
+  Valgrind:           $gl_cv_prog_valgrind_works $VALGRIND_PROGRAM $DEFAULT_VALGRINDFLAGS $VALGRINDFLAGS
 " >&5
-printf "%s\n" "$as_me: Summary of build options:
+printf "%s\n" "$as_me: summary of main build options:
+
+  Version:            ${VERSION}
+  Libtool version     $LT_CURRENT:$LT_REVISION:$LT_AGE
+  DLL version:        $DLL_VERSION
+  Header version:     major $MAJOR_VERSION minor $MINOR_VERSION patch $PATCH_VERSION number $NUMBER_VERSION
+  Build system:       ${build}
+  Host/Target system: ${host}
+  Install prefix:     ${prefix}
+  Compiler:           ${CC}
+  CFLAGS:             ${CFLAGS}
+  CPPFLAGS:           ${CPPFLAGS}
+  LDFLAGS:            ${LDFLAGS}
+  Library types:      Shared=${enable_shared}, Static=${enable_static}
+
+  Warning flags:      $enable_gcc_warnings
+      WERROR_CFLAGS:  $WERROR_CFLAGS
+WERROR_TESTS_CFLAGS:  $WERROR_TESTS_CFLAGS
+        WARN_CFLAGS:  $WARN_CFLAGS
+
+  Documentation:      ${enable_doc}
+
+  nl_langinfo:        $am_cv_langinfo_codeset
+  Libiconv:           $am_cv_func_iconv_summary
+         LTLIBICONV:  $LTLIBICONV
+  Libunistring:       $ac_cv_libunistring
+            VERSION:  $LIBUNISTRING_VERSION
+     LTLIBUNISTRING:  $LTLIBUNISTRING
+
+  Version script:     $have_ld_version_script
 
-  Version:           ${VERSION}
-  Libtool version    $LT_CURRENT:$LT_REVISION:$LT_AGE
-  DLL version:       $DLL_VERSION
-  Header version:    major $MAJOR_VERSION minor $MINOR_VERSION patch $PATCH_VERSION number $NUMBER_VERSION
-  Build/host system: ${build} / ${host}
-  Install prefix:    ${prefix}
-  Compiler:          ${CC}
-  Warning flags:     ${WARN_CFLAGS}
-  CFLAGS:            ${CFLAGS} ${CPPFLAGS}
-  LDFlags:           ${LDFLAGS}
-  Documentation:     ${enable_doc}
-  Library types:     Shared=${enable_shared}, Static=${enable_static}
-  iconv:             $am_cv_func_iconv_summary $LTLIBICONV
-  Libunistring:      $ac_cv_libunistring $LIBUNISTRING_VERSION $LTLIBUNISTRING
-  Valgrind:          $gl_cv_prog_valgrind_works $VALGRIND_PROGRAM $DEFAULT_VALGRINDFLAGS $VALGRINDFLAGS
-  Version script:    $have_ld_version_script
+  Valgrind:           $gl_cv_prog_valgrind_works $VALGRIND_PROGRAM $DEFAULT_VALGRINDFLAGS $VALGRINDFLAGS
 " >&6;}

_service:tar_scm:libidn2-2.3.4.tar.gz/configure.ac -> _service:tar_scm:libidn2-2.3.7.tar.gz/configure.ac Changed

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2022 Simon Josefsson
+# Copyright (C) 2011-2024 Simon Josefsson
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,9 +22,9 @@
 # Interfaces changed/added/removed:   CURRENT++       REVISION=0
 # Interfaces added:                             AGE++
 # Interfaces removed:                           AGE=0
-AC_SUBST(LT_CURRENT, 3)
-AC_SUBST(LT_REVISION, 8)
-AC_SUBST(LT_AGE, 3)
+AC_SUBST(LT_CURRENT, 4)
+AC_SUBST(LT_REVISION, 0)
+AC_SUBST(LT_AGE, 4)
 
 DLL_VERSION=`expr ${LT_CURRENT} - ${LT_AGE}`
 AC_SUBST(DLL_VERSION)
@@ -89,44 +89,83 @@
 )
 
 AM_GNU_GETTEXT(external)
-AM_GNU_GETTEXT_VERSION(0.19.3)
+AM_GNU_GETTEXT_VERSION(0.19.8)
 
 AX_CODE_COVERAGE
 
 AC_ARG_ENABLE(gcc-warnings,
-  AS_HELP_STRING(--enable-gcc-warnings,
-		  turn on lots of GCC warnings (for developers)),
-  case $enableval in
-     yes|no) ;;
-     *)      AC_MSG_ERROR(bad value $enableval for gcc-warnings option) ;;
-   esac
-   gl_gcc_warnings=$enableval,
-  gl_gcc_warnings=yes
-)
-
-if test "$gl_gcc_warnings" = yes; then
-  gl_MANYWARN_ALL_GCC(warnings)
-  nw=
-  nw="$nw -Wsystem-headers"       # Don't let system headers trigger warnings
-  nw="$nw -Wundef"                # All compiler preprocessors support #if UNDEF
-  nw="$nw -Wtraditional"          # All compilers nowadays support ANSI C
-  nw="$nw -Wconversion"           # These warnings usually don't point to mistakes.
-  nw="$nw -Wpadded"               # Padding internal structs doesn't help.
-  nw="$nw -Wc++-compat"           # Compile using a C compiler.
-  nw="$nw -Wtraditional-conversion" # Too many complaints for now.
-  nw="$nw -Wunreachable-code"     # gcc bug 40412
-  nw="$nw -Wswitch-default"       # Nothing wrong with default-less switch?
-  nw="$nw -Wmissing-field-initializers" # Avoid spamming in tests/ directory
-
-  gl_MANYWARN_COMPLEMENT(warnings, $warnings, $nw)
-  for w in $warnings; do
-    gl_WARN_ADD($w)
-  done
-
-  gl_WARN_ADD(-fdiagnostics-show-option)
-  gl_WARN_ADD(-fdiagnostics-color=always)      # colors even when using ccache
-  gl_WARN_ADD(-Wno-missing-field-initializers) # # Avoid spamming in tests/ directory
-fi
+  AS_HELP_STRING(--enable-gcc-warnings=TYPE,
+    control generation of GCC warnings.  The TYPE 'no' disables
+     warnings; 'yes' (default) generates cheap warnings;
+     'expensive' in addition generates expensive warnings
+     and 'error' also turn warnings into errors.))
+
+# https://www.gnu.org/software/gnulib//manual/html_node/manywarnings.html
+AS_IF(test "$enable_gcc_warnings" != no,
+  
+   # Set up the list of unwanted warning options.
+   nw=
+   if test "$enable_gcc_warnings" = yes; then
+     nw="$nw -fanalyzer"
+   fi
+   nw="$nw -Wbad-function-cast" # Casting a function's result is not more
+                                # dangerous than casting any other value.
+   nw="$nw -Winline"            # It's OK to not inline.
+   nw="$nw -Wsign-compare"      # Too many false alarms.
+   nw="$nw -Wstrict-overflow"   # It's OK to optimize strictly.
+   nw="$nw -Wsystem-headers"    # Don't warn in system headers.
+
+   # https://github.com/pi-hole/FTL/pull/1428
+   nw="$nw -Wsuggest-attribute=pure"
+   nw="$nw -Wsuggest-attribute=const"
+
+  dnl nw="$nw -Wundef"                # All compiler preprocessors support #if UNDEF
+  dnl nw="$nw -Wtraditional"          # All compilers nowadays support ANSI C
+  dnl nw="$nw -Wconversion"           # These warnings usually don't point to mistakes.
+  dnl nw="$nw -Wpadded"               # Padding internal structs doesn't help.
+  dnl nw="$nw -Wc++-compat"           # Compile using a C compiler.
+  dnl nw="$nw -Wtraditional-conversion" # Too many complaints for now.
+  dnl nw="$nw -Wunreachable-code"     # gcc bug 40412
+  dnl nw="$nw -Wswitch-default"       # Nothing wrong with default-less switch?
+  dnl nw="$nw -Wmissing-field-initializers" # Avoid spamming in tests/ directory
+  dnl gl_WARN_ADD(-fdiagnostics-show-option)
+  dnl gl_WARN_ADD(-fdiagnostics-color=always)      # colors even when using ccache
+
+   if test "$enable_gcc_warnings" = error; then
+     gl_WARN_ADD(-Werror, WERROR_CFLAGS)
+     gl_WARN_ADD(-Wno-error=analyzer-use-of-uninitialized-value, WERROR_CFLAGS)
+     gl_WARN_ADD(-Wno-error=missing-field-initializers, WERROR_TESTS_CFLAGS)
+     # GCC 11.4 false positive: test-glib.c: double-'free' of 'naemchen_bytes' -Werror=analyzer-double-free
+     gl_WARN_ADD(-Wno-error=analyzer-double-free, WERROR_TESTS_CFLAGS)
+   fi
+
+   # Setup the list of meaningful warning options for the C compiler.
+   # The list comes from manywarnings.m4. Warning options that are not
+   # generally meaningful have already been filtered out (cf.
+   # build-aux/gcc-warning.spec).
+   gl_MANYWARN_ALL_GCC(possible_warning_options)
+
+   # Compute the list of warning options that are desired.
+   gl_MANYWARN_COMPLEMENT(desired_warning_options,
+                          $possible_warning_options, $nw)
+   # Compute the list of remaining undesired warning options.
+   # Namely those, that were not in manywarnings.m4 because they were
+   # already listed in build-aux/gcc-warning.spec; this includes those
+   # that are implied by -Wall.
+   gl_MANYWARN_COMPLEMENT(remaining_undesired_warning_options,
+                          $nw, $possible_warning_options)
+
+   # Add the desired warning options to WARN_CFLAGS.
+   for w in $desired_warning_options; do
+     gl_WARN_ADD($w)
+   done
+
+   # Add the opposites of the remaining undesired warning options to
+   # WARN_CFLAGS.
+   for w in `echo "$remaining_undesired_warning_options" | sed -e 's/-W/-Wno-/g'`; do
+     gl_WARN_ADD($w)
+   done
+)
 
 AC_ARG_ENABLE(doc,
   AS_HELP_STRING(--disable-doc, don't generate any documentation),
@@ -156,22 +195,36 @@
 )
 AC_OUTPUT
 
-AC_MSG_NOTICE(Summary of build options:
-
-  Version:           ${VERSION}
-  Libtool version    $LT_CURRENT:$LT_REVISION:$LT_AGE
-  DLL version:       $DLL_VERSION
-  Header version:    major $MAJOR_VERSION minor $MINOR_VERSION patch $PATCH_VERSION number $NUMBER_VERSION
-  Build/host system: ${build} / ${host}
-  Install prefix:    ${prefix}
-  Compiler:          ${CC}
-  Warning flags:     ${WARN_CFLAGS}
-  CFLAGS:            ${CFLAGS} ${CPPFLAGS}
-  LDFlags:           ${LDFLAGS}
-  Documentation:     ${enable_doc}
-  Library types:     Shared=${enable_shared}, Static=${enable_static}
-  iconv:             $am_cv_func_iconv_summary $LTLIBICONV
-  Libunistring:      $ac_cv_libunistring $LIBUNISTRING_VERSION $LTLIBUNISTRING
-  Valgrind:          $gl_cv_prog_valgrind_works $VALGRIND_PROGRAM $DEFAULT_VALGRINDFLAGS $VALGRINDFLAGS
-  Version script:    $have_ld_version_script
+AC_MSG_NOTICE(summary of main build options:
+
+  Version:            ${VERSION}
+  Libtool version     $LT_CURRENT:$LT_REVISION:$LT_AGE
+  DLL version:        $DLL_VERSION
+  Header version:     major $MAJOR_VERSION minor $MINOR_VERSION patch $PATCH_VERSION number $NUMBER_VERSION
+  Build system:       ${build}
+  Host/Target system: ${host}
+  Install prefix:     ${prefix}
+  Compiler:           ${CC}
+  CFLAGS:             ${CFLAGS}
+  CPPFLAGS:           ${CPPFLAGS}
+  LDFLAGS:            ${LDFLAGS}
+  Library types:      Shared=${enable_shared}, Static=${enable_static}
+
+  Warning flags:      $enable_gcc_warnings
+      WERROR_CFLAGS:  $WERROR_CFLAGS
+WERROR_TESTS_CFLAGS:  $WERROR_TESTS_CFLAGS
+        WARN_CFLAGS:  $WARN_CFLAGS
+
+  Documentation:      ${enable_doc}
+
+  nl_langinfo:        $am_cv_langinfo_codeset
+  Libiconv:           $am_cv_func_iconv_summary
+         LTLIBICONV:  $LTLIBICONV
+  Libunistring:       $ac_cv_libunistring
+            VERSION:  $LIBUNISTRING_VERSION
+     LTLIBUNISTRING:  $LTLIBUNISTRING
+
+  Version script:     $have_ld_version_script
+
+  Valgrind:           $gl_cv_prog_valgrind_works $VALGRIND_PROGRAM $DEFAULT_VALGRINDFLAGS $VALGRINDFLAGS
 )

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/Makefile.am -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/Makefile.am Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/Makefile.in -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/Makefile.in Changed

@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2011-2022 Simon Josefsson
+# Copyright (C) 2011-2024 Simon Josefsson
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -104,8 +104,7 @@
 host_triplet = @host@
 subdir = doc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/unistring/m4/codeset.m4 \
-	$(top_srcdir)/unistring/m4/free.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/unistring/m4/free.m4 \
 	$(top_srcdir)/unistring/m4/gnulib-comp.m4 \
 	$(top_srcdir)/unistring/m4/host-cpu-c-abi.m4 \
 	$(top_srcdir)/unistring/m4/iconv.m4 \
@@ -119,15 +118,19 @@
 	$(top_srcdir)/unistring/m4/libunistring-optional.m4 \
 	$(top_srcdir)/unistring/m4/libunistring.m4 \
 	$(top_srcdir)/unistring/m4/localcharset.m4 \
+	$(top_srcdir)/unistring/m4/unictype_h.m4 \
+	$(top_srcdir)/unistring/m4/uninorm_h.m4 \
 	$(top_srcdir)/unistring/m4/wchar_h.m4 \
 	$(top_srcdir)/gl/m4/00gnulib.m4 \
 	$(top_srcdir)/gl/m4/__inline.m4 \
 	$(top_srcdir)/gl/m4/absolute-header.m4 \
 	$(top_srcdir)/gl/m4/alloca.m4 $(top_srcdir)/gl/m4/assert_h.m4 \
 	$(top_srcdir)/gl/m4/c-bool.m4 $(top_srcdir)/gl/m4/close.m4 \
+	$(top_srcdir)/gl/m4/codeset.m4 \
 	$(top_srcdir)/gl/m4/double-slash-root.m4 \
 	$(top_srcdir)/gl/m4/dup2.m4 $(top_srcdir)/gl/m4/eealloc.m4 \
 	$(top_srcdir)/gl/m4/errno_h.m4 $(top_srcdir)/gl/m4/error.m4 \
+	$(top_srcdir)/gl/m4/error_h.m4 \
 	$(top_srcdir)/gl/m4/extensions.m4 \
 	$(top_srcdir)/gl/m4/extern-inline.m4 \
 	$(top_srcdir)/gl/m4/fcntl-o.m4 $(top_srcdir)/gl/m4/fcntl.m4 \
@@ -142,12 +145,14 @@
 	$(top_srcdir)/gl/m4/inline.m4 $(top_srcdir)/gl/m4/largefile.m4 \
 	$(top_srcdir)/gl/m4/ld-output-def.m4 \
 	$(top_srcdir)/gl/m4/ld-version-script.m4 \
-	$(top_srcdir)/gl/m4/limits-h.m4 $(top_srcdir)/gl/m4/malloca.m4 \
+	$(top_srcdir)/gl/m4/limits-h.m4 \
+	$(top_srcdir)/gl/m4/locale-fr.m4 \
+	$(top_srcdir)/gl/m4/malloca.m4 \
 	$(top_srcdir)/gl/m4/manywarnings.m4 \
 	$(top_srcdir)/gl/m4/mode_t.m4 \
 	$(top_srcdir)/gl/m4/msvc-inval.m4 \
 	$(top_srcdir)/gl/m4/msvc-nothrow.m4 \
-	$(top_srcdir)/gl/m4/multiarch.m4 \
+	$(top_srcdir)/gl/m4/multiarch.m4 $(top_srcdir)/gl/m4/musl.m4 \
 	$(top_srcdir)/gl/m4/nocrash.m4 $(top_srcdir)/gl/m4/off_t.m4 \
 	$(top_srcdir)/gl/m4/open-cloexec.m4 \
 	$(top_srcdir)/gl/m4/open-slash.m4 $(top_srcdir)/gl/m4/open.m4 \
@@ -155,9 +160,9 @@
 	$(top_srcdir)/gl/m4/rawmemchr.m4 \
 	$(top_srcdir)/gl/m4/ssize_t.m4 \
 	$(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \
-	$(top_srcdir)/gl/m4/stdalign.m4 $(top_srcdir)/gl/m4/stdarg.m4 \
-	$(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \
-	$(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \
+	$(top_srcdir)/gl/m4/stdarg.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \
+	$(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \
+	$(top_srcdir)/gl/m4/stdlib_h.m4 \
 	$(top_srcdir)/gl/m4/strchrnul.m4 \
 	$(top_srcdir)/gl/m4/strerror.m4 \
 	$(top_srcdir)/gl/m4/string_h.m4 \
@@ -171,8 +176,7 @@
 	$(top_srcdir)/gl/m4/visibility.m4 \
 	$(top_srcdir)/gl/m4/warn-on-use.m4 \
 	$(top_srcdir)/gl/m4/warnings.m4 $(top_srcdir)/gl/m4/wchar_t.m4 \
-	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/year2038.m4 \
-	$(top_srcdir)/gl/m4/zzgnulib.m4 \
+	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/zzgnulib.m4 \
 	$(top_srcdir)/m4/ax_ac_append_to_file.m4 \
 	$(top_srcdir)/m4/ax_ac_print_to_file.m4 \
 	$(top_srcdir)/m4/ax_add_am_macro_static.m4 \
@@ -492,6 +496,7 @@
 GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@
 GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@
 GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@
+GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@
 GL_GNULIB_GETSUBOPT = @GL_GNULIB_GETSUBOPT@
 GL_GNULIB_GETUMASK = @GL_GNULIB_GETUMASK@
 GL_GNULIB_GETUSERSHELL = @GL_GNULIB_GETUSERSHELL@
@@ -521,6 +526,7 @@
 GL_GNULIB_MBSSPN = @GL_GNULIB_MBSSPN@
 GL_GNULIB_MBSSTR = @GL_GNULIB_MBSSTR@
 GL_GNULIB_MBSTOK_R = @GL_GNULIB_MBSTOK_R@
+GL_GNULIB_MBSTOWCS = @GL_GNULIB_MBSTOWCS@
 GL_GNULIB_MBTOWC = @GL_GNULIB_MBTOWC@
 GL_GNULIB_MDA_ACCESS = @GL_GNULIB_MDA_ACCESS@
 GL_GNULIB_MDA_CHDIR = @GL_GNULIB_MDA_CHDIR@
@@ -566,6 +572,7 @@
 GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@
 GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@
 GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@
+GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@
 GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@
 GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@
 GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@
@@ -603,6 +610,7 @@
 GL_GNULIB_PUTS = @GL_GNULIB_PUTS@
 GL_GNULIB_PWRITE = @GL_GNULIB_PWRITE@
 GL_GNULIB_QSORT_R = @GL_GNULIB_QSORT_R@
+GL_GNULIB_RAND = @GL_GNULIB_RAND@
 GL_GNULIB_RANDOM = @GL_GNULIB_RANDOM@
 GL_GNULIB_RANDOM_R = @GL_GNULIB_RANDOM_R@
 GL_GNULIB_RAWMEMCHR = @GL_GNULIB_RAWMEMCHR@
@@ -658,6 +666,7 @@
 GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@
 GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@
 GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@
+GL_GNULIB_TIME = @GL_GNULIB_TIME@
 GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@
 GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@
 GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@
@@ -735,6 +744,7 @@
 GL_UNISTRING_GNULIB_GETPAGESIZE = @GL_UNISTRING_GNULIB_GETPAGESIZE@
 GL_UNISTRING_GNULIB_GETPASS = @GL_UNISTRING_GNULIB_GETPASS@
 GL_UNISTRING_GNULIB_GETPASS_GNU = @GL_UNISTRING_GNULIB_GETPASS_GNU@
+GL_UNISTRING_GNULIB_GETPROGNAME = @GL_UNISTRING_GNULIB_GETPROGNAME@
 GL_UNISTRING_GNULIB_GETSUBOPT = @GL_UNISTRING_GNULIB_GETSUBOPT@
 GL_UNISTRING_GNULIB_GETUSERSHELL = @GL_UNISTRING_GNULIB_GETUSERSHELL@
 GL_UNISTRING_GNULIB_GRANTPT = @GL_UNISTRING_GNULIB_GRANTPT@
@@ -768,6 +778,8 @@
 GL_UNISTRING_GNULIB_MBSSPN = @GL_UNISTRING_GNULIB_MBSSPN@
 GL_UNISTRING_GNULIB_MBSSTR = @GL_UNISTRING_GNULIB_MBSSTR@
 GL_UNISTRING_GNULIB_MBSTOK_R = @GL_UNISTRING_GNULIB_MBSTOK_R@
+GL_UNISTRING_GNULIB_MBSTOWCS = @GL_UNISTRING_GNULIB_MBSTOWCS@
+GL_UNISTRING_GNULIB_MBSZERO = @GL_UNISTRING_GNULIB_MBSZERO@
 GL_UNISTRING_GNULIB_MBTOWC = @GL_UNISTRING_GNULIB_MBTOWC@
 GL_UNISTRING_GNULIB_MDA_ACCESS = @GL_UNISTRING_GNULIB_MDA_ACCESS@
 GL_UNISTRING_GNULIB_MDA_CHDIR = @GL_UNISTRING_GNULIB_MDA_CHDIR@
@@ -802,6 +814,7 @@
 GL_UNISTRING_GNULIB_MEMMEM = @GL_UNISTRING_GNULIB_MEMMEM@
 GL_UNISTRING_GNULIB_MEMPCPY = @GL_UNISTRING_GNULIB_MEMPCPY@
 GL_UNISTRING_GNULIB_MEMRCHR = @GL_UNISTRING_GNULIB_MEMRCHR@
+GL_UNISTRING_GNULIB_MEMSET_EXPLICIT = @GL_UNISTRING_GNULIB_MEMSET_EXPLICIT@
 GL_UNISTRING_GNULIB_MKDTEMP = @GL_UNISTRING_GNULIB_MKDTEMP@
 GL_UNISTRING_GNULIB_MKOSTEMP = @GL_UNISTRING_GNULIB_MKOSTEMP@
 GL_UNISTRING_GNULIB_MKOSTEMPS = @GL_UNISTRING_GNULIB_MKOSTEMPS@
@@ -817,6 +830,7 @@
 GL_UNISTRING_GNULIB_PUTENV = @GL_UNISTRING_GNULIB_PUTENV@
 GL_UNISTRING_GNULIB_PWRITE = @GL_UNISTRING_GNULIB_PWRITE@
 GL_UNISTRING_GNULIB_QSORT_R = @GL_UNISTRING_GNULIB_QSORT_R@
+GL_UNISTRING_GNULIB_RAND = @GL_UNISTRING_GNULIB_RAND@
 GL_UNISTRING_GNULIB_RANDOM = @GL_UNISTRING_GNULIB_RANDOM@
 GL_UNISTRING_GNULIB_RANDOM_R = @GL_UNISTRING_GNULIB_RANDOM_R@
 GL_UNISTRING_GNULIB_RAWMEMCHR = @GL_UNISTRING_GNULIB_RAWMEMCHR@
@@ -865,6 +879,141 @@
 GL_UNISTRING_GNULIB_SYSTEM_POSIX = @GL_UNISTRING_GNULIB_SYSTEM_POSIX@
 GL_UNISTRING_GNULIB_TRUNCATE = @GL_UNISTRING_GNULIB_TRUNCATE@
 GL_UNISTRING_GNULIB_TTYNAME_R = @GL_UNISTRING_GNULIB_TTYNAME_R@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE@
 GL_UNISTRING_GNULIB_UNISTD_H_GETOPT = @GL_UNISTRING_GNULIB_UNISTD_H_GETOPT@
 GL_UNISTRING_GNULIB_UNISTD_H_NONBLOCKING = @GL_UNISTRING_GNULIB_UNISTD_H_NONBLOCKING@
 GL_UNISTRING_GNULIB_UNISTD_H_SIGPIPE = @GL_UNISTRING_GNULIB_UNISTD_H_SIGPIPE@
@@ -903,6 +1052,7 @@
 GL_UNISTRING_GNULIB_WCTOB = @GL_UNISTRING_GNULIB_WCTOB@
 GL_UNISTRING_GNULIB_WCTOMB = @GL_UNISTRING_GNULIB_WCTOMB@
 GL_UNISTRING_GNULIB_WCWIDTH = @GL_UNISTRING_GNULIB_WCWIDTH@
+GL_UNISTRING_GNULIB_WGETCWD = @GL_UNISTRING_GNULIB_WGETCWD@
 GL_UNISTRING_GNULIB_WMEMCHR = @GL_UNISTRING_GNULIB_WMEMCHR@
 GL_UNISTRING_GNULIB_WMEMCMP = @GL_UNISTRING_GNULIB_WMEMCMP@
 GL_UNISTRING_GNULIB_WMEMCPY = @GL_UNISTRING_GNULIB_WMEMCPY@
@@ -914,7 +1064,6 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@
-GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
@@ -950,6 +1099,7 @@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
+HAVE_DECL_GETW = @HAVE_DECL_GETW@
 HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
 HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
 HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@
@@ -957,6 +1107,8 @@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
+HAVE_DECL_PROGRAM_INVOCATION_NAME = @HAVE_DECL_PROGRAM_INVOCATION_NAME@
+HAVE_DECL_PUTW = @HAVE_DECL_PUTW@
 HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
 HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@
@@ -978,6 +1130,9 @@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP3 = @HAVE_DUP3@
+HAVE_ERROR = @HAVE_ERROR@
+HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@
+HAVE_ERROR_H = @HAVE_ERROR_H@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
 HAVE_EXECVPE = @HAVE_EXECVPE@
 HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@
@@ -1004,10 +1159,13 @@
 HAVE_GETOPT_H = @HAVE_GETOPT_H@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETPASS = @HAVE_GETPASS@
+HAVE_GETPROGNAME = @HAVE_GETPROGNAME@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
 HAVE_GETUMASK = @HAVE_GETUMASK@
 HAVE_GRANTPT = @HAVE_GRANTPT@
 HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_IMAXABS = @HAVE_IMAXABS@
+HAVE_IMAXDIV = @HAVE_IMAXDIV@
 HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@
 HAVE_INITSTATE = @HAVE_INITSTATE@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -1026,6 +1184,7 @@
 HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
 HAVE_MBTOWC = @HAVE_MBTOWC@
 HAVE_MEMPCPY = @HAVE_MEMPCPY@
+HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@
 HAVE_MKDIRAT = @HAVE_MKDIRAT@
 HAVE_MKDTEMP = @HAVE_MKDTEMP@
 HAVE_MKFIFO = @HAVE_MKFIFO@
@@ -1101,6 +1260,7 @@
 HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@
 HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNISTRING_WOE32DLL_H = @HAVE_UNISTRING_WOE32DLL_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
 HAVE_USLEEP = @HAVE_USLEEP@
@@ -1162,6 +1322,10 @@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LCOV = @LCOV@
+LC_COLLATE_IMPLEMENTED = @LC_COLLATE_IMPLEMENTED@
+LC_MONETARY_IMPLEMENTED = @LC_MONETARY_IMPLEMENTED@
+LC_NUMERIC_IMPLEMENTED = @LC_NUMERIC_IMPLEMENTED@
+LC_TIME_IMPLEMENTED = @LC_TIME_IMPLEMENTED@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -1181,6 +1345,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
 LOG_VALGRIND = @LOG_VALGRIND@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
@@ -1201,6 +1366,7 @@
 NEXT_ASSERT_H = @NEXT_ASSERT_H@
 NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
+NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
@@ -1218,6 +1384,7 @@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
+NEXT_ERROR_H = @NEXT_ERROR_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
@@ -1273,6 +1440,9 @@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
+REPLACE_DUP3 = @REPLACE_DUP3@
+REPLACE_ERROR = @REPLACE_ERROR@
+REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@
 REPLACE_EXECL = @REPLACE_EXECL@
 REPLACE_EXECLE = @REPLACE_EXECLE@
 REPLACE_EXECLP = @REPLACE_EXECLP@
@@ -1281,10 +1451,12 @@
 REPLACE_EXECVP = @REPLACE_EXECVP@
 REPLACE_EXECVPE = @REPLACE_EXECVPE@
 REPLACE_FACCESSAT = @REPLACE_FACCESSAT@
+REPLACE_FCHDIR = @REPLACE_FCHDIR@
 REPLACE_FCHMODAT = @REPLACE_FCHMODAT@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
+REPLACE_FDATASYNC = @REPLACE_FDATASYNC@
 REPLACE_FDOPEN = @REPLACE_FDOPEN@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FFSLL = @REPLACE_FFSLL@
@@ -1306,16 +1478,22 @@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
 REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
 REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
+REPLACE_GETENTROPY = @REPLACE_GETENTROPY@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
+REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@
 REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETPASS = @REPLACE_GETPASS@
 REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@
+REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@
+REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@
 REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
+REPLACE_IMAXABS = @REPLACE_IMAXABS@
+REPLACE_IMAXDIV = @REPLACE_IMAXDIV@
 REPLACE_INITSTATE = @REPLACE_INITSTATE@
 REPLACE_ISATTY = @REPLACE_ISATTY@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
@@ -1333,14 +1511,20 @@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_MBSTOWCS = @REPLACE_MBSTOWCS@
 REPLACE_MBTOWC = @REPLACE_MBTOWC@
+REPLACE_MB_CUR_MAX = @REPLACE_MB_CUR_MAX@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
+REPLACE_MEMPCPY = @REPLACE_MEMPCPY@
+REPLACE_MEMSET_EXPLICIT = @REPLACE_MEMSET_EXPLICIT@
 REPLACE_MKDIR = @REPLACE_MKDIR@
 REPLACE_MKFIFO = @REPLACE_MKFIFO@
 REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@
 REPLACE_MKNOD = @REPLACE_MKNOD@
 REPLACE_MKNODAT = @REPLACE_MKNODAT@
+REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@
+REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@
 REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
 REPLACE_MKTIME = @REPLACE_MKTIME@
 REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
@@ -1349,8 +1533,10 @@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
 REPLACE_PERROR = @REPLACE_PERROR@
+REPLACE_PIPE2 = @REPLACE_PIPE2@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@
+REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
 REPLACE_PTSNAME = @REPLACE_PTSNAME@
@@ -1358,6 +1544,7 @@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
 REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RAND = @REPLACE_RAND@
 REPLACE_RANDOM = @REPLACE_RANDOM@
 REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
 REPLACE_READ = @REPLACE_READ@
@@ -1372,6 +1559,7 @@
 REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SETENV = @REPLACE_SETENV@
+REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@
 REPLACE_SETSTATE = @REPLACE_SETSTATE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
@@ -1379,6 +1567,7 @@
 REPLACE_STAT = @REPLACE_STAT@
 REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
+REPLACE_STPCPY = @REPLACE_STPCPY@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
 REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
@@ -1401,9 +1590,13 @@
 REPLACE_STRTOUL = @REPLACE_STRTOUL@
 REPLACE_STRTOULL = @REPLACE_STRTOULL@
 REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
+REPLACE_STRVERSCMP = @REPLACE_STRVERSCMP@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
+REPLACE_TIME = @REPLACE_TIME@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
+REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@
+REPLACE_TIMESPEC_GETRES = @REPLACE_TIMESPEC_GETRES@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
 REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
@@ -1420,21 +1613,26 @@
 REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@
 REPLACE_VSPRINTF = @REPLACE_VSPRINTF@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSCMP = @REPLACE_WCSCMP@
 REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
+REPLACE_WCSNCMP = @REPLACE_WCSNCMP@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
+REPLACE_WCSSTR = @REPLACE_WCSSTR@
 REPLACE_WCSTOK = @REPLACE_WCSTOK@
 REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
 REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+REPLACE_WMEMCMP = @REPLACE_WMEMCMP@
+REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@
 REPLACE_WRITE = @REPLACE_WRITE@
+REPLACE__EXIT = @REPLACE__EXIT@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
-STDALIGN_H = @STDALIGN_H@
 STDARG_H = @STDARG_H@
 STDCKDINT_H = @STDCKDINT_H@
 STDDEF_H = @STDDEF_H@
@@ -1457,6 +1655,8 @@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WERROR_CFLAGS = @WERROR_CFLAGS@
+WERROR_TESTS_CFLAGS = @WERROR_TESTS_CFLAGS@
 WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
 WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
@@ -2315,7 +2515,7 @@
 			-includefuncprefix \
 			-seeinfo $(PACKAGE) \
 			-verbatimcopying \
-			-copyright "2002-2022 Simon Josefsson" \
+			-copyright "2002-2024 Simon Josefsson" \
 			-function $$i \
 			$(GDOC_SRC) > man/$$i.3 && \
 		$(srcdir)/gdoc -texinfo -function $$i \

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/gdoc -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/gdoc Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/idn2.1 -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/idn2.1 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/libidn2.info -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/libidn2.info Changed

@@ -1,10 +1,10 @@
-This is libidn2.info, produced by makeinfo version 6.7 from
+This is libidn2.info, produced by makeinfo version 6.8 from
 libidn2.texi.
 
-This manual is for Libidn2 (version 2.3.4, 11 July 2022), an
+This manual is for Libidn2 (version 2.3.7, 13 January 2024), an
 implementation of IDNA2008/TR46 internationalized domain names.
 
-   Copyright © 2011–2022 Simon Josefsson
+   Copyright © 2011–2024 Simon Josefsson
 INFO-DIR-SECTION Software libraries
 START-INFO-DIR-ENTRY
 * libidn2: (libidn2).	Internationalized domain names (IDNA2008/TR46) processing.
@@ -21,10 +21,10 @@
 Libidn2
 *******
 
-This manual is for Libidn2 (version 2.3.4, 11 July 2022), an
+This manual is for Libidn2 (version 2.3.7, 13 January 2024), an
 implementation of IDNA2008/TR46 internationalized domain names.
 
-   Copyright © 2011–2022 Simon Josefsson
+   Copyright © 2011–2024 Simon Josefsson
 
 * Menu:
 
@@ -1143,31 +1143,31 @@
 
 &#x1f;
 Tag Table:
-Node: Top&#x7f;564
-Node: Introduction&#x7f;1121
-Node: Library Functions&#x7f;2324
-Ref: idn2_to_ascii_8z&#x7f;2891
-Ref: idn2_to_unicode_8z8z&#x7f;3862
-Ref: idn2_lookup_u8&#x7f;4434
-Ref: idn2_register_u8&#x7f;6521
-Ref: idn2_to_ascii_lz&#x7f;8406
-Ref: idn2_to_unicode_8zlz&#x7f;9456
-Ref: idn2_to_unicode_lzlz&#x7f;10122
-Ref: idn2_lookup_ul&#x7f;10839
-Ref: idn2_register_ul&#x7f;12559
-Ref: idn2_strerror&#x7f;15091
-Ref: idn2_strerror_name&#x7f;15435
-Ref: idn2_free&#x7f;18491
-Ref: idn2_check_version&#x7f;19224
-Node: Converting from libidn&#x7f;20444
-Node: Examples&#x7f;24495
-Node: ToASCII&#x7f;24942
-Node: ToUnicode&#x7f;26472
-Node: Lookup&#x7f;28000
-Node: Register&#x7f;29138
-Node: Invoking idn2&#x7f;30269
-Node: Interface Index&#x7f;37303
-Node: Concept Index&#x7f;38407
+Node: Top&#x7f;567
+Node: Introduction&#x7f;1127
+Node: Library Functions&#x7f;2330
+Ref: idn2_to_ascii_8z&#x7f;2897
+Ref: idn2_to_unicode_8z8z&#x7f;3868
+Ref: idn2_lookup_u8&#x7f;4440
+Ref: idn2_register_u8&#x7f;6527
+Ref: idn2_to_ascii_lz&#x7f;8412
+Ref: idn2_to_unicode_8zlz&#x7f;9462
+Ref: idn2_to_unicode_lzlz&#x7f;10128
+Ref: idn2_lookup_ul&#x7f;10845
+Ref: idn2_register_ul&#x7f;12565
+Ref: idn2_strerror&#x7f;15097
+Ref: idn2_strerror_name&#x7f;15441
+Ref: idn2_free&#x7f;18497
+Ref: idn2_check_version&#x7f;19230
+Node: Converting from libidn&#x7f;20450
+Node: Examples&#x7f;24501
+Node: ToASCII&#x7f;24948
+Node: ToUnicode&#x7f;26478
+Node: Lookup&#x7f;28006
+Node: Register&#x7f;29144
+Node: Invoking idn2&#x7f;30275
+Node: Interface Index&#x7f;37309
+Node: Concept Index&#x7f;38413
 &#x1f;
 End Tag Table

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/libidn2.texi -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/libidn2.texi Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/man/idn2_check_version.3 -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/man/idn2_check_version.3 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/man/idn2_free.3 -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/man/idn2_free.3 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/man/idn2_lookup_u8.3 -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/man/idn2_lookup_u8.3 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/man/idn2_lookup_ul.3 -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/man/idn2_lookup_ul.3 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/man/idn2_register_u8.3 -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/man/idn2_register_u8.3 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/man/idn2_register_ul.3 -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/man/idn2_register_ul.3 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/man/idn2_strerror.3 -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/man/idn2_strerror.3 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/man/idn2_strerror_name.3 -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/man/idn2_strerror_name.3 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/man/idn2_to_ascii_4i.3 -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/man/idn2_to_ascii_4i.3 Changed

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by gdoc.
-.TH "idn2_to_ascii_4i" 3 "2.3.4" "libidn2" "libidn2"
+.TH "idn2_to_ascii_4i" 3 "2.3.7" "libidn2" "libidn2"
 .SH NAME
 idn2_to_ascii_4i \- API function
 .SH SYNOPSIS
@@ -12,12 +12,11 @@
 .IP "size_t inlen" 12
 number of elements in  \fIinput\fP .
 .IP "char * output" 12
-output zero terminated string that must have room for at least 63 characters plus the terminating zero.
+output zero terminated string that must have room for at
+least 63 characters plus the terminating zero.
 .IP "int flags" 12
 optional \fBidn2_flags\fP to modify behaviour.
 .SH "DESCRIPTION"
-THIS FUNCTION HAS BEEN DEPRECATED DUE TO A DESIGN FLAW. USE \fBidn2_to_ascii_4i2()\fP INSTEAD !
-
 The ToASCII operation takes a sequence of Unicode code points that make
 up one domain label and transforms it into a sequence of code points in
 the ASCII range (0..7F). If ToASCII succeeds, the original sequence and
@@ -40,12 +39,16 @@
 non\-transitional processing is nowadays ubiquitous, when unsure, it is
 recommended to call this function with the \fBIDN2_NONTRANSITIONAL\fP
 and the \fBIDN2_NFC_INPUT\fP flags for compatibility with other software.
-
-Return value: Returns \fBIDN2_OK\fP on success, or error code.
+.SH "WARNING"
+With version 2.1.1 until before version 2.3.5 this
+function was deprecated in favor \fBidn2_to_ascii_4i2()\fP.  We still
+encourage you to use \fBidn2_to_ascii_4i2()\fP when appropriate.
+.SH "RETURNS"
+On successful conversion \fBIDN2_OK\fP is returned; if the
+output label would have been too long \fBIDN2_TOO_BIG_LABEL\fP is
+returned, or another error code is returned.
 .SH "SINCE"
 2.0.0
-.SH "DEPRECATED"
-2.1.1: Use \fBidn2_to_ascii_4i2()\fP.
 .SH "REPORTING BUGS"
 Report bugs to <help-libidn@gnu.org>.
 .br
@@ -54,7 +57,7 @@
 Libidn2 home page: https://www.gnu.org/software/libidn2/
 
 .SH COPYRIGHT
-Copyright \(co 2002-2022 Simon Josefsson.
+Copyright \(co 2002-2024 Simon Josefsson.
 .br
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/man/idn2_to_ascii_4i2.3 -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/man/idn2_to_ascii_4i2.3 Changed

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by gdoc.
-.TH "idn2_to_ascii_4i2" 3 "2.3.4" "libidn2" "libidn2"
+.TH "idn2_to_ascii_4i2" 3 "2.3.7" "libidn2" "libidn2"
 .SH NAME
 idn2_to_ascii_4i2 \- API function
 .SH SYNOPSIS
@@ -38,8 +38,10 @@
 non\-transitional processing is nowadays ubiquitous, when unsure, it is
 recommended to call this function with the \fBIDN2_NONTRANSITIONAL\fP
 and the \fBIDN2_NFC_INPUT\fP flags for compatibility with other software.
-
-Return value: Returns \fBIDN2_OK\fP on success, or error code.
+.SH "RETURNS"
+On successful conversion \fBIDN2_OK\fP is returned; if the
+output label would have been too long \fBIDN2_TOO_BIG_LABEL\fP is
+returned, or another error code is returned.
 .SH "SINCE"
 2.1.1
 .SH "REPORTING BUGS"
@@ -50,7 +52,7 @@
 Libidn2 home page: https://www.gnu.org/software/libidn2/
 
 .SH COPYRIGHT
-Copyright \(co 2002-2022 Simon Josefsson.
+Copyright \(co 2002-2024 Simon Josefsson.
 .br
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/man/idn2_to_ascii_4z.3 -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/man/idn2_to_ascii_4z.3 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/man/idn2_to_ascii_8z.3 -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/man/idn2_to_ascii_8z.3 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/man/idn2_to_ascii_lz.3 -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/man/idn2_to_ascii_lz.3 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/man/idn2_to_unicode_44i.3 -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/man/idn2_to_unicode_44i.3 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/man/idn2_to_unicode_4z4z.3 -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/man/idn2_to_unicode_4z4z.3 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/man/idn2_to_unicode_8z4z.3 -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/man/idn2_to_unicode_8z4z.3 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/man/idn2_to_unicode_8z8z.3 -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/man/idn2_to_unicode_8z8z.3 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/man/idn2_to_unicode_8zlz.3 -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/man/idn2_to_unicode_8zlz.3 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/man/idn2_to_unicode_lzlz.3 -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/man/idn2_to_unicode_lzlz.3 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/reference/Makefile.am -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/reference/Makefile.am Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/reference/Makefile.in -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/reference/Makefile.in Changed

@@ -113,8 +113,7 @@
 host_triplet = @host@
 subdir = doc/reference
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/unistring/m4/codeset.m4 \
-	$(top_srcdir)/unistring/m4/free.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/unistring/m4/free.m4 \
 	$(top_srcdir)/unistring/m4/gnulib-comp.m4 \
 	$(top_srcdir)/unistring/m4/host-cpu-c-abi.m4 \
 	$(top_srcdir)/unistring/m4/iconv.m4 \
@@ -128,15 +127,19 @@
 	$(top_srcdir)/unistring/m4/libunistring-optional.m4 \
 	$(top_srcdir)/unistring/m4/libunistring.m4 \
 	$(top_srcdir)/unistring/m4/localcharset.m4 \
+	$(top_srcdir)/unistring/m4/unictype_h.m4 \
+	$(top_srcdir)/unistring/m4/uninorm_h.m4 \
 	$(top_srcdir)/unistring/m4/wchar_h.m4 \
 	$(top_srcdir)/gl/m4/00gnulib.m4 \
 	$(top_srcdir)/gl/m4/__inline.m4 \
 	$(top_srcdir)/gl/m4/absolute-header.m4 \
 	$(top_srcdir)/gl/m4/alloca.m4 $(top_srcdir)/gl/m4/assert_h.m4 \
 	$(top_srcdir)/gl/m4/c-bool.m4 $(top_srcdir)/gl/m4/close.m4 \
+	$(top_srcdir)/gl/m4/codeset.m4 \
 	$(top_srcdir)/gl/m4/double-slash-root.m4 \
 	$(top_srcdir)/gl/m4/dup2.m4 $(top_srcdir)/gl/m4/eealloc.m4 \
 	$(top_srcdir)/gl/m4/errno_h.m4 $(top_srcdir)/gl/m4/error.m4 \
+	$(top_srcdir)/gl/m4/error_h.m4 \
 	$(top_srcdir)/gl/m4/extensions.m4 \
 	$(top_srcdir)/gl/m4/extern-inline.m4 \
 	$(top_srcdir)/gl/m4/fcntl-o.m4 $(top_srcdir)/gl/m4/fcntl.m4 \
@@ -151,12 +154,14 @@
 	$(top_srcdir)/gl/m4/inline.m4 $(top_srcdir)/gl/m4/largefile.m4 \
 	$(top_srcdir)/gl/m4/ld-output-def.m4 \
 	$(top_srcdir)/gl/m4/ld-version-script.m4 \
-	$(top_srcdir)/gl/m4/limits-h.m4 $(top_srcdir)/gl/m4/malloca.m4 \
+	$(top_srcdir)/gl/m4/limits-h.m4 \
+	$(top_srcdir)/gl/m4/locale-fr.m4 \
+	$(top_srcdir)/gl/m4/malloca.m4 \
 	$(top_srcdir)/gl/m4/manywarnings.m4 \
 	$(top_srcdir)/gl/m4/mode_t.m4 \
 	$(top_srcdir)/gl/m4/msvc-inval.m4 \
 	$(top_srcdir)/gl/m4/msvc-nothrow.m4 \
-	$(top_srcdir)/gl/m4/multiarch.m4 \
+	$(top_srcdir)/gl/m4/multiarch.m4 $(top_srcdir)/gl/m4/musl.m4 \
 	$(top_srcdir)/gl/m4/nocrash.m4 $(top_srcdir)/gl/m4/off_t.m4 \
 	$(top_srcdir)/gl/m4/open-cloexec.m4 \
 	$(top_srcdir)/gl/m4/open-slash.m4 $(top_srcdir)/gl/m4/open.m4 \
@@ -164,9 +169,9 @@
 	$(top_srcdir)/gl/m4/rawmemchr.m4 \
 	$(top_srcdir)/gl/m4/ssize_t.m4 \
 	$(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \
-	$(top_srcdir)/gl/m4/stdalign.m4 $(top_srcdir)/gl/m4/stdarg.m4 \
-	$(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \
-	$(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \
+	$(top_srcdir)/gl/m4/stdarg.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \
+	$(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \
+	$(top_srcdir)/gl/m4/stdlib_h.m4 \
 	$(top_srcdir)/gl/m4/strchrnul.m4 \
 	$(top_srcdir)/gl/m4/strerror.m4 \
 	$(top_srcdir)/gl/m4/string_h.m4 \
@@ -180,8 +185,7 @@
 	$(top_srcdir)/gl/m4/visibility.m4 \
 	$(top_srcdir)/gl/m4/warn-on-use.m4 \
 	$(top_srcdir)/gl/m4/warnings.m4 $(top_srcdir)/gl/m4/wchar_t.m4 \
-	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/year2038.m4 \
-	$(top_srcdir)/gl/m4/zzgnulib.m4 \
+	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/zzgnulib.m4 \
 	$(top_srcdir)/m4/ax_ac_append_to_file.m4 \
 	$(top_srcdir)/m4/ax_ac_print_to_file.m4 \
 	$(top_srcdir)/m4/ax_add_am_macro_static.m4 \
@@ -571,6 +575,7 @@
 GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@
 GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@
 GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@
+GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@
 GL_GNULIB_GETSUBOPT = @GL_GNULIB_GETSUBOPT@
 GL_GNULIB_GETUMASK = @GL_GNULIB_GETUMASK@
 GL_GNULIB_GETUSERSHELL = @GL_GNULIB_GETUSERSHELL@
@@ -600,6 +605,7 @@
 GL_GNULIB_MBSSPN = @GL_GNULIB_MBSSPN@
 GL_GNULIB_MBSSTR = @GL_GNULIB_MBSSTR@
 GL_GNULIB_MBSTOK_R = @GL_GNULIB_MBSTOK_R@
+GL_GNULIB_MBSTOWCS = @GL_GNULIB_MBSTOWCS@
 GL_GNULIB_MBTOWC = @GL_GNULIB_MBTOWC@
 GL_GNULIB_MDA_ACCESS = @GL_GNULIB_MDA_ACCESS@
 GL_GNULIB_MDA_CHDIR = @GL_GNULIB_MDA_CHDIR@
@@ -645,6 +651,7 @@
 GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@
 GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@
 GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@
+GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@
 GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@
 GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@
 GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@
@@ -682,6 +689,7 @@
 GL_GNULIB_PUTS = @GL_GNULIB_PUTS@
 GL_GNULIB_PWRITE = @GL_GNULIB_PWRITE@
 GL_GNULIB_QSORT_R = @GL_GNULIB_QSORT_R@
+GL_GNULIB_RAND = @GL_GNULIB_RAND@
 GL_GNULIB_RANDOM = @GL_GNULIB_RANDOM@
 GL_GNULIB_RANDOM_R = @GL_GNULIB_RANDOM_R@
 GL_GNULIB_RAWMEMCHR = @GL_GNULIB_RAWMEMCHR@
@@ -737,6 +745,7 @@
 GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@
 GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@
 GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@
+GL_GNULIB_TIME = @GL_GNULIB_TIME@
 GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@
 GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@
 GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@
@@ -814,6 +823,7 @@
 GL_UNISTRING_GNULIB_GETPAGESIZE = @GL_UNISTRING_GNULIB_GETPAGESIZE@
 GL_UNISTRING_GNULIB_GETPASS = @GL_UNISTRING_GNULIB_GETPASS@
 GL_UNISTRING_GNULIB_GETPASS_GNU = @GL_UNISTRING_GNULIB_GETPASS_GNU@
+GL_UNISTRING_GNULIB_GETPROGNAME = @GL_UNISTRING_GNULIB_GETPROGNAME@
 GL_UNISTRING_GNULIB_GETSUBOPT = @GL_UNISTRING_GNULIB_GETSUBOPT@
 GL_UNISTRING_GNULIB_GETUSERSHELL = @GL_UNISTRING_GNULIB_GETUSERSHELL@
 GL_UNISTRING_GNULIB_GRANTPT = @GL_UNISTRING_GNULIB_GRANTPT@
@@ -847,6 +857,8 @@
 GL_UNISTRING_GNULIB_MBSSPN = @GL_UNISTRING_GNULIB_MBSSPN@
 GL_UNISTRING_GNULIB_MBSSTR = @GL_UNISTRING_GNULIB_MBSSTR@
 GL_UNISTRING_GNULIB_MBSTOK_R = @GL_UNISTRING_GNULIB_MBSTOK_R@
+GL_UNISTRING_GNULIB_MBSTOWCS = @GL_UNISTRING_GNULIB_MBSTOWCS@
+GL_UNISTRING_GNULIB_MBSZERO = @GL_UNISTRING_GNULIB_MBSZERO@
 GL_UNISTRING_GNULIB_MBTOWC = @GL_UNISTRING_GNULIB_MBTOWC@
 GL_UNISTRING_GNULIB_MDA_ACCESS = @GL_UNISTRING_GNULIB_MDA_ACCESS@
 GL_UNISTRING_GNULIB_MDA_CHDIR = @GL_UNISTRING_GNULIB_MDA_CHDIR@
@@ -881,6 +893,7 @@
 GL_UNISTRING_GNULIB_MEMMEM = @GL_UNISTRING_GNULIB_MEMMEM@
 GL_UNISTRING_GNULIB_MEMPCPY = @GL_UNISTRING_GNULIB_MEMPCPY@
 GL_UNISTRING_GNULIB_MEMRCHR = @GL_UNISTRING_GNULIB_MEMRCHR@
+GL_UNISTRING_GNULIB_MEMSET_EXPLICIT = @GL_UNISTRING_GNULIB_MEMSET_EXPLICIT@
 GL_UNISTRING_GNULIB_MKDTEMP = @GL_UNISTRING_GNULIB_MKDTEMP@
 GL_UNISTRING_GNULIB_MKOSTEMP = @GL_UNISTRING_GNULIB_MKOSTEMP@
 GL_UNISTRING_GNULIB_MKOSTEMPS = @GL_UNISTRING_GNULIB_MKOSTEMPS@
@@ -896,6 +909,7 @@
 GL_UNISTRING_GNULIB_PUTENV = @GL_UNISTRING_GNULIB_PUTENV@
 GL_UNISTRING_GNULIB_PWRITE = @GL_UNISTRING_GNULIB_PWRITE@
 GL_UNISTRING_GNULIB_QSORT_R = @GL_UNISTRING_GNULIB_QSORT_R@
+GL_UNISTRING_GNULIB_RAND = @GL_UNISTRING_GNULIB_RAND@
 GL_UNISTRING_GNULIB_RANDOM = @GL_UNISTRING_GNULIB_RANDOM@
 GL_UNISTRING_GNULIB_RANDOM_R = @GL_UNISTRING_GNULIB_RANDOM_R@
 GL_UNISTRING_GNULIB_RAWMEMCHR = @GL_UNISTRING_GNULIB_RAWMEMCHR@
@@ -944,6 +958,141 @@
 GL_UNISTRING_GNULIB_SYSTEM_POSIX = @GL_UNISTRING_GNULIB_SYSTEM_POSIX@
 GL_UNISTRING_GNULIB_TRUNCATE = @GL_UNISTRING_GNULIB_TRUNCATE@
 GL_UNISTRING_GNULIB_TTYNAME_R = @GL_UNISTRING_GNULIB_TTYNAME_R@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE@
 GL_UNISTRING_GNULIB_UNISTD_H_GETOPT = @GL_UNISTRING_GNULIB_UNISTD_H_GETOPT@
 GL_UNISTRING_GNULIB_UNISTD_H_NONBLOCKING = @GL_UNISTRING_GNULIB_UNISTD_H_NONBLOCKING@
 GL_UNISTRING_GNULIB_UNISTD_H_SIGPIPE = @GL_UNISTRING_GNULIB_UNISTD_H_SIGPIPE@
@@ -982,6 +1131,7 @@
 GL_UNISTRING_GNULIB_WCTOB = @GL_UNISTRING_GNULIB_WCTOB@
 GL_UNISTRING_GNULIB_WCTOMB = @GL_UNISTRING_GNULIB_WCTOMB@
 GL_UNISTRING_GNULIB_WCWIDTH = @GL_UNISTRING_GNULIB_WCWIDTH@
+GL_UNISTRING_GNULIB_WGETCWD = @GL_UNISTRING_GNULIB_WGETCWD@
 GL_UNISTRING_GNULIB_WMEMCHR = @GL_UNISTRING_GNULIB_WMEMCHR@
 GL_UNISTRING_GNULIB_WMEMCMP = @GL_UNISTRING_GNULIB_WMEMCMP@
 GL_UNISTRING_GNULIB_WMEMCPY = @GL_UNISTRING_GNULIB_WMEMCPY@
@@ -993,7 +1143,6 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@
-GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
@@ -1029,6 +1178,7 @@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
+HAVE_DECL_GETW = @HAVE_DECL_GETW@
 HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
 HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
 HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@
@@ -1036,6 +1186,8 @@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
+HAVE_DECL_PROGRAM_INVOCATION_NAME = @HAVE_DECL_PROGRAM_INVOCATION_NAME@
+HAVE_DECL_PUTW = @HAVE_DECL_PUTW@
 HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
 HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@
@@ -1057,6 +1209,9 @@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP3 = @HAVE_DUP3@
+HAVE_ERROR = @HAVE_ERROR@
+HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@
+HAVE_ERROR_H = @HAVE_ERROR_H@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
 HAVE_EXECVPE = @HAVE_EXECVPE@
 HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@
@@ -1083,10 +1238,13 @@
 HAVE_GETOPT_H = @HAVE_GETOPT_H@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETPASS = @HAVE_GETPASS@
+HAVE_GETPROGNAME = @HAVE_GETPROGNAME@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
 HAVE_GETUMASK = @HAVE_GETUMASK@
 HAVE_GRANTPT = @HAVE_GRANTPT@
 HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_IMAXABS = @HAVE_IMAXABS@
+HAVE_IMAXDIV = @HAVE_IMAXDIV@
 HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@
 HAVE_INITSTATE = @HAVE_INITSTATE@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -1105,6 +1263,7 @@
 HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
 HAVE_MBTOWC = @HAVE_MBTOWC@
 HAVE_MEMPCPY = @HAVE_MEMPCPY@
+HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@
 HAVE_MKDIRAT = @HAVE_MKDIRAT@
 HAVE_MKDTEMP = @HAVE_MKDTEMP@
 HAVE_MKFIFO = @HAVE_MKFIFO@
@@ -1180,6 +1339,7 @@
 HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@
 HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNISTRING_WOE32DLL_H = @HAVE_UNISTRING_WOE32DLL_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
 HAVE_USLEEP = @HAVE_USLEEP@
@@ -1241,6 +1401,10 @@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LCOV = @LCOV@
+LC_COLLATE_IMPLEMENTED = @LC_COLLATE_IMPLEMENTED@
+LC_MONETARY_IMPLEMENTED = @LC_MONETARY_IMPLEMENTED@
+LC_NUMERIC_IMPLEMENTED = @LC_NUMERIC_IMPLEMENTED@
+LC_TIME_IMPLEMENTED = @LC_TIME_IMPLEMENTED@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -1260,6 +1424,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
 LOG_VALGRIND = @LOG_VALGRIND@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
@@ -1280,6 +1445,7 @@
 NEXT_ASSERT_H = @NEXT_ASSERT_H@
 NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
+NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
@@ -1297,6 +1463,7 @@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
+NEXT_ERROR_H = @NEXT_ERROR_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
@@ -1352,6 +1519,9 @@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
+REPLACE_DUP3 = @REPLACE_DUP3@
+REPLACE_ERROR = @REPLACE_ERROR@
+REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@
 REPLACE_EXECL = @REPLACE_EXECL@
 REPLACE_EXECLE = @REPLACE_EXECLE@
 REPLACE_EXECLP = @REPLACE_EXECLP@
@@ -1360,10 +1530,12 @@
 REPLACE_EXECVP = @REPLACE_EXECVP@
 REPLACE_EXECVPE = @REPLACE_EXECVPE@
 REPLACE_FACCESSAT = @REPLACE_FACCESSAT@
+REPLACE_FCHDIR = @REPLACE_FCHDIR@
 REPLACE_FCHMODAT = @REPLACE_FCHMODAT@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
+REPLACE_FDATASYNC = @REPLACE_FDATASYNC@
 REPLACE_FDOPEN = @REPLACE_FDOPEN@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FFSLL = @REPLACE_FFSLL@
@@ -1385,16 +1557,22 @@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
 REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
 REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
+REPLACE_GETENTROPY = @REPLACE_GETENTROPY@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
+REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@
 REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETPASS = @REPLACE_GETPASS@
 REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@
+REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@
+REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@
 REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
+REPLACE_IMAXABS = @REPLACE_IMAXABS@
+REPLACE_IMAXDIV = @REPLACE_IMAXDIV@
 REPLACE_INITSTATE = @REPLACE_INITSTATE@
 REPLACE_ISATTY = @REPLACE_ISATTY@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
@@ -1412,14 +1590,20 @@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_MBSTOWCS = @REPLACE_MBSTOWCS@
 REPLACE_MBTOWC = @REPLACE_MBTOWC@
+REPLACE_MB_CUR_MAX = @REPLACE_MB_CUR_MAX@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
+REPLACE_MEMPCPY = @REPLACE_MEMPCPY@
+REPLACE_MEMSET_EXPLICIT = @REPLACE_MEMSET_EXPLICIT@
 REPLACE_MKDIR = @REPLACE_MKDIR@
 REPLACE_MKFIFO = @REPLACE_MKFIFO@
 REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@
 REPLACE_MKNOD = @REPLACE_MKNOD@
 REPLACE_MKNODAT = @REPLACE_MKNODAT@
+REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@
+REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@
 REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
 REPLACE_MKTIME = @REPLACE_MKTIME@
 REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
@@ -1428,8 +1612,10 @@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
 REPLACE_PERROR = @REPLACE_PERROR@
+REPLACE_PIPE2 = @REPLACE_PIPE2@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@
+REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
 REPLACE_PTSNAME = @REPLACE_PTSNAME@
@@ -1437,6 +1623,7 @@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
 REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RAND = @REPLACE_RAND@
 REPLACE_RANDOM = @REPLACE_RANDOM@
 REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
 REPLACE_READ = @REPLACE_READ@
@@ -1451,6 +1638,7 @@
 REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SETENV = @REPLACE_SETENV@
+REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@
 REPLACE_SETSTATE = @REPLACE_SETSTATE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
@@ -1458,6 +1646,7 @@
 REPLACE_STAT = @REPLACE_STAT@
 REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
+REPLACE_STPCPY = @REPLACE_STPCPY@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
 REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
@@ -1480,9 +1669,13 @@
 REPLACE_STRTOUL = @REPLACE_STRTOUL@
 REPLACE_STRTOULL = @REPLACE_STRTOULL@
 REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
+REPLACE_STRVERSCMP = @REPLACE_STRVERSCMP@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
+REPLACE_TIME = @REPLACE_TIME@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
+REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@
+REPLACE_TIMESPEC_GETRES = @REPLACE_TIMESPEC_GETRES@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
 REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
@@ -1499,21 +1692,26 @@
 REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@
 REPLACE_VSPRINTF = @REPLACE_VSPRINTF@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSCMP = @REPLACE_WCSCMP@
 REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
+REPLACE_WCSNCMP = @REPLACE_WCSNCMP@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
+REPLACE_WCSSTR = @REPLACE_WCSSTR@
 REPLACE_WCSTOK = @REPLACE_WCSTOK@
 REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
 REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+REPLACE_WMEMCMP = @REPLACE_WMEMCMP@
+REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@
 REPLACE_WRITE = @REPLACE_WRITE@
+REPLACE__EXIT = @REPLACE__EXIT@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
-STDALIGN_H = @STDALIGN_H@
 STDARG_H = @STDARG_H@
 STDCKDINT_H = @STDCKDINT_H@
 STDDEF_H = @STDDEF_H@
@@ -1536,6 +1734,8 @@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WERROR_CFLAGS = @WERROR_CFLAGS@
+WERROR_TESTS_CFLAGS = @WERROR_TESTS_CFLAGS@
 WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
 WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
@@ -1659,7 +1859,7 @@
 
 # Header files or dirs to ignore when scanning. Use base file/dir names
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
-IGNORE_HFILES = bidi.h context.h data.h idna.h punycode.h tables.h tr46map.h
+IGNORE_HFILES = bidi.h context.h data.h idna.h tables.h tr46map.h
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/reference/html/api-index-2.1.1.html -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/reference/html/api-index-2.1.1.html Changed

@@ -7,6 +7,7 @@
 <link rel="home" href="index.html" title="Libidn2 Reference Manual">
 <link rel="up" href="index.html" title="Libidn2 Reference Manual">
 <link rel="prev" href="api-index-2.0.0.html" title="Index of new API in 2.0.0">
+<link rel="next" href="api-index-2.3.5.html" title="Index of new API in 2.3.5">
 <meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
@@ -16,7 +17,7 @@
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
 <td><a accesskey="p" href="api-index-2.0.0.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
-<td><img src="right-insensitive.png" width="16" height="16" border="0"></td>
+<td><a accesskey="n" href="api-index-2.3.5.html"><img src="right.png" width="16" height="16" border="0" alt="Next"></a></td>
 </tr></table>
 <div class="index">
 <div class="titlepage"><div><div><h1 class="title">

_service:tar_scm:libidn2-2.3.7.tar.gz/doc/reference/html/api-index-2.3.5.html Added

@@ -0,0 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Index of new API in 2.3.5: Libidn2 Reference Manual</title>
+<meta name="generator" content="DocBook XSL Stylesheets Vsnapshot">
+<link rel="home" href="index.html" title="Libidn2 Reference Manual">
+<link rel="up" href="index.html" title="Libidn2 Reference Manual">
+<link rel="prev" href="api-index-2.1.1.html" title="Index of new API in 2.1.1">
+<meta name="generator" content="GTK-Doc V1.33.1 (XML mode)">
+<link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
+<td width="100%" align="left" class="shortcuts"><span id="nav_index"><a class="shortcut" href="#idxD">D</a></span></td>
+<td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
+<td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
+<td><a accesskey="p" href="api-index-2.1.1.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
+<td><img src="right-insensitive.png" width="16" height="16" border="0"></td>
+</tr></table>
+<div class="index">
+<div class="titlepage"><div><div><h1 class="title">
+<a name="api-index-2.3.5"></a>Index of new API in 2.3.5</h1></div></div></div>
+<a name="idx"></a><a name="idxD"></a><h3 class="title">D</h3>
+<dt>
+<a class="link" href="libidn2-idn2.h.html#idn2-punycode-decode" title="idn2_punycode_decode ()">idn2_punycode_decode</a>, function in <a class="link" href="libidn2-idn2.h.html" title="idn2.h">idn2.h</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libidn2-idn2.h.html#idn2-punycode-encode" title="idn2_punycode_encode ()">idn2_punycode_encode</a>, function in <a class="link" href="libidn2-idn2.h.html" title="idn2.h">idn2.h</a>
+</dt>
+<dd></dd>
+</div>
+<div class="footer">
+<hr>Generated by GTK-Doc V1.33.1</div>
+</body>
+</html>
\ No newline at end of file

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/reference/html/api-index-deprecated.html -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/reference/html/api-index-deprecated.html Changed

@@ -13,7 +13,7 @@
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="5"><tr valign="middle">
-<td width="100%" align="left" class="shortcuts"><span id="nav_index"><a class="shortcut" href="#idxD">D</a></span></td>
+<td width="100%" align="left" class="shortcuts"></td>
 <td><a accesskey="h" href="index.html"><img src="home.png" width="16" height="16" border="0" alt="Home"></a></td>
 <td><img src="up-insensitive.png" width="16" height="16" border="0"></td>
 <td><a accesskey="p" href="api-index-full.html"><img src="left.png" width="16" height="16" border="0" alt="Prev"></a></td>
@@ -22,11 +22,7 @@
 <div class="index">
 <div class="titlepage"><div><div><h1 class="title">
 <a name="api-index-deprecated"></a>Index of deprecated API</h1></div></div></div>
-<a name="idx"></a><a name="idxD"></a><h3 class="title">D</h3>
-<dt>
-<a class="link" href="libidn2-idn2.h.html#idn2-to-ascii-4i" title="idn2_to_ascii_4i ()">idn2_to_ascii_4i</a>, function in <a class="link" href="libidn2-idn2.h.html" title="idn2.h">idn2.h</a>
-</dt>
-<dd></dd>
+<a name="idx"></a>
 </div>
 <div class="footer">
 <hr>Generated by GTK-Doc V1.33.1</div>

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/reference/html/api-index-full.html -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/reference/html/api-index-full.html Changed

@@ -54,6 +54,14 @@
 </dt>
 <dd></dd>
 <dt>
+<a class="link" href="libidn2-idn2.h.html#idn2-punycode-decode" title="idn2_punycode_decode ()">idn2_punycode_decode</a>, function in <a class="link" href="libidn2-idn2.h.html" title="idn2.h">idn2.h</a>
+</dt>
+<dd></dd>
+<dt>
+<a class="link" href="libidn2-idn2.h.html#idn2-punycode-encode" title="idn2_punycode_encode ()">idn2_punycode_encode</a>, function in <a class="link" href="libidn2-idn2.h.html" title="idn2.h">idn2.h</a>
+</dt>
+<dd></dd>
+<dt>
 <a class="link" href="libidn2-idn2.h.html#idn2-rc" title="enum idn2_rc">idn2_rc</a>, enum in <a class="link" href="libidn2-idn2.h.html" title="idn2.h">idn2.h</a>
 </dt>
 <dd></dd>
@@ -143,10 +151,6 @@
 </dt>
 <dd></dd>
 <dt>
-<a class="link" href="libidn2-idn2.h.html#G-GNUC-DEPRECATED:CAPS" title="G_GNUC_DEPRECATED">G_GNUC_DEPRECATED</a>, macro in <a class="link" href="libidn2-idn2.h.html" title="idn2.h">idn2.h</a>
-</dt>
-<dd></dd>
-<dt>
 <a class="link" href="libidn2-idn2.h.html#G-GNUC-IDN2-ATTRIBUTE-CONST:CAPS" title="G_GNUC_IDN2_ATTRIBUTE_CONST">G_GNUC_IDN2_ATTRIBUTE_CONST</a>, macro in <a class="link" href="libidn2-idn2.h.html" title="idn2.h">idn2.h</a>
 </dt>
 <dd></dd>

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/reference/html/home.png -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/reference/html/home.png Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/reference/html/index.html -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/reference/html/index.html Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/reference/html/left-insensitive.png -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/reference/html/left-insensitive.png Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/reference/html/left.png -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/reference/html/left.png Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/reference/html/libidn2-idn2.h.html -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/reference/html/libidn2-idn2.h.html Changed

@@ -166,6 +166,22 @@
 </td>
 </tr>
 <tr>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="libidn2-idn2.h.html#idn2-punycode-encode" title="idn2_punycode_encode ()">idn2_punycode_encode</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
+<td class="function_type">
+<span class="returnvalue">int</span>
+</td>
+<td class="function_name">
+<a class="link" href="libidn2-idn2.h.html#idn2-punycode-decode" title="idn2_punycode_decode ()">idn2_punycode_decode</a> <span class="c_punctuation">()</span>
+</td>
+</tr>
+<tr>
 <td class="function_type">const <span class="returnvalue">char</span> *
 </td>
 <td class="function_name">
@@ -215,10 +231,6 @@
 </tr>
 <tr>
 <td class="define_keyword">#define</td>
-<td class="function_name"><a class="link" href="libidn2-idn2.h.html#G-GNUC-DEPRECATED:CAPS" title="G_GNUC_DEPRECATED">G_GNUC_DEPRECATED</a></td>
-</tr>
-<tr>
-<td class="define_keyword">#define</td>
 <td class="function_name"><a class="link" href="libidn2-idn2.h.html#G-GNUC-UNUSED:CAPS" title="G_GNUC_UNUSED">G_GNUC_UNUSED</a></td>
 </tr>
 <tr>
@@ -585,11 +597,6 @@
                   <em class="parameter"><code><span class="type">size_t</span> inlen</code></em>,
                   <em class="parameter"><code><span class="type">char</span> *output</code></em>,
                   <em class="parameter"><code><span class="type">int</span> flags</code></em>);</pre>
-<div class="warning">
-<p><code class="literal">idn2_to_ascii_4i</code> has been deprecated since version 2.1.1 and should not be used in newly-written code.</p>
-<p>Use <a class="link" href="libidn2-idn2.h.html#idn2-to-ascii-4i2" title="idn2_to_ascii_4i2 ()"><code class="function">idn2_to_ascii_4i2()</code></a>.</p>
-</div>
-<p>THIS FUNCTION HAS BEEN DEPRECATED DUE TO A DESIGN FLAW. USE <a class="link" href="libidn2-idn2.h.html#idn2-to-ascii-4i2" title="idn2_to_ascii_4i2 ()"><code class="function">idn2_to_ascii_4i2()</code></a> INSTEAD !</p>
 <p>The ToASCII operation takes a sequence of Unicode code points that make
 up one domain label and transforms it into a sequence of code points in
 the ASCII range (0..7F). If ToASCII succeeds, the original sequence and
@@ -608,6 +615,9 @@
 non-transitional processing is nowadays ubiquitous, when unsure, it is
 recommended to call this function with the <a class="link" href="libidn2-idn2.h.html#IDN2-NONTRANSITIONAL:CAPS"><code class="literal">IDN2_NONTRANSITIONAL</code></a>
 and the <a class="link" href="libidn2-idn2.h.html#IDN2-NFC-INPUT:CAPS"><code class="literal">IDN2_NFC_INPUT</code></a> flags for compatibility with other software.</p>
+<p>Warning: With version 2.1.1 until before version 2.3.5 this
+function was deprecated in favor <a class="link" href="libidn2-idn2.h.html#idn2-to-ascii-4i2" title="idn2_to_ascii_4i2 ()"><code class="function">idn2_to_ascii_4i2()</code></a>.  We still
+encourage you to use <a class="link" href="libidn2-idn2.h.html#idn2-to-ascii-4i2" title="idn2_to_ascii_4i2 ()"><code class="function">idn2_to_ascii_4i2()</code></a> when appropriate.</p>
 <div class="refsect3">
 <a name="idn2-to-ascii-4i.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -630,7 +640,8 @@
 </tr>
 <tr>
 <td class="parameter_name"><p>output</p></td>
-<td class="parameter_description"><p>output zero terminated string that must have room for at least 63 characters plus the terminating zero.</p></td>
+<td class="parameter_description"><p>output zero terminated string that must have room for at
+least 63 characters plus the terminating zero.</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -643,7 +654,9 @@
 </div>
 <div class="refsect3">
 <a name="idn2-to-ascii-4i.returns"></a><h4>Returns</h4>
-<p> Returns <a class="link" href="libidn2-idn2.h.html#IDN2-OK:CAPS"><code class="literal">IDN2_OK</code></a> on success, or error code.</p>
+<p> On successful conversion <a class="link" href="libidn2-idn2.h.html#IDN2-OK:CAPS"><code class="literal">IDN2_OK</code></a> is returned; if the
+output label would have been too long <a class="link" href="libidn2-idn2.h.html#IDN2-TOO-BIG-LABEL:CAPS"><code class="literal">IDN2_TOO_BIG_LABEL</code></a> is
+returned, or another error code is returned.</p>
 </div>
 <p class="since">Since: <a class="link" href="api-index-2.0.0.html" title="Index of new API in 2.0.0">2.0.0</a></p>
 </div>
@@ -708,7 +721,9 @@
 </div>
 <div class="refsect3">
 <a name="idn2-to-ascii-4i2.returns"></a><h4>Returns</h4>
-<p> Returns <a class="link" href="libidn2-idn2.h.html#IDN2-OK:CAPS"><code class="literal">IDN2_OK</code></a> on success, or error code.</p>
+<p> On successful conversion <a class="link" href="libidn2-idn2.h.html#IDN2-OK:CAPS"><code class="literal">IDN2_OK</code></a> is returned; if the
+output label would have been too long <a class="link" href="libidn2-idn2.h.html#IDN2-TOO-BIG-LABEL:CAPS"><code class="literal">IDN2_TOO_BIG_LABEL</code></a> is
+returned, or another error code is returned.</p>
 </div>
 <p class="since">Since: <a class="link" href="api-index-2.1.1.html" title="Index of new API in 2.1.1">2.1.1</a></p>
 </div>
@@ -1177,6 +1192,124 @@
 </div>
 <hr>
 <div class="refsect2">
+<a name="idn2-punycode-encode"></a><h3>idn2_punycode_encode ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+idn2_punycode_encode (<em class="parameter"><code>const <span class="type">uint32_t</span> *input</code></em>,
+                      <em class="parameter"><code><span class="type">size_t</span> input_length</code></em>,
+                      <em class="parameter"><code><span class="type">char</span> *output</code></em>,
+                      <em class="parameter"><code><span class="type">size_t</span> *output_length</code></em>);</pre>
+<p>Converts a sequence of code points to Punycode.</p>
+<p>Warning: Be aware that is rare for applications to need to perform
+  Punycode operations, and you should consider <a class="link" href="libidn2-idn2.h.html#idn2-to-ascii-8z" title="idn2_to_ascii_8z ()"><code class="function">idn2_to_ascii_8z()</code></a>,
+  <a class="link" href="libidn2-idn2.h.html#idn2-to-ascii-lz" title="idn2_to_ascii_lz ()"><code class="function">idn2_to_ascii_lz()</code></a>, <a class="link" href="libidn2-idn2.h.html#idn2-to-ascii-4z" title="idn2_to_ascii_4z ()"><code class="function">idn2_to_ascii_4z()</code></a> etc.</p>
+<div class="refsect3">
+<a name="idn2-punycode-encode.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>input</p></td>
+<td class="parameter_description"><p>array of input Unicode (UCS-4) code points</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>input_length</p></td>
+<td class="parameter_description"><p>number of code points in the <em class="parameter"><code>input</code></em>
+array.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>output</p></td>
+<td class="parameter_description"><p>output character array with ASCII code points.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>output_length</p></td>
+<td class="parameter_description"><p>size of <em class="parameter"><code>output</code></em>
+array</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="idn2-punycode-encode.returns"></a><h4>Returns</h4>
+<p> On successful encoding <a class="link" href="libidn2-idn2.h.html#IDN2-OK:CAPS"><code class="literal">IDN2_OK</code></a> is returned, or an error
+codes like <a class="link" href="libidn2-idn2.h.html#IDN2-PUNYCODE-BAD-INPUT:CAPS"><code class="literal">IDN2_PUNYCODE_BAD_INPUT</code></a>, <a class="link" href="libidn2-idn2.h.html#IDN2-PUNYCODE-BIG-OUTPUT:CAPS"><code class="literal">IDN2_PUNYCODE_BIG_OUTPUT</code></a>,
+or <a class="link" href="libidn2-idn2.h.html#IDN2-PUNYCODE-OVERFLOW:CAPS"><code class="literal">IDN2_PUNYCODE_OVERFLOW</code></a>.</p>
+</div>
+<p class="since">Since: <a class="link" href="api-index-2.3.5.html" title="Index of new API in 2.3.5">2.3.5</a></p>
+</div>
+<hr>
+<div class="refsect2">
+<a name="idn2-punycode-decode"></a><h3>idn2_punycode_decode ()</h3>
+<pre class="programlisting"><span class="returnvalue">int</span>
+idn2_punycode_decode (<em class="parameter"><code>const <span class="type">char</span> *input</code></em>,
+                      <em class="parameter"><code><span class="type">size_t</span> input_length</code></em>,
+                      <em class="parameter"><code><span class="type">uint32_t</span> *output</code></em>,
+                      <em class="parameter"><code><span class="type">size_t</span> *output_length</code></em>);</pre>
+<p>Converts Punycode to a sequence of code points.</p>
+<p>The decoder will never need to output more code points than the
+number of ASCII code points in the input, because of the way the
+encoding is defined.</p>
+<p>The number of code points output cannot exceed the maximum possible
+value of a uint32_t, even if the supplied <em class="parameter"><code>output_length</code></em>
+ is greater
+than that.</p>
+<p>Warning: Be aware that is rare for applications to need to perform
+  Punycode operations, and you should consider
+  <a class="link" href="libidn2-idn2.h.html#idn2-to-unicode-8z8z" title="idn2_to_unicode_8z8z ()"><code class="function">idn2_to_unicode_8z8z()</code></a>, <a class="link" href="libidn2-idn2.h.html#idn2-to-unicode-lzlz" title="idn2_to_unicode_lzlz ()"><code class="function">idn2_to_unicode_lzlz()</code></a> etc.</p>
+<div class="refsect3">
+<a name="idn2-punycode-decode.parameters"></a><h4>Parameters</h4>
+<div class="informaltable"><table class="informaltable" width="100%" border="0">
+<colgroup>
+<col width="150px" class="parameters_name">
+<col class="parameters_description">
+<col width="200px" class="parameters_annotations">
+</colgroup>
+<tbody>
+<tr>
+<td class="parameter_name"><p>input</p></td>
+<td class="parameter_description"><p>array of ASCII characters (0..7F)</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>input_length</p></td>
+<td class="parameter_description"><p>Number of ASCII characters in the <em class="parameter"><code>input</code></em>
+array.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>output</p></td>
+<td class="parameter_description"><p>output character array with ASCII code points.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+<tr>
+<td class="parameter_name"><p>output_length</p></td>
+<td class="parameter_description"><p>on input, guarantee that <em class="parameter"><code>output</code></em>
+has room
+for this many code points; on output, *<em class="parameter"><code>output_length</code></em>
+holds number of code points in <em class="parameter"><code>output</code></em>
+.</p></td>
+<td class="parameter_annotations"> </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+<div class="refsect3">
+<a name="idn2-punycode-decode.returns"></a><h4>Returns</h4>
+<p> On successful encoding <a class="link" href="libidn2-idn2.h.html#IDN2-OK:CAPS"><code class="literal">IDN2_OK</code></a> is returned, or an error
+codes like <a class="link" href="libidn2-idn2.h.html#IDN2-PUNYCODE-BAD-INPUT:CAPS"><code class="literal">IDN2_PUNYCODE_BAD_INPUT</code></a>, <a class="link" href="libidn2-idn2.h.html#IDN2-PUNYCODE-BIG-OUTPUT:CAPS"><code class="literal">IDN2_PUNYCODE_BIG_OUTPUT</code></a>,
+or <a class="link" href="libidn2-idn2.h.html#IDN2-PUNYCODE-OVERFLOW:CAPS"><code class="literal">IDN2_PUNYCODE_OVERFLOW</code></a>.</p>
+</div>
+<p class="since">Since: <a class="link" href="api-index-2.3.5.html" title="Index of new API in 2.3.5">2.3.5</a></p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="idn2-strerror"></a><h3>idn2_strerror ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *
 idn2_strerror (<em class="parameter"><code><span class="type">int</span> rc</code></em>);</pre>
@@ -1312,13 +1445,6 @@
 </div>
 <hr>
 <div class="refsect2">
-<a name="G-GNUC-DEPRECATED:CAPS"></a><h3>G_GNUC_DEPRECATED</h3>
-<pre class="programlisting">#  define G_GNUC_DEPRECATED __attribute__((deprecated))
-</pre>
-<p>Function attribute: Function is deprecated.</p>
-</div>
-<hr>
-<div class="refsect2">
 <a name="G-GNUC-UNUSED:CAPS"></a><h3>G_GNUC_UNUSED</h3>
 <pre class="programlisting">#  define G_GNUC_UNUSED __attribute__ ((__unused__))
 </pre>
@@ -1327,7 +1453,7 @@
 <hr>
 <div class="refsect2">
 <a name="IDN2-VERSION:CAPS"></a><h3>IDN2_VERSION</h3>
-<pre class="programlisting"># define IDN2_VERSION "2.3.4"
+<pre class="programlisting"># define IDN2_VERSION "2.3.7"
 </pre>
 <p>Pre-processor symbol with a string that describe the header file
 version number.  Used together with <a class="link" href="libidn2-idn2.h.html#idn2-check-version" title="idn2_check_version ()"><code class="function">idn2_check_version()</code></a> to verify
@@ -1336,7 +1462,7 @@
 <hr>
 <div class="refsect2">
 <a name="IDN2-VERSION-NUMBER:CAPS"></a><h3>IDN2_VERSION_NUMBER</h3>
-<pre class="programlisting"># define IDN2_VERSION_NUMBER 0x02030004
+<pre class="programlisting"># define IDN2_VERSION_NUMBER 0x02030007
 </pre>
 <p>Pre-processor symbol with a hexadecimal value describing the header
 file version number.  For example, when the header version is
@@ -1363,7 +1489,7 @@
 <hr>
 <div class="refsect2">
 <a name="IDN2-VERSION-PATCH:CAPS"></a><h3>IDN2_VERSION_PATCH</h3>
-<pre class="programlisting"># define IDN2_VERSION_PATCH 4
+<pre class="programlisting"># define IDN2_VERSION_PATCH 7
 </pre>
 <p>Pre-processor symbol for the patch level number (decimal).
 The version scheme is major.minor.patchlevel.</p>

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/reference/html/libidn2.devhelp2 -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/reference/html/libidn2.devhelp2 Changed

@@ -9,6 +9,7 @@
     <sub name="Index of new API in 0.1" link="api-index-0.1.html"/>
     <sub name="Index of new API in 2.0.0" link="api-index-2.0.0.html"/>
     <sub name="Index of new API in 2.1.1" link="api-index-2.1.1.html"/>
+    <sub name="Index of new API in 2.3.5" link="api-index-2.3.5.html"/>
   </chapters>
   <functions>
     <keyword type="macro" name="GCC_VERSION_AT_LEAST()" link="libidn2-idn2.h.html#GCC-VERSION-AT-LEAST:CAPS"/>
@@ -16,7 +17,7 @@
     <keyword type="function" name="idn2_register_u8 ()" link="libidn2-idn2.h.html#idn2-register-u8"/>
     <keyword type="function" name="idn2_lookup_ul ()" link="libidn2-idn2.h.html#idn2-lookup-ul" since="0.1"/>
     <keyword type="function" name="idn2_register_ul ()" link="libidn2-idn2.h.html#idn2-register-ul"/>
-    <keyword type="function" name="idn2_to_ascii_4i ()" link="libidn2-idn2.h.html#idn2-to-ascii-4i" deprecated="2.1.1: Use idn2_to_ascii_4i2()." since="2.0.0"/>
+    <keyword type="function" name="idn2_to_ascii_4i ()" link="libidn2-idn2.h.html#idn2-to-ascii-4i" since="2.0.0"/>
     <keyword type="function" name="idn2_to_ascii_4i2 ()" link="libidn2-idn2.h.html#idn2-to-ascii-4i2" since="2.1.1"/>
     <keyword type="function" name="idn2_to_ascii_4z ()" link="libidn2-idn2.h.html#idn2-to-ascii-4z" since="2.0.0"/>
     <keyword type="function" name="idn2_to_ascii_8z ()" link="libidn2-idn2.h.html#idn2-to-ascii-8z" since="2.0.0"/>
@@ -27,13 +28,14 @@
     <keyword type="function" name="idn2_to_unicode_8z8z ()" link="libidn2-idn2.h.html#idn2-to-unicode-8z8z" since="2.0.0"/>
     <keyword type="function" name="idn2_to_unicode_8zlz ()" link="libidn2-idn2.h.html#idn2-to-unicode-8zlz" since="2.0.0"/>
     <keyword type="function" name="idn2_to_unicode_lzlz ()" link="libidn2-idn2.h.html#idn2-to-unicode-lzlz" since="2.0.0"/>
+    <keyword type="function" name="idn2_punycode_encode ()" link="libidn2-idn2.h.html#idn2-punycode-encode" since="2.3.5"/>
+    <keyword type="function" name="idn2_punycode_decode ()" link="libidn2-idn2.h.html#idn2-punycode-decode" since="2.3.5"/>
     <keyword type="function" name="idn2_strerror ()" link="libidn2-idn2.h.html#idn2-strerror"/>
     <keyword type="function" name="idn2_strerror_name ()" link="libidn2-idn2.h.html#idn2-strerror-name"/>
     <keyword type="function" name="idn2_check_version ()" link="libidn2-idn2.h.html#idn2-check-version"/>
     <keyword type="function" name="idn2_free ()" link="libidn2-idn2.h.html#idn2-free"/>
     <keyword type="macro" name="G_GNUC_IDN2_ATTRIBUTE_PURE" link="libidn2-idn2.h.html#G-GNUC-IDN2-ATTRIBUTE-PURE:CAPS"/>
     <keyword type="macro" name="G_GNUC_IDN2_ATTRIBUTE_CONST" link="libidn2-idn2.h.html#G-GNUC-IDN2-ATTRIBUTE-CONST:CAPS"/>
-    <keyword type="macro" name="G_GNUC_DEPRECATED" link="libidn2-idn2.h.html#G-GNUC-DEPRECATED:CAPS"/>
     <keyword type="macro" name="G_GNUC_UNUSED" link="libidn2-idn2.h.html#G-GNUC-UNUSED:CAPS"/>
     <keyword type="macro" name="IDN2_VERSION" link="libidn2-idn2.h.html#IDN2-VERSION:CAPS"/>
     <keyword type="macro" name="IDN2_VERSION_NUMBER" link="libidn2-idn2.h.html#IDN2-VERSION-NUMBER:CAPS"/>

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/reference/html/right-insensitive.png -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/reference/html/right-insensitive.png Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/reference/html/right.png -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/reference/html/right.png Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/reference/html/style.css -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/reference/html/style.css Changed

@@ -455,28 +455,28 @@
   }
 }
 
-pre { line-height: 125%; margin: 0; }
-td.linenos pre { color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px; }
-span.linenos { color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px; }
-td.linenos pre.special { color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px; }
-span.linenos.special { color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px; }
+pre { line-height: 125%; }
+td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
+span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
+td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
+span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
 .hll { background-color: #ffffcc }
-.c { color: #408080; font-style: italic } /* Comment */
+.c { color: #3D7B7B; font-style: italic } /* Comment */
 .err { border: 1px solid #FF0000 } /* Error */
 .k { color: #008000; font-weight: bold } /* Keyword */
 .o { color: #666666 } /* Operator */
-.ch { color: #408080; font-style: italic } /* Comment.Hashbang */
-.cm { color: #408080; font-style: italic } /* Comment.Multiline */
-.cp { color: #BC7A00 } /* Comment.Preproc */
-.cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */
-.c1 { color: #408080; font-style: italic } /* Comment.Single */
-.cs { color: #408080; font-style: italic } /* Comment.Special */
+.ch { color: #3D7B7B; font-style: italic } /* Comment.Hashbang */
+.cm { color: #3D7B7B; font-style: italic } /* Comment.Multiline */
+.cp { color: #9C6500 } /* Comment.Preproc */
+.cpf { color: #3D7B7B; font-style: italic } /* Comment.PreprocFile */
+.c1 { color: #3D7B7B; font-style: italic } /* Comment.Single */
+.cs { color: #3D7B7B; font-style: italic } /* Comment.Special */
 .gd { color: #A00000 } /* Generic.Deleted */
 .ge { font-style: italic } /* Generic.Emph */
-.gr { color: #FF0000 } /* Generic.Error */
+.gr { color: #E40000 } /* Generic.Error */
 .gh { color: #000080; font-weight: bold } /* Generic.Heading */
-.gi { color: #00A000 } /* Generic.Inserted */
-.go { color: #888888 } /* Generic.Output */
+.gi { color: #008400 } /* Generic.Inserted */
+.go { color: #717171 } /* Generic.Output */
 .gp { color: #000080; font-weight: bold } /* Generic.Prompt */
 .gs { font-weight: bold } /* Generic.Strong */
 .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
@@ -489,15 +489,15 @@
 .kt { color: #B00040 } /* Keyword.Type */
 .m { color: #666666 } /* Literal.Number */
 .s { color: #BA2121 } /* Literal.String */
-.na { color: #7D9029 } /* Name.Attribute */
+.na { color: #687822 } /* Name.Attribute */
 .nb { color: #008000 } /* Name.Builtin */
 .nc { color: #0000FF; font-weight: bold } /* Name.Class */
 .no { color: #880000 } /* Name.Constant */
 .nd { color: #AA22FF } /* Name.Decorator */
-.ni { color: #999999; font-weight: bold } /* Name.Entity */
-.ne { color: #D2413A; font-weight: bold } /* Name.Exception */
+.ni { color: #717171; font-weight: bold } /* Name.Entity */
+.ne { color: #CB3F38; font-weight: bold } /* Name.Exception */
 .nf { color: #0000FF } /* Name.Function */
-.nl { color: #A0A000 } /* Name.Label */
+.nl { color: #767600 } /* Name.Label */
 .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
 .nt { color: #008000; font-weight: bold } /* Name.Tag */
 .nv { color: #19177C } /* Name.Variable */
@@ -514,11 +514,11 @@
 .dl { color: #BA2121 } /* Literal.String.Delimiter */
 .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */
 .s2 { color: #BA2121 } /* Literal.String.Double */
-.se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
+.se { color: #AA5D1F; font-weight: bold } /* Literal.String.Escape */
 .sh { color: #BA2121 } /* Literal.String.Heredoc */
-.si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
+.si { color: #A45A77; font-weight: bold } /* Literal.String.Interpol */
 .sx { color: #008000 } /* Literal.String.Other */
-.sr { color: #BB6688 } /* Literal.String.Regex */
+.sr { color: #A45A77 } /* Literal.String.Regex */
 .s1 { color: #BA2121 } /* Literal.String.Single */
 .ss { color: #19177C } /* Literal.String.Symbol */
 .bp { color: #008000 } /* Name.Builtin.Pseudo */

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/reference/html/up-insensitive.png -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/reference/html/up-insensitive.png Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/reference/html/up.png -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/reference/html/up.png Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/reference/libidn2-docs.xml -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/reference/libidn2-docs.xml Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/reference/libidn2-sections.txt -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/reference/libidn2-sections.txt Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/stamp-vti -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/stamp-vti Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/texi/idn2_to_ascii_4i.texi -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/texi/idn2_to_ascii_4i.texi Changed

@@ -5,12 +5,11 @@
 
 @var{inlen}: number of elements in  @code{input} .
 
-@var{output}: output zero terminated string that must have room for at least 63 characters plus the terminating zero.
+@var{output}: output zero terminated string that must have room for at
+least 63 characters plus the terminating zero.
 
 @var{flags}: optional @code{idn2_flags}  to modify behaviour.
 
-THIS FUNCTION HAS BEEN DEPRECATED DUE TO A DESIGN FLAW. USE @code{idn2_to_ascii_4i2()}  INSTEAD !
-
 The ToASCII operation takes a sequence of Unicode code points that make
 up one domain label and transforms it into a sequence of code points in
 the ASCII range (0..7F). If ToASCII succeeds, the original sequence and
@@ -34,10 +33,14 @@
 recommended to call this function with the @code{IDN2_NONTRANSITIONAL} 
 and the @code{IDN2_NFC_INPUT}  flags for compatibility with other software.
 
-Return value: Returns @code{IDN2_OK}  on success, or error code.
+@strong{Warning:} With version 2.1.1 until before version 2.3.5 this
+function was deprecated in favor @code{idn2_to_ascii_4i2()} .  We still
+encourage you to use @code{idn2_to_ascii_4i2()}  when appropriate.
 
-@strong{Since:} 2.0.0
+@strong{Returns:} On successful conversion @code{IDN2_OK}  is returned; if the
+output label would have been too long @code{IDN2_TOO_BIG_LABEL}  is
+returned, or another error code is returned.
 
-@strong{Deprecated:} 2.1.1: Use @code{idn2_to_ascii_4i2()} .
+@strong{Since:} 2.0.0
 @end deftypefun

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/texi/idn2_to_ascii_4i2.texi -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/texi/idn2_to_ascii_4i2.texi Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/doc/version.texi -> _service:tar_scm:libidn2-2.3.7.tar.gz/doc/version.texi Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/examples/Makefile.am -> _service:tar_scm:libidn2-2.3.7.tar.gz/examples/Makefile.am Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/examples/Makefile.in -> _service:tar_scm:libidn2-2.3.7.tar.gz/examples/Makefile.in Changed

@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2011-2022 Simon Josefsson
+# Copyright (C) 2011-2024 Simon Josefsson
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -107,8 +107,7 @@
 	example-toascii$(EXEEXT) example-tounicode$(EXEEXT)
 subdir = examples
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/unistring/m4/codeset.m4 \
-	$(top_srcdir)/unistring/m4/free.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/unistring/m4/free.m4 \
 	$(top_srcdir)/unistring/m4/gnulib-comp.m4 \
 	$(top_srcdir)/unistring/m4/host-cpu-c-abi.m4 \
 	$(top_srcdir)/unistring/m4/iconv.m4 \
@@ -122,15 +121,19 @@
 	$(top_srcdir)/unistring/m4/libunistring-optional.m4 \
 	$(top_srcdir)/unistring/m4/libunistring.m4 \
 	$(top_srcdir)/unistring/m4/localcharset.m4 \
+	$(top_srcdir)/unistring/m4/unictype_h.m4 \
+	$(top_srcdir)/unistring/m4/uninorm_h.m4 \
 	$(top_srcdir)/unistring/m4/wchar_h.m4 \
 	$(top_srcdir)/gl/m4/00gnulib.m4 \
 	$(top_srcdir)/gl/m4/__inline.m4 \
 	$(top_srcdir)/gl/m4/absolute-header.m4 \
 	$(top_srcdir)/gl/m4/alloca.m4 $(top_srcdir)/gl/m4/assert_h.m4 \
 	$(top_srcdir)/gl/m4/c-bool.m4 $(top_srcdir)/gl/m4/close.m4 \
+	$(top_srcdir)/gl/m4/codeset.m4 \
 	$(top_srcdir)/gl/m4/double-slash-root.m4 \
 	$(top_srcdir)/gl/m4/dup2.m4 $(top_srcdir)/gl/m4/eealloc.m4 \
 	$(top_srcdir)/gl/m4/errno_h.m4 $(top_srcdir)/gl/m4/error.m4 \
+	$(top_srcdir)/gl/m4/error_h.m4 \
 	$(top_srcdir)/gl/m4/extensions.m4 \
 	$(top_srcdir)/gl/m4/extern-inline.m4 \
 	$(top_srcdir)/gl/m4/fcntl-o.m4 $(top_srcdir)/gl/m4/fcntl.m4 \
@@ -145,12 +148,14 @@
 	$(top_srcdir)/gl/m4/inline.m4 $(top_srcdir)/gl/m4/largefile.m4 \
 	$(top_srcdir)/gl/m4/ld-output-def.m4 \
 	$(top_srcdir)/gl/m4/ld-version-script.m4 \
-	$(top_srcdir)/gl/m4/limits-h.m4 $(top_srcdir)/gl/m4/malloca.m4 \
+	$(top_srcdir)/gl/m4/limits-h.m4 \
+	$(top_srcdir)/gl/m4/locale-fr.m4 \
+	$(top_srcdir)/gl/m4/malloca.m4 \
 	$(top_srcdir)/gl/m4/manywarnings.m4 \
 	$(top_srcdir)/gl/m4/mode_t.m4 \
 	$(top_srcdir)/gl/m4/msvc-inval.m4 \
 	$(top_srcdir)/gl/m4/msvc-nothrow.m4 \
-	$(top_srcdir)/gl/m4/multiarch.m4 \
+	$(top_srcdir)/gl/m4/multiarch.m4 $(top_srcdir)/gl/m4/musl.m4 \
 	$(top_srcdir)/gl/m4/nocrash.m4 $(top_srcdir)/gl/m4/off_t.m4 \
 	$(top_srcdir)/gl/m4/open-cloexec.m4 \
 	$(top_srcdir)/gl/m4/open-slash.m4 $(top_srcdir)/gl/m4/open.m4 \
@@ -158,9 +163,9 @@
 	$(top_srcdir)/gl/m4/rawmemchr.m4 \
 	$(top_srcdir)/gl/m4/ssize_t.m4 \
 	$(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \
-	$(top_srcdir)/gl/m4/stdalign.m4 $(top_srcdir)/gl/m4/stdarg.m4 \
-	$(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \
-	$(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \
+	$(top_srcdir)/gl/m4/stdarg.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \
+	$(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \
+	$(top_srcdir)/gl/m4/stdlib_h.m4 \
 	$(top_srcdir)/gl/m4/strchrnul.m4 \
 	$(top_srcdir)/gl/m4/strerror.m4 \
 	$(top_srcdir)/gl/m4/string_h.m4 \
@@ -174,8 +179,7 @@
 	$(top_srcdir)/gl/m4/visibility.m4 \
 	$(top_srcdir)/gl/m4/warn-on-use.m4 \
 	$(top_srcdir)/gl/m4/warnings.m4 $(top_srcdir)/gl/m4/wchar_t.m4 \
-	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/year2038.m4 \
-	$(top_srcdir)/gl/m4/zzgnulib.m4 \
+	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/zzgnulib.m4 \
 	$(top_srcdir)/m4/ax_ac_append_to_file.m4 \
 	$(top_srcdir)/m4/ax_ac_print_to_file.m4 \
 	$(top_srcdir)/m4/ax_add_am_macro_static.m4 \
@@ -431,6 +435,7 @@
 GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@
 GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@
 GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@
+GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@
 GL_GNULIB_GETSUBOPT = @GL_GNULIB_GETSUBOPT@
 GL_GNULIB_GETUMASK = @GL_GNULIB_GETUMASK@
 GL_GNULIB_GETUSERSHELL = @GL_GNULIB_GETUSERSHELL@
@@ -460,6 +465,7 @@
 GL_GNULIB_MBSSPN = @GL_GNULIB_MBSSPN@
 GL_GNULIB_MBSSTR = @GL_GNULIB_MBSSTR@
 GL_GNULIB_MBSTOK_R = @GL_GNULIB_MBSTOK_R@
+GL_GNULIB_MBSTOWCS = @GL_GNULIB_MBSTOWCS@
 GL_GNULIB_MBTOWC = @GL_GNULIB_MBTOWC@
 GL_GNULIB_MDA_ACCESS = @GL_GNULIB_MDA_ACCESS@
 GL_GNULIB_MDA_CHDIR = @GL_GNULIB_MDA_CHDIR@
@@ -505,6 +511,7 @@
 GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@
 GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@
 GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@
+GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@
 GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@
 GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@
 GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@
@@ -542,6 +549,7 @@
 GL_GNULIB_PUTS = @GL_GNULIB_PUTS@
 GL_GNULIB_PWRITE = @GL_GNULIB_PWRITE@
 GL_GNULIB_QSORT_R = @GL_GNULIB_QSORT_R@
+GL_GNULIB_RAND = @GL_GNULIB_RAND@
 GL_GNULIB_RANDOM = @GL_GNULIB_RANDOM@
 GL_GNULIB_RANDOM_R = @GL_GNULIB_RANDOM_R@
 GL_GNULIB_RAWMEMCHR = @GL_GNULIB_RAWMEMCHR@
@@ -597,6 +605,7 @@
 GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@
 GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@
 GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@
+GL_GNULIB_TIME = @GL_GNULIB_TIME@
 GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@
 GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@
 GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@
@@ -674,6 +683,7 @@
 GL_UNISTRING_GNULIB_GETPAGESIZE = @GL_UNISTRING_GNULIB_GETPAGESIZE@
 GL_UNISTRING_GNULIB_GETPASS = @GL_UNISTRING_GNULIB_GETPASS@
 GL_UNISTRING_GNULIB_GETPASS_GNU = @GL_UNISTRING_GNULIB_GETPASS_GNU@
+GL_UNISTRING_GNULIB_GETPROGNAME = @GL_UNISTRING_GNULIB_GETPROGNAME@
 GL_UNISTRING_GNULIB_GETSUBOPT = @GL_UNISTRING_GNULIB_GETSUBOPT@
 GL_UNISTRING_GNULIB_GETUSERSHELL = @GL_UNISTRING_GNULIB_GETUSERSHELL@
 GL_UNISTRING_GNULIB_GRANTPT = @GL_UNISTRING_GNULIB_GRANTPT@
@@ -707,6 +717,8 @@
 GL_UNISTRING_GNULIB_MBSSPN = @GL_UNISTRING_GNULIB_MBSSPN@
 GL_UNISTRING_GNULIB_MBSSTR = @GL_UNISTRING_GNULIB_MBSSTR@
 GL_UNISTRING_GNULIB_MBSTOK_R = @GL_UNISTRING_GNULIB_MBSTOK_R@
+GL_UNISTRING_GNULIB_MBSTOWCS = @GL_UNISTRING_GNULIB_MBSTOWCS@
+GL_UNISTRING_GNULIB_MBSZERO = @GL_UNISTRING_GNULIB_MBSZERO@
 GL_UNISTRING_GNULIB_MBTOWC = @GL_UNISTRING_GNULIB_MBTOWC@
 GL_UNISTRING_GNULIB_MDA_ACCESS = @GL_UNISTRING_GNULIB_MDA_ACCESS@
 GL_UNISTRING_GNULIB_MDA_CHDIR = @GL_UNISTRING_GNULIB_MDA_CHDIR@
@@ -741,6 +753,7 @@
 GL_UNISTRING_GNULIB_MEMMEM = @GL_UNISTRING_GNULIB_MEMMEM@
 GL_UNISTRING_GNULIB_MEMPCPY = @GL_UNISTRING_GNULIB_MEMPCPY@
 GL_UNISTRING_GNULIB_MEMRCHR = @GL_UNISTRING_GNULIB_MEMRCHR@
+GL_UNISTRING_GNULIB_MEMSET_EXPLICIT = @GL_UNISTRING_GNULIB_MEMSET_EXPLICIT@
 GL_UNISTRING_GNULIB_MKDTEMP = @GL_UNISTRING_GNULIB_MKDTEMP@
 GL_UNISTRING_GNULIB_MKOSTEMP = @GL_UNISTRING_GNULIB_MKOSTEMP@
 GL_UNISTRING_GNULIB_MKOSTEMPS = @GL_UNISTRING_GNULIB_MKOSTEMPS@
@@ -756,6 +769,7 @@
 GL_UNISTRING_GNULIB_PUTENV = @GL_UNISTRING_GNULIB_PUTENV@
 GL_UNISTRING_GNULIB_PWRITE = @GL_UNISTRING_GNULIB_PWRITE@
 GL_UNISTRING_GNULIB_QSORT_R = @GL_UNISTRING_GNULIB_QSORT_R@
+GL_UNISTRING_GNULIB_RAND = @GL_UNISTRING_GNULIB_RAND@
 GL_UNISTRING_GNULIB_RANDOM = @GL_UNISTRING_GNULIB_RANDOM@
 GL_UNISTRING_GNULIB_RANDOM_R = @GL_UNISTRING_GNULIB_RANDOM_R@
 GL_UNISTRING_GNULIB_RAWMEMCHR = @GL_UNISTRING_GNULIB_RAWMEMCHR@
@@ -804,6 +818,141 @@
 GL_UNISTRING_GNULIB_SYSTEM_POSIX = @GL_UNISTRING_GNULIB_SYSTEM_POSIX@
 GL_UNISTRING_GNULIB_TRUNCATE = @GL_UNISTRING_GNULIB_TRUNCATE@
 GL_UNISTRING_GNULIB_TTYNAME_R = @GL_UNISTRING_GNULIB_TTYNAME_R@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE@
 GL_UNISTRING_GNULIB_UNISTD_H_GETOPT = @GL_UNISTRING_GNULIB_UNISTD_H_GETOPT@
 GL_UNISTRING_GNULIB_UNISTD_H_NONBLOCKING = @GL_UNISTRING_GNULIB_UNISTD_H_NONBLOCKING@
 GL_UNISTRING_GNULIB_UNISTD_H_SIGPIPE = @GL_UNISTRING_GNULIB_UNISTD_H_SIGPIPE@
@@ -842,6 +991,7 @@
 GL_UNISTRING_GNULIB_WCTOB = @GL_UNISTRING_GNULIB_WCTOB@
 GL_UNISTRING_GNULIB_WCTOMB = @GL_UNISTRING_GNULIB_WCTOMB@
 GL_UNISTRING_GNULIB_WCWIDTH = @GL_UNISTRING_GNULIB_WCWIDTH@
+GL_UNISTRING_GNULIB_WGETCWD = @GL_UNISTRING_GNULIB_WGETCWD@
 GL_UNISTRING_GNULIB_WMEMCHR = @GL_UNISTRING_GNULIB_WMEMCHR@
 GL_UNISTRING_GNULIB_WMEMCMP = @GL_UNISTRING_GNULIB_WMEMCMP@
 GL_UNISTRING_GNULIB_WMEMCPY = @GL_UNISTRING_GNULIB_WMEMCPY@
@@ -853,7 +1003,6 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@
-GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
@@ -889,6 +1038,7 @@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
+HAVE_DECL_GETW = @HAVE_DECL_GETW@
 HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
 HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
 HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@
@@ -896,6 +1046,8 @@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
+HAVE_DECL_PROGRAM_INVOCATION_NAME = @HAVE_DECL_PROGRAM_INVOCATION_NAME@
+HAVE_DECL_PUTW = @HAVE_DECL_PUTW@
 HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
 HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@
@@ -917,6 +1069,9 @@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP3 = @HAVE_DUP3@
+HAVE_ERROR = @HAVE_ERROR@
+HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@
+HAVE_ERROR_H = @HAVE_ERROR_H@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
 HAVE_EXECVPE = @HAVE_EXECVPE@
 HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@
@@ -943,10 +1098,13 @@
 HAVE_GETOPT_H = @HAVE_GETOPT_H@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETPASS = @HAVE_GETPASS@
+HAVE_GETPROGNAME = @HAVE_GETPROGNAME@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
 HAVE_GETUMASK = @HAVE_GETUMASK@
 HAVE_GRANTPT = @HAVE_GRANTPT@
 HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_IMAXABS = @HAVE_IMAXABS@
+HAVE_IMAXDIV = @HAVE_IMAXDIV@
 HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@
 HAVE_INITSTATE = @HAVE_INITSTATE@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -965,6 +1123,7 @@
 HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
 HAVE_MBTOWC = @HAVE_MBTOWC@
 HAVE_MEMPCPY = @HAVE_MEMPCPY@
+HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@
 HAVE_MKDIRAT = @HAVE_MKDIRAT@
 HAVE_MKDTEMP = @HAVE_MKDTEMP@
 HAVE_MKFIFO = @HAVE_MKFIFO@
@@ -1040,6 +1199,7 @@
 HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@
 HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNISTRING_WOE32DLL_H = @HAVE_UNISTRING_WOE32DLL_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
 HAVE_USLEEP = @HAVE_USLEEP@
@@ -1101,6 +1261,10 @@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LCOV = @LCOV@
+LC_COLLATE_IMPLEMENTED = @LC_COLLATE_IMPLEMENTED@
+LC_MONETARY_IMPLEMENTED = @LC_MONETARY_IMPLEMENTED@
+LC_NUMERIC_IMPLEMENTED = @LC_NUMERIC_IMPLEMENTED@
+LC_TIME_IMPLEMENTED = @LC_TIME_IMPLEMENTED@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -1120,6 +1284,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
 LOG_VALGRIND = @LOG_VALGRIND@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
@@ -1140,6 +1305,7 @@
 NEXT_ASSERT_H = @NEXT_ASSERT_H@
 NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
+NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
@@ -1157,6 +1323,7 @@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
+NEXT_ERROR_H = @NEXT_ERROR_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
@@ -1212,6 +1379,9 @@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
+REPLACE_DUP3 = @REPLACE_DUP3@
+REPLACE_ERROR = @REPLACE_ERROR@
+REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@
 REPLACE_EXECL = @REPLACE_EXECL@
 REPLACE_EXECLE = @REPLACE_EXECLE@
 REPLACE_EXECLP = @REPLACE_EXECLP@
@@ -1220,10 +1390,12 @@
 REPLACE_EXECVP = @REPLACE_EXECVP@
 REPLACE_EXECVPE = @REPLACE_EXECVPE@
 REPLACE_FACCESSAT = @REPLACE_FACCESSAT@
+REPLACE_FCHDIR = @REPLACE_FCHDIR@
 REPLACE_FCHMODAT = @REPLACE_FCHMODAT@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
+REPLACE_FDATASYNC = @REPLACE_FDATASYNC@
 REPLACE_FDOPEN = @REPLACE_FDOPEN@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FFSLL = @REPLACE_FFSLL@
@@ -1245,16 +1417,22 @@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
 REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
 REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
+REPLACE_GETENTROPY = @REPLACE_GETENTROPY@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
+REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@
 REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETPASS = @REPLACE_GETPASS@
 REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@
+REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@
+REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@
 REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
+REPLACE_IMAXABS = @REPLACE_IMAXABS@
+REPLACE_IMAXDIV = @REPLACE_IMAXDIV@
 REPLACE_INITSTATE = @REPLACE_INITSTATE@
 REPLACE_ISATTY = @REPLACE_ISATTY@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
@@ -1272,14 +1450,20 @@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_MBSTOWCS = @REPLACE_MBSTOWCS@
 REPLACE_MBTOWC = @REPLACE_MBTOWC@
+REPLACE_MB_CUR_MAX = @REPLACE_MB_CUR_MAX@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
+REPLACE_MEMPCPY = @REPLACE_MEMPCPY@
+REPLACE_MEMSET_EXPLICIT = @REPLACE_MEMSET_EXPLICIT@
 REPLACE_MKDIR = @REPLACE_MKDIR@
 REPLACE_MKFIFO = @REPLACE_MKFIFO@
 REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@
 REPLACE_MKNOD = @REPLACE_MKNOD@
 REPLACE_MKNODAT = @REPLACE_MKNODAT@
+REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@
+REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@
 REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
 REPLACE_MKTIME = @REPLACE_MKTIME@
 REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
@@ -1288,8 +1472,10 @@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
 REPLACE_PERROR = @REPLACE_PERROR@
+REPLACE_PIPE2 = @REPLACE_PIPE2@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@
+REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
 REPLACE_PTSNAME = @REPLACE_PTSNAME@
@@ -1297,6 +1483,7 @@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
 REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RAND = @REPLACE_RAND@
 REPLACE_RANDOM = @REPLACE_RANDOM@
 REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
 REPLACE_READ = @REPLACE_READ@
@@ -1311,6 +1498,7 @@
 REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SETENV = @REPLACE_SETENV@
+REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@
 REPLACE_SETSTATE = @REPLACE_SETSTATE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
@@ -1318,6 +1506,7 @@
 REPLACE_STAT = @REPLACE_STAT@
 REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
+REPLACE_STPCPY = @REPLACE_STPCPY@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
 REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
@@ -1340,9 +1529,13 @@
 REPLACE_STRTOUL = @REPLACE_STRTOUL@
 REPLACE_STRTOULL = @REPLACE_STRTOULL@
 REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
+REPLACE_STRVERSCMP = @REPLACE_STRVERSCMP@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
+REPLACE_TIME = @REPLACE_TIME@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
+REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@
+REPLACE_TIMESPEC_GETRES = @REPLACE_TIMESPEC_GETRES@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
 REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
@@ -1359,21 +1552,26 @@
 REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@
 REPLACE_VSPRINTF = @REPLACE_VSPRINTF@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSCMP = @REPLACE_WCSCMP@
 REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
+REPLACE_WCSNCMP = @REPLACE_WCSNCMP@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
+REPLACE_WCSSTR = @REPLACE_WCSSTR@
 REPLACE_WCSTOK = @REPLACE_WCSTOK@
 REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
 REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+REPLACE_WMEMCMP = @REPLACE_WMEMCMP@
+REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@
 REPLACE_WRITE = @REPLACE_WRITE@
+REPLACE__EXIT = @REPLACE__EXIT@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
-STDALIGN_H = @STDALIGN_H@
 STDARG_H = @STDARG_H@
 STDCKDINT_H = @STDCKDINT_H@
 STDDEF_H = @STDDEF_H@
@@ -1396,6 +1594,8 @@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WERROR_CFLAGS = @WERROR_CFLAGS@
+WERROR_TESTS_CFLAGS = @WERROR_TESTS_CFLAGS@
 WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
 WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@

_service:tar_scm:libidn2-2.3.4.tar.gz/examples/lookup.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/examples/lookup.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/examples/register.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/examples/register.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/fuzz/Makefile.am -> _service:tar_scm:libidn2-2.3.7.tar.gz/fuzz/Makefile.am Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/fuzz/Makefile.in -> _service:tar_scm:libidn2-2.3.7.tar.gz/fuzz/Makefile.in Changed

@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (c) 2017-2022 Tim Ruehsen
+# Copyright (c) 2017-2024 Tim Ruehsen
 
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -109,8 +109,7 @@
 host_triplet = @host@
 subdir = fuzz
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/unistring/m4/codeset.m4 \
-	$(top_srcdir)/unistring/m4/free.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/unistring/m4/free.m4 \
 	$(top_srcdir)/unistring/m4/gnulib-comp.m4 \
 	$(top_srcdir)/unistring/m4/host-cpu-c-abi.m4 \
 	$(top_srcdir)/unistring/m4/iconv.m4 \
@@ -124,15 +123,19 @@
 	$(top_srcdir)/unistring/m4/libunistring-optional.m4 \
 	$(top_srcdir)/unistring/m4/libunistring.m4 \
 	$(top_srcdir)/unistring/m4/localcharset.m4 \
+	$(top_srcdir)/unistring/m4/unictype_h.m4 \
+	$(top_srcdir)/unistring/m4/uninorm_h.m4 \
 	$(top_srcdir)/unistring/m4/wchar_h.m4 \
 	$(top_srcdir)/gl/m4/00gnulib.m4 \
 	$(top_srcdir)/gl/m4/__inline.m4 \
 	$(top_srcdir)/gl/m4/absolute-header.m4 \
 	$(top_srcdir)/gl/m4/alloca.m4 $(top_srcdir)/gl/m4/assert_h.m4 \
 	$(top_srcdir)/gl/m4/c-bool.m4 $(top_srcdir)/gl/m4/close.m4 \
+	$(top_srcdir)/gl/m4/codeset.m4 \
 	$(top_srcdir)/gl/m4/double-slash-root.m4 \
 	$(top_srcdir)/gl/m4/dup2.m4 $(top_srcdir)/gl/m4/eealloc.m4 \
 	$(top_srcdir)/gl/m4/errno_h.m4 $(top_srcdir)/gl/m4/error.m4 \
+	$(top_srcdir)/gl/m4/error_h.m4 \
 	$(top_srcdir)/gl/m4/extensions.m4 \
 	$(top_srcdir)/gl/m4/extern-inline.m4 \
 	$(top_srcdir)/gl/m4/fcntl-o.m4 $(top_srcdir)/gl/m4/fcntl.m4 \
@@ -147,12 +150,14 @@
 	$(top_srcdir)/gl/m4/inline.m4 $(top_srcdir)/gl/m4/largefile.m4 \
 	$(top_srcdir)/gl/m4/ld-output-def.m4 \
 	$(top_srcdir)/gl/m4/ld-version-script.m4 \
-	$(top_srcdir)/gl/m4/limits-h.m4 $(top_srcdir)/gl/m4/malloca.m4 \
+	$(top_srcdir)/gl/m4/limits-h.m4 \
+	$(top_srcdir)/gl/m4/locale-fr.m4 \
+	$(top_srcdir)/gl/m4/malloca.m4 \
 	$(top_srcdir)/gl/m4/manywarnings.m4 \
 	$(top_srcdir)/gl/m4/mode_t.m4 \
 	$(top_srcdir)/gl/m4/msvc-inval.m4 \
 	$(top_srcdir)/gl/m4/msvc-nothrow.m4 \
-	$(top_srcdir)/gl/m4/multiarch.m4 \
+	$(top_srcdir)/gl/m4/multiarch.m4 $(top_srcdir)/gl/m4/musl.m4 \
 	$(top_srcdir)/gl/m4/nocrash.m4 $(top_srcdir)/gl/m4/off_t.m4 \
 	$(top_srcdir)/gl/m4/open-cloexec.m4 \
 	$(top_srcdir)/gl/m4/open-slash.m4 $(top_srcdir)/gl/m4/open.m4 \
@@ -160,9 +165,9 @@
 	$(top_srcdir)/gl/m4/rawmemchr.m4 \
 	$(top_srcdir)/gl/m4/ssize_t.m4 \
 	$(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \
-	$(top_srcdir)/gl/m4/stdalign.m4 $(top_srcdir)/gl/m4/stdarg.m4 \
-	$(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \
-	$(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \
+	$(top_srcdir)/gl/m4/stdarg.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \
+	$(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \
+	$(top_srcdir)/gl/m4/stdlib_h.m4 \
 	$(top_srcdir)/gl/m4/strchrnul.m4 \
 	$(top_srcdir)/gl/m4/strerror.m4 \
 	$(top_srcdir)/gl/m4/string_h.m4 \
@@ -176,8 +181,7 @@
 	$(top_srcdir)/gl/m4/visibility.m4 \
 	$(top_srcdir)/gl/m4/warn-on-use.m4 \
 	$(top_srcdir)/gl/m4/warnings.m4 $(top_srcdir)/gl/m4/wchar_t.m4 \
-	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/year2038.m4 \
-	$(top_srcdir)/gl/m4/zzgnulib.m4 \
+	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/zzgnulib.m4 \
 	$(top_srcdir)/m4/ax_ac_append_to_file.m4 \
 	$(top_srcdir)/m4/ax_ac_print_to_file.m4 \
 	$(top_srcdir)/m4/ax_add_am_macro_static.m4 \
@@ -642,6 +646,7 @@
 GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@
 GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@
 GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@
+GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@
 GL_GNULIB_GETSUBOPT = @GL_GNULIB_GETSUBOPT@
 GL_GNULIB_GETUMASK = @GL_GNULIB_GETUMASK@
 GL_GNULIB_GETUSERSHELL = @GL_GNULIB_GETUSERSHELL@
@@ -671,6 +676,7 @@
 GL_GNULIB_MBSSPN = @GL_GNULIB_MBSSPN@
 GL_GNULIB_MBSSTR = @GL_GNULIB_MBSSTR@
 GL_GNULIB_MBSTOK_R = @GL_GNULIB_MBSTOK_R@
+GL_GNULIB_MBSTOWCS = @GL_GNULIB_MBSTOWCS@
 GL_GNULIB_MBTOWC = @GL_GNULIB_MBTOWC@
 GL_GNULIB_MDA_ACCESS = @GL_GNULIB_MDA_ACCESS@
 GL_GNULIB_MDA_CHDIR = @GL_GNULIB_MDA_CHDIR@
@@ -716,6 +722,7 @@
 GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@
 GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@
 GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@
+GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@
 GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@
 GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@
 GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@
@@ -753,6 +760,7 @@
 GL_GNULIB_PUTS = @GL_GNULIB_PUTS@
 GL_GNULIB_PWRITE = @GL_GNULIB_PWRITE@
 GL_GNULIB_QSORT_R = @GL_GNULIB_QSORT_R@
+GL_GNULIB_RAND = @GL_GNULIB_RAND@
 GL_GNULIB_RANDOM = @GL_GNULIB_RANDOM@
 GL_GNULIB_RANDOM_R = @GL_GNULIB_RANDOM_R@
 GL_GNULIB_RAWMEMCHR = @GL_GNULIB_RAWMEMCHR@
@@ -808,6 +816,7 @@
 GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@
 GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@
 GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@
+GL_GNULIB_TIME = @GL_GNULIB_TIME@
 GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@
 GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@
 GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@
@@ -885,6 +894,7 @@
 GL_UNISTRING_GNULIB_GETPAGESIZE = @GL_UNISTRING_GNULIB_GETPAGESIZE@
 GL_UNISTRING_GNULIB_GETPASS = @GL_UNISTRING_GNULIB_GETPASS@
 GL_UNISTRING_GNULIB_GETPASS_GNU = @GL_UNISTRING_GNULIB_GETPASS_GNU@
+GL_UNISTRING_GNULIB_GETPROGNAME = @GL_UNISTRING_GNULIB_GETPROGNAME@
 GL_UNISTRING_GNULIB_GETSUBOPT = @GL_UNISTRING_GNULIB_GETSUBOPT@
 GL_UNISTRING_GNULIB_GETUSERSHELL = @GL_UNISTRING_GNULIB_GETUSERSHELL@
 GL_UNISTRING_GNULIB_GRANTPT = @GL_UNISTRING_GNULIB_GRANTPT@
@@ -918,6 +928,8 @@
 GL_UNISTRING_GNULIB_MBSSPN = @GL_UNISTRING_GNULIB_MBSSPN@
 GL_UNISTRING_GNULIB_MBSSTR = @GL_UNISTRING_GNULIB_MBSSTR@
 GL_UNISTRING_GNULIB_MBSTOK_R = @GL_UNISTRING_GNULIB_MBSTOK_R@
+GL_UNISTRING_GNULIB_MBSTOWCS = @GL_UNISTRING_GNULIB_MBSTOWCS@
+GL_UNISTRING_GNULIB_MBSZERO = @GL_UNISTRING_GNULIB_MBSZERO@
 GL_UNISTRING_GNULIB_MBTOWC = @GL_UNISTRING_GNULIB_MBTOWC@
 GL_UNISTRING_GNULIB_MDA_ACCESS = @GL_UNISTRING_GNULIB_MDA_ACCESS@
 GL_UNISTRING_GNULIB_MDA_CHDIR = @GL_UNISTRING_GNULIB_MDA_CHDIR@
@@ -952,6 +964,7 @@
 GL_UNISTRING_GNULIB_MEMMEM = @GL_UNISTRING_GNULIB_MEMMEM@
 GL_UNISTRING_GNULIB_MEMPCPY = @GL_UNISTRING_GNULIB_MEMPCPY@
 GL_UNISTRING_GNULIB_MEMRCHR = @GL_UNISTRING_GNULIB_MEMRCHR@
+GL_UNISTRING_GNULIB_MEMSET_EXPLICIT = @GL_UNISTRING_GNULIB_MEMSET_EXPLICIT@
 GL_UNISTRING_GNULIB_MKDTEMP = @GL_UNISTRING_GNULIB_MKDTEMP@
 GL_UNISTRING_GNULIB_MKOSTEMP = @GL_UNISTRING_GNULIB_MKOSTEMP@
 GL_UNISTRING_GNULIB_MKOSTEMPS = @GL_UNISTRING_GNULIB_MKOSTEMPS@
@@ -967,6 +980,7 @@
 GL_UNISTRING_GNULIB_PUTENV = @GL_UNISTRING_GNULIB_PUTENV@
 GL_UNISTRING_GNULIB_PWRITE = @GL_UNISTRING_GNULIB_PWRITE@
 GL_UNISTRING_GNULIB_QSORT_R = @GL_UNISTRING_GNULIB_QSORT_R@
+GL_UNISTRING_GNULIB_RAND = @GL_UNISTRING_GNULIB_RAND@
 GL_UNISTRING_GNULIB_RANDOM = @GL_UNISTRING_GNULIB_RANDOM@
 GL_UNISTRING_GNULIB_RANDOM_R = @GL_UNISTRING_GNULIB_RANDOM_R@
 GL_UNISTRING_GNULIB_RAWMEMCHR = @GL_UNISTRING_GNULIB_RAWMEMCHR@
@@ -1015,6 +1029,141 @@
 GL_UNISTRING_GNULIB_SYSTEM_POSIX = @GL_UNISTRING_GNULIB_SYSTEM_POSIX@
 GL_UNISTRING_GNULIB_TRUNCATE = @GL_UNISTRING_GNULIB_TRUNCATE@
 GL_UNISTRING_GNULIB_TTYNAME_R = @GL_UNISTRING_GNULIB_TTYNAME_R@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE@
 GL_UNISTRING_GNULIB_UNISTD_H_GETOPT = @GL_UNISTRING_GNULIB_UNISTD_H_GETOPT@
 GL_UNISTRING_GNULIB_UNISTD_H_NONBLOCKING = @GL_UNISTRING_GNULIB_UNISTD_H_NONBLOCKING@
 GL_UNISTRING_GNULIB_UNISTD_H_SIGPIPE = @GL_UNISTRING_GNULIB_UNISTD_H_SIGPIPE@
@@ -1053,6 +1202,7 @@
 GL_UNISTRING_GNULIB_WCTOB = @GL_UNISTRING_GNULIB_WCTOB@
 GL_UNISTRING_GNULIB_WCTOMB = @GL_UNISTRING_GNULIB_WCTOMB@
 GL_UNISTRING_GNULIB_WCWIDTH = @GL_UNISTRING_GNULIB_WCWIDTH@
+GL_UNISTRING_GNULIB_WGETCWD = @GL_UNISTRING_GNULIB_WGETCWD@
 GL_UNISTRING_GNULIB_WMEMCHR = @GL_UNISTRING_GNULIB_WMEMCHR@
 GL_UNISTRING_GNULIB_WMEMCMP = @GL_UNISTRING_GNULIB_WMEMCMP@
 GL_UNISTRING_GNULIB_WMEMCPY = @GL_UNISTRING_GNULIB_WMEMCPY@
@@ -1064,7 +1214,6 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@
-GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
@@ -1100,6 +1249,7 @@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
+HAVE_DECL_GETW = @HAVE_DECL_GETW@
 HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
 HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
 HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@
@@ -1107,6 +1257,8 @@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
+HAVE_DECL_PROGRAM_INVOCATION_NAME = @HAVE_DECL_PROGRAM_INVOCATION_NAME@
+HAVE_DECL_PUTW = @HAVE_DECL_PUTW@
 HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
 HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@
@@ -1128,6 +1280,9 @@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP3 = @HAVE_DUP3@
+HAVE_ERROR = @HAVE_ERROR@
+HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@
+HAVE_ERROR_H = @HAVE_ERROR_H@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
 HAVE_EXECVPE = @HAVE_EXECVPE@
 HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@
@@ -1154,10 +1309,13 @@
 HAVE_GETOPT_H = @HAVE_GETOPT_H@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETPASS = @HAVE_GETPASS@
+HAVE_GETPROGNAME = @HAVE_GETPROGNAME@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
 HAVE_GETUMASK = @HAVE_GETUMASK@
 HAVE_GRANTPT = @HAVE_GRANTPT@
 HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_IMAXABS = @HAVE_IMAXABS@
+HAVE_IMAXDIV = @HAVE_IMAXDIV@
 HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@
 HAVE_INITSTATE = @HAVE_INITSTATE@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -1176,6 +1334,7 @@
 HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
 HAVE_MBTOWC = @HAVE_MBTOWC@
 HAVE_MEMPCPY = @HAVE_MEMPCPY@
+HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@
 HAVE_MKDIRAT = @HAVE_MKDIRAT@
 HAVE_MKDTEMP = @HAVE_MKDTEMP@
 HAVE_MKFIFO = @HAVE_MKFIFO@
@@ -1251,6 +1410,7 @@
 HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@
 HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNISTRING_WOE32DLL_H = @HAVE_UNISTRING_WOE32DLL_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
 HAVE_USLEEP = @HAVE_USLEEP@
@@ -1312,6 +1472,10 @@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LCOV = @LCOV@
+LC_COLLATE_IMPLEMENTED = @LC_COLLATE_IMPLEMENTED@
+LC_MONETARY_IMPLEMENTED = @LC_MONETARY_IMPLEMENTED@
+LC_NUMERIC_IMPLEMENTED = @LC_NUMERIC_IMPLEMENTED@
+LC_TIME_IMPLEMENTED = @LC_TIME_IMPLEMENTED@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -1331,6 +1495,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
 LOG_VALGRIND = @LOG_VALGRIND@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
@@ -1351,6 +1516,7 @@
 NEXT_ASSERT_H = @NEXT_ASSERT_H@
 NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
+NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
@@ -1368,6 +1534,7 @@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
+NEXT_ERROR_H = @NEXT_ERROR_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
@@ -1423,6 +1590,9 @@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
+REPLACE_DUP3 = @REPLACE_DUP3@
+REPLACE_ERROR = @REPLACE_ERROR@
+REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@
 REPLACE_EXECL = @REPLACE_EXECL@
 REPLACE_EXECLE = @REPLACE_EXECLE@
 REPLACE_EXECLP = @REPLACE_EXECLP@
@@ -1431,10 +1601,12 @@
 REPLACE_EXECVP = @REPLACE_EXECVP@
 REPLACE_EXECVPE = @REPLACE_EXECVPE@
 REPLACE_FACCESSAT = @REPLACE_FACCESSAT@
+REPLACE_FCHDIR = @REPLACE_FCHDIR@
 REPLACE_FCHMODAT = @REPLACE_FCHMODAT@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
+REPLACE_FDATASYNC = @REPLACE_FDATASYNC@
 REPLACE_FDOPEN = @REPLACE_FDOPEN@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FFSLL = @REPLACE_FFSLL@
@@ -1456,16 +1628,22 @@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
 REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
 REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
+REPLACE_GETENTROPY = @REPLACE_GETENTROPY@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
+REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@
 REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETPASS = @REPLACE_GETPASS@
 REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@
+REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@
+REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@
 REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
+REPLACE_IMAXABS = @REPLACE_IMAXABS@
+REPLACE_IMAXDIV = @REPLACE_IMAXDIV@
 REPLACE_INITSTATE = @REPLACE_INITSTATE@
 REPLACE_ISATTY = @REPLACE_ISATTY@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
@@ -1483,14 +1661,20 @@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_MBSTOWCS = @REPLACE_MBSTOWCS@
 REPLACE_MBTOWC = @REPLACE_MBTOWC@
+REPLACE_MB_CUR_MAX = @REPLACE_MB_CUR_MAX@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
+REPLACE_MEMPCPY = @REPLACE_MEMPCPY@
+REPLACE_MEMSET_EXPLICIT = @REPLACE_MEMSET_EXPLICIT@
 REPLACE_MKDIR = @REPLACE_MKDIR@
 REPLACE_MKFIFO = @REPLACE_MKFIFO@
 REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@
 REPLACE_MKNOD = @REPLACE_MKNOD@
 REPLACE_MKNODAT = @REPLACE_MKNODAT@
+REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@
+REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@
 REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
 REPLACE_MKTIME = @REPLACE_MKTIME@
 REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
@@ -1499,8 +1683,10 @@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
 REPLACE_PERROR = @REPLACE_PERROR@
+REPLACE_PIPE2 = @REPLACE_PIPE2@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@
+REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
 REPLACE_PTSNAME = @REPLACE_PTSNAME@
@@ -1508,6 +1694,7 @@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
 REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RAND = @REPLACE_RAND@
 REPLACE_RANDOM = @REPLACE_RANDOM@
 REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
 REPLACE_READ = @REPLACE_READ@
@@ -1522,6 +1709,7 @@
 REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SETENV = @REPLACE_SETENV@
+REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@
 REPLACE_SETSTATE = @REPLACE_SETSTATE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
@@ -1529,6 +1717,7 @@
 REPLACE_STAT = @REPLACE_STAT@
 REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
+REPLACE_STPCPY = @REPLACE_STPCPY@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
 REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
@@ -1551,9 +1740,13 @@
 REPLACE_STRTOUL = @REPLACE_STRTOUL@
 REPLACE_STRTOULL = @REPLACE_STRTOULL@
 REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
+REPLACE_STRVERSCMP = @REPLACE_STRVERSCMP@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
+REPLACE_TIME = @REPLACE_TIME@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
+REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@
+REPLACE_TIMESPEC_GETRES = @REPLACE_TIMESPEC_GETRES@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
 REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
@@ -1570,21 +1763,26 @@
 REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@
 REPLACE_VSPRINTF = @REPLACE_VSPRINTF@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSCMP = @REPLACE_WCSCMP@
 REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
+REPLACE_WCSNCMP = @REPLACE_WCSNCMP@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
+REPLACE_WCSSTR = @REPLACE_WCSSTR@
 REPLACE_WCSTOK = @REPLACE_WCSTOK@
 REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
 REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+REPLACE_WMEMCMP = @REPLACE_WMEMCMP@
+REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@
 REPLACE_WRITE = @REPLACE_WRITE@
+REPLACE__EXIT = @REPLACE__EXIT@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
-STDALIGN_H = @STDALIGN_H@
 STDARG_H = @STDARG_H@
 STDCKDINT_H = @STDCKDINT_H@
 STDDEF_H = @STDDEF_H@
@@ -1607,6 +1805,8 @@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WERROR_CFLAGS = @WERROR_CFLAGS@
+WERROR_TESTS_CFLAGS = @WERROR_TESTS_CFLAGS@
 WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
 WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
@@ -1684,7 +1884,7 @@
 unistringtests_LIBOBJS = @unistringtests_LIBOBJS@
 unistringtests_LTLIBOBJS = @unistringtests_LTLIBOBJS@
 unistringtests_WITNESS = @unistringtests_WITNESS@
-AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
+AM_CFLAGS = $(WARN_CFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/gl -I../gl -DSRCDIR=\"$(abs_srcdir)\" -DTEST_RUN
 AM_LDFLAGS = -no-install
 LDADD = ../lib/libidn2.la ../gl/libgnu.la $(LTLIBUNISTRING)

_service:tar_scm:libidn2-2.3.4.tar.gz/fuzz/README.md -> _service:tar_scm:libidn2-2.3.7.tar.gz/fuzz/README.md Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/fuzz/libidn2_register_fuzzer.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/fuzz/libidn2_register_fuzzer.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/fuzz/libidn2_to_ascii_8z_fuzzer.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/fuzz/libidn2_to_ascii_8z_fuzzer.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/fuzz/libidn2_to_unicode_8z8z_fuzzer.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/fuzz/libidn2_to_unicode_8z8z_fuzzer.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/Makefile.am -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/Makefile.am Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/Makefile.in -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/Makefile.in Changed

@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2002-2022 Free Software Foundation, Inc.
+# Copyright (C) 2002-2024 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
@@ -151,21 +151,21 @@
 @GL_COND_OBJ_GETDTABLESIZE_TRUE@am__append_7 = getdtablesize.c
 @GL_COND_OBJ_GETLINE_TRUE@am__append_8 = getline.c
 @GL_COND_OBJ_GETOPT_TRUE@am__append_9 = getopt.c getopt1.c
-@GL_COND_OBJ_MSVC_INVAL_TRUE@am__append_10 = msvc-inval.c
-@GL_COND_OBJ_MSVC_NOTHROW_TRUE@am__append_11 = msvc-nothrow.c
-@GL_COND_OBJ_OPEN_TRUE@am__append_12 = open.c
-@GL_COND_OBJ_RAWMEMCHR_TRUE@am__append_13 = rawmemchr.c
-@GL_COND_OBJ_STAT_TRUE@am__append_14 = stat.c
-@GL_COND_OBJ_STDIO_READ_TRUE@am__append_15 = stdio-read.c
-@GL_COND_OBJ_STDIO_WRITE_TRUE@am__append_16 = stdio-write.c
-@GL_COND_OBJ_STRCHRNUL_TRUE@am__append_17 = strchrnul.c
-@GL_COND_OBJ_STRERROR_TRUE@am__append_18 = strerror.c
-@GL_COND_OBJ_STRERROR_OVERRIDE_TRUE@am__append_19 = strerror-override.c
-@GL_COND_OBJ_STRVERSCMP_TRUE@am__append_20 = strverscmp.c
+@GL_COND_OBJ_GETPROGNAME_TRUE@am__append_10 = getprogname.c
+@GL_COND_OBJ_MSVC_INVAL_TRUE@am__append_11 = msvc-inval.c
+@GL_COND_OBJ_MSVC_NOTHROW_TRUE@am__append_12 = msvc-nothrow.c
+@GL_COND_OBJ_OPEN_TRUE@am__append_13 = open.c
+@GL_COND_OBJ_RAWMEMCHR_TRUE@am__append_14 = rawmemchr.c
+@GL_COND_OBJ_STAT_TRUE@am__append_15 = stat.c
+@GL_COND_OBJ_STDIO_READ_TRUE@am__append_16 = stdio-read.c
+@GL_COND_OBJ_STDIO_WRITE_TRUE@am__append_17 = stdio-write.c
+@GL_COND_OBJ_STRCHRNUL_TRUE@am__append_18 = strchrnul.c
+@GL_COND_OBJ_STRERROR_TRUE@am__append_19 = strerror.c
+@GL_COND_OBJ_STRERROR_OVERRIDE_TRUE@am__append_20 = strerror-override.c
+@GL_COND_OBJ_STRVERSCMP_TRUE@am__append_21 = strverscmp.c
 subdir = gl
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/unistring/m4/codeset.m4 \
-	$(top_srcdir)/unistring/m4/free.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/unistring/m4/free.m4 \
 	$(top_srcdir)/unistring/m4/gnulib-comp.m4 \
 	$(top_srcdir)/unistring/m4/host-cpu-c-abi.m4 \
 	$(top_srcdir)/unistring/m4/iconv.m4 \
@@ -179,15 +179,19 @@
 	$(top_srcdir)/unistring/m4/libunistring-optional.m4 \
 	$(top_srcdir)/unistring/m4/libunistring.m4 \
 	$(top_srcdir)/unistring/m4/localcharset.m4 \
+	$(top_srcdir)/unistring/m4/unictype_h.m4 \
+	$(top_srcdir)/unistring/m4/uninorm_h.m4 \
 	$(top_srcdir)/unistring/m4/wchar_h.m4 \
 	$(top_srcdir)/gl/m4/00gnulib.m4 \
 	$(top_srcdir)/gl/m4/__inline.m4 \
 	$(top_srcdir)/gl/m4/absolute-header.m4 \
 	$(top_srcdir)/gl/m4/alloca.m4 $(top_srcdir)/gl/m4/assert_h.m4 \
 	$(top_srcdir)/gl/m4/c-bool.m4 $(top_srcdir)/gl/m4/close.m4 \
+	$(top_srcdir)/gl/m4/codeset.m4 \
 	$(top_srcdir)/gl/m4/double-slash-root.m4 \
 	$(top_srcdir)/gl/m4/dup2.m4 $(top_srcdir)/gl/m4/eealloc.m4 \
 	$(top_srcdir)/gl/m4/errno_h.m4 $(top_srcdir)/gl/m4/error.m4 \
+	$(top_srcdir)/gl/m4/error_h.m4 \
 	$(top_srcdir)/gl/m4/extensions.m4 \
 	$(top_srcdir)/gl/m4/extern-inline.m4 \
 	$(top_srcdir)/gl/m4/fcntl-o.m4 $(top_srcdir)/gl/m4/fcntl.m4 \
@@ -202,12 +206,14 @@
 	$(top_srcdir)/gl/m4/inline.m4 $(top_srcdir)/gl/m4/largefile.m4 \
 	$(top_srcdir)/gl/m4/ld-output-def.m4 \
 	$(top_srcdir)/gl/m4/ld-version-script.m4 \
-	$(top_srcdir)/gl/m4/limits-h.m4 $(top_srcdir)/gl/m4/malloca.m4 \
+	$(top_srcdir)/gl/m4/limits-h.m4 \
+	$(top_srcdir)/gl/m4/locale-fr.m4 \
+	$(top_srcdir)/gl/m4/malloca.m4 \
 	$(top_srcdir)/gl/m4/manywarnings.m4 \
 	$(top_srcdir)/gl/m4/mode_t.m4 \
 	$(top_srcdir)/gl/m4/msvc-inval.m4 \
 	$(top_srcdir)/gl/m4/msvc-nothrow.m4 \
-	$(top_srcdir)/gl/m4/multiarch.m4 \
+	$(top_srcdir)/gl/m4/multiarch.m4 $(top_srcdir)/gl/m4/musl.m4 \
 	$(top_srcdir)/gl/m4/nocrash.m4 $(top_srcdir)/gl/m4/off_t.m4 \
 	$(top_srcdir)/gl/m4/open-cloexec.m4 \
 	$(top_srcdir)/gl/m4/open-slash.m4 $(top_srcdir)/gl/m4/open.m4 \
@@ -215,9 +221,9 @@
 	$(top_srcdir)/gl/m4/rawmemchr.m4 \
 	$(top_srcdir)/gl/m4/ssize_t.m4 \
 	$(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \
-	$(top_srcdir)/gl/m4/stdalign.m4 $(top_srcdir)/gl/m4/stdarg.m4 \
-	$(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \
-	$(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \
+	$(top_srcdir)/gl/m4/stdarg.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \
+	$(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \
+	$(top_srcdir)/gl/m4/stdlib_h.m4 \
 	$(top_srcdir)/gl/m4/strchrnul.m4 \
 	$(top_srcdir)/gl/m4/strerror.m4 \
 	$(top_srcdir)/gl/m4/string_h.m4 \
@@ -231,8 +237,7 @@
 	$(top_srcdir)/gl/m4/visibility.m4 \
 	$(top_srcdir)/gl/m4/warn-on-use.m4 \
 	$(top_srcdir)/gl/m4/warnings.m4 $(top_srcdir)/gl/m4/wchar_t.m4 \
-	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/year2038.m4 \
-	$(top_srcdir)/gl/m4/zzgnulib.m4 \
+	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/zzgnulib.m4 \
 	$(top_srcdir)/m4/ax_ac_append_to_file.m4 \
 	$(top_srcdir)/m4/ax_ac_print_to_file.m4 \
 	$(top_srcdir)/m4/ax_add_am_macro_static.m4 \
@@ -260,12 +265,11 @@
 am__DEPENDENCIES_1 =
 am__libgnu_la_SOURCES_DIST = basename-lgpl.c cloexec.c close.c dup2.c \
 	error.c fcntl.c fd-hook.c fstat.c getdelim.c getdtablesize.c \
-	getline.c getopt.c getopt1.c getprogname.h getprogname.c \
-	gettext.h idx.h malloca.c msvc-inval.c msvc-nothrow.c open.c \
-	progname.h progname.c rawmemchr.c stat.c stat-time.c \
-	stdio-read.c stdio-write.c strchrnul.c strerror.c \
-	strerror-override.c strverscmp.c unistd.c version-etc.h \
-	version-etc.c
+	getline.c getopt.c getopt1.c getprogname.c gettext.h idx.h \
+	malloca.c msvc-inval.c msvc-nothrow.c open.c progname.h \
+	progname.c rawmemchr.c stat.c stat-time.c stdio-read.c \
+	stdio-write.c strchrnul.c strerror.c strerror-override.c \
+	strverscmp.c unistd.c version-etc.h version-etc.c
 @GL_COND_OBJ_CLOSE_TRUE@am__objects_1 = libgnu_la-close.lo
 @GL_COND_OBJ_DUP2_TRUE@am__objects_2 = libgnu_la-dup2.lo
 @GL_COND_OBJ_ERROR_TRUE@am__objects_3 = libgnu_la-error.lo
@@ -277,29 +281,31 @@
 @GL_COND_OBJ_GETLINE_TRUE@am__objects_8 = libgnu_la-getline.lo
 @GL_COND_OBJ_GETOPT_TRUE@am__objects_9 = libgnu_la-getopt.lo \
 @GL_COND_OBJ_GETOPT_TRUE@	libgnu_la-getopt1.lo
-@GL_COND_OBJ_MSVC_INVAL_TRUE@am__objects_10 = libgnu_la-msvc-inval.lo
-@GL_COND_OBJ_MSVC_NOTHROW_TRUE@am__objects_11 =  \
+@GL_COND_OBJ_GETPROGNAME_TRUE@am__objects_10 =  \
+@GL_COND_OBJ_GETPROGNAME_TRUE@	libgnu_la-getprogname.lo
+@GL_COND_OBJ_MSVC_INVAL_TRUE@am__objects_11 = libgnu_la-msvc-inval.lo
+@GL_COND_OBJ_MSVC_NOTHROW_TRUE@am__objects_12 =  \
 @GL_COND_OBJ_MSVC_NOTHROW_TRUE@	libgnu_la-msvc-nothrow.lo
-@GL_COND_OBJ_OPEN_TRUE@am__objects_12 = libgnu_la-open.lo
-@GL_COND_OBJ_RAWMEMCHR_TRUE@am__objects_13 = libgnu_la-rawmemchr.lo
-@GL_COND_OBJ_STAT_TRUE@am__objects_14 = libgnu_la-stat.lo
-@GL_COND_OBJ_STDIO_READ_TRUE@am__objects_15 = libgnu_la-stdio-read.lo
-@GL_COND_OBJ_STDIO_WRITE_TRUE@am__objects_16 =  \
+@GL_COND_OBJ_OPEN_TRUE@am__objects_13 = libgnu_la-open.lo
+@GL_COND_OBJ_RAWMEMCHR_TRUE@am__objects_14 = libgnu_la-rawmemchr.lo
+@GL_COND_OBJ_STAT_TRUE@am__objects_15 = libgnu_la-stat.lo
+@GL_COND_OBJ_STDIO_READ_TRUE@am__objects_16 = libgnu_la-stdio-read.lo
+@GL_COND_OBJ_STDIO_WRITE_TRUE@am__objects_17 =  \
 @GL_COND_OBJ_STDIO_WRITE_TRUE@	libgnu_la-stdio-write.lo
-@GL_COND_OBJ_STRCHRNUL_TRUE@am__objects_17 = libgnu_la-strchrnul.lo
-@GL_COND_OBJ_STRERROR_TRUE@am__objects_18 = libgnu_la-strerror.lo
-@GL_COND_OBJ_STRERROR_OVERRIDE_TRUE@am__objects_19 = libgnu_la-strerror-override.lo
-@GL_COND_OBJ_STRVERSCMP_TRUE@am__objects_20 = libgnu_la-strverscmp.lo
+@GL_COND_OBJ_STRCHRNUL_TRUE@am__objects_18 = libgnu_la-strchrnul.lo
+@GL_COND_OBJ_STRERROR_TRUE@am__objects_19 = libgnu_la-strerror.lo
+@GL_COND_OBJ_STRERROR_OVERRIDE_TRUE@am__objects_20 = libgnu_la-strerror-override.lo
+@GL_COND_OBJ_STRVERSCMP_TRUE@am__objects_21 = libgnu_la-strverscmp.lo
 am_libgnu_la_OBJECTS = libgnu_la-basename-lgpl.lo libgnu_la-cloexec.lo \
 	$(am__objects_1) $(am__objects_2) $(am__objects_3) \
 	$(am__objects_4) libgnu_la-fd-hook.lo $(am__objects_5) \
 	$(am__objects_6) $(am__objects_7) $(am__objects_8) \
-	$(am__objects_9) libgnu_la-getprogname.lo libgnu_la-malloca.lo \
-	$(am__objects_10) $(am__objects_11) $(am__objects_12) \
-	libgnu_la-progname.lo $(am__objects_13) $(am__objects_14) \
-	libgnu_la-stat-time.lo $(am__objects_15) $(am__objects_16) \
-	$(am__objects_17) $(am__objects_18) $(am__objects_19) \
-	$(am__objects_20) libgnu_la-unistd.lo libgnu_la-version-etc.lo
+	$(am__objects_9) $(am__objects_10) libgnu_la-malloca.lo \
+	$(am__objects_11) $(am__objects_12) $(am__objects_13) \
+	libgnu_la-progname.lo $(am__objects_14) $(am__objects_15) \
+	libgnu_la-stat-time.lo $(am__objects_16) $(am__objects_17) \
+	$(am__objects_18) $(am__objects_19) $(am__objects_20) \
+	$(am__objects_21) libgnu_la-unistd.lo libgnu_la-version-etc.lo
 libgnu_la_OBJECTS = $(am_libgnu_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -585,6 +591,7 @@
 GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@
 GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@
 GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@
+GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@
 GL_GNULIB_GETSUBOPT = @GL_GNULIB_GETSUBOPT@
 GL_GNULIB_GETUMASK = @GL_GNULIB_GETUMASK@
 GL_GNULIB_GETUSERSHELL = @GL_GNULIB_GETUSERSHELL@
@@ -614,6 +621,7 @@
 GL_GNULIB_MBSSPN = @GL_GNULIB_MBSSPN@
 GL_GNULIB_MBSSTR = @GL_GNULIB_MBSSTR@
 GL_GNULIB_MBSTOK_R = @GL_GNULIB_MBSTOK_R@
+GL_GNULIB_MBSTOWCS = @GL_GNULIB_MBSTOWCS@
 GL_GNULIB_MBTOWC = @GL_GNULIB_MBTOWC@
 GL_GNULIB_MDA_ACCESS = @GL_GNULIB_MDA_ACCESS@
 GL_GNULIB_MDA_CHDIR = @GL_GNULIB_MDA_CHDIR@
@@ -659,6 +667,7 @@
 GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@
 GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@
 GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@
+GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@
 GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@
 GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@
 GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@
@@ -696,6 +705,7 @@
 GL_GNULIB_PUTS = @GL_GNULIB_PUTS@
 GL_GNULIB_PWRITE = @GL_GNULIB_PWRITE@
 GL_GNULIB_QSORT_R = @GL_GNULIB_QSORT_R@
+GL_GNULIB_RAND = @GL_GNULIB_RAND@
 GL_GNULIB_RANDOM = @GL_GNULIB_RANDOM@
 GL_GNULIB_RANDOM_R = @GL_GNULIB_RANDOM_R@
 GL_GNULIB_RAWMEMCHR = @GL_GNULIB_RAWMEMCHR@
@@ -751,6 +761,7 @@
 GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@
 GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@
 GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@
+GL_GNULIB_TIME = @GL_GNULIB_TIME@
 GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@
 GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@
 GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@
@@ -828,6 +839,7 @@
 GL_UNISTRING_GNULIB_GETPAGESIZE = @GL_UNISTRING_GNULIB_GETPAGESIZE@
 GL_UNISTRING_GNULIB_GETPASS = @GL_UNISTRING_GNULIB_GETPASS@
 GL_UNISTRING_GNULIB_GETPASS_GNU = @GL_UNISTRING_GNULIB_GETPASS_GNU@
+GL_UNISTRING_GNULIB_GETPROGNAME = @GL_UNISTRING_GNULIB_GETPROGNAME@
 GL_UNISTRING_GNULIB_GETSUBOPT = @GL_UNISTRING_GNULIB_GETSUBOPT@
 GL_UNISTRING_GNULIB_GETUSERSHELL = @GL_UNISTRING_GNULIB_GETUSERSHELL@
 GL_UNISTRING_GNULIB_GRANTPT = @GL_UNISTRING_GNULIB_GRANTPT@
@@ -861,6 +873,8 @@
 GL_UNISTRING_GNULIB_MBSSPN = @GL_UNISTRING_GNULIB_MBSSPN@
 GL_UNISTRING_GNULIB_MBSSTR = @GL_UNISTRING_GNULIB_MBSSTR@
 GL_UNISTRING_GNULIB_MBSTOK_R = @GL_UNISTRING_GNULIB_MBSTOK_R@
+GL_UNISTRING_GNULIB_MBSTOWCS = @GL_UNISTRING_GNULIB_MBSTOWCS@
+GL_UNISTRING_GNULIB_MBSZERO = @GL_UNISTRING_GNULIB_MBSZERO@
 GL_UNISTRING_GNULIB_MBTOWC = @GL_UNISTRING_GNULIB_MBTOWC@
 GL_UNISTRING_GNULIB_MDA_ACCESS = @GL_UNISTRING_GNULIB_MDA_ACCESS@
 GL_UNISTRING_GNULIB_MDA_CHDIR = @GL_UNISTRING_GNULIB_MDA_CHDIR@
@@ -895,6 +909,7 @@
 GL_UNISTRING_GNULIB_MEMMEM = @GL_UNISTRING_GNULIB_MEMMEM@
 GL_UNISTRING_GNULIB_MEMPCPY = @GL_UNISTRING_GNULIB_MEMPCPY@
 GL_UNISTRING_GNULIB_MEMRCHR = @GL_UNISTRING_GNULIB_MEMRCHR@
+GL_UNISTRING_GNULIB_MEMSET_EXPLICIT = @GL_UNISTRING_GNULIB_MEMSET_EXPLICIT@
 GL_UNISTRING_GNULIB_MKDTEMP = @GL_UNISTRING_GNULIB_MKDTEMP@
 GL_UNISTRING_GNULIB_MKOSTEMP = @GL_UNISTRING_GNULIB_MKOSTEMP@
 GL_UNISTRING_GNULIB_MKOSTEMPS = @GL_UNISTRING_GNULIB_MKOSTEMPS@
@@ -910,6 +925,7 @@
 GL_UNISTRING_GNULIB_PUTENV = @GL_UNISTRING_GNULIB_PUTENV@
 GL_UNISTRING_GNULIB_PWRITE = @GL_UNISTRING_GNULIB_PWRITE@
 GL_UNISTRING_GNULIB_QSORT_R = @GL_UNISTRING_GNULIB_QSORT_R@
+GL_UNISTRING_GNULIB_RAND = @GL_UNISTRING_GNULIB_RAND@
 GL_UNISTRING_GNULIB_RANDOM = @GL_UNISTRING_GNULIB_RANDOM@
 GL_UNISTRING_GNULIB_RANDOM_R = @GL_UNISTRING_GNULIB_RANDOM_R@
 GL_UNISTRING_GNULIB_RAWMEMCHR = @GL_UNISTRING_GNULIB_RAWMEMCHR@
@@ -958,6 +974,141 @@
 GL_UNISTRING_GNULIB_SYSTEM_POSIX = @GL_UNISTRING_GNULIB_SYSTEM_POSIX@
 GL_UNISTRING_GNULIB_TRUNCATE = @GL_UNISTRING_GNULIB_TRUNCATE@
 GL_UNISTRING_GNULIB_TTYNAME_R = @GL_UNISTRING_GNULIB_TTYNAME_R@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE@
 GL_UNISTRING_GNULIB_UNISTD_H_GETOPT = @GL_UNISTRING_GNULIB_UNISTD_H_GETOPT@
 GL_UNISTRING_GNULIB_UNISTD_H_NONBLOCKING = @GL_UNISTRING_GNULIB_UNISTD_H_NONBLOCKING@
 GL_UNISTRING_GNULIB_UNISTD_H_SIGPIPE = @GL_UNISTRING_GNULIB_UNISTD_H_SIGPIPE@
@@ -996,6 +1147,7 @@
 GL_UNISTRING_GNULIB_WCTOB = @GL_UNISTRING_GNULIB_WCTOB@
 GL_UNISTRING_GNULIB_WCTOMB = @GL_UNISTRING_GNULIB_WCTOMB@
 GL_UNISTRING_GNULIB_WCWIDTH = @GL_UNISTRING_GNULIB_WCWIDTH@
+GL_UNISTRING_GNULIB_WGETCWD = @GL_UNISTRING_GNULIB_WGETCWD@
 GL_UNISTRING_GNULIB_WMEMCHR = @GL_UNISTRING_GNULIB_WMEMCHR@
 GL_UNISTRING_GNULIB_WMEMCMP = @GL_UNISTRING_GNULIB_WMEMCMP@
 GL_UNISTRING_GNULIB_WMEMCPY = @GL_UNISTRING_GNULIB_WMEMCPY@
@@ -1007,7 +1159,6 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@
-GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
@@ -1043,6 +1194,7 @@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
+HAVE_DECL_GETW = @HAVE_DECL_GETW@
 HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
 HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
 HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@
@@ -1050,6 +1202,8 @@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
+HAVE_DECL_PROGRAM_INVOCATION_NAME = @HAVE_DECL_PROGRAM_INVOCATION_NAME@
+HAVE_DECL_PUTW = @HAVE_DECL_PUTW@
 HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
 HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@
@@ -1071,6 +1225,9 @@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP3 = @HAVE_DUP3@
+HAVE_ERROR = @HAVE_ERROR@
+HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@
+HAVE_ERROR_H = @HAVE_ERROR_H@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
 HAVE_EXECVPE = @HAVE_EXECVPE@
 HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@
@@ -1097,10 +1254,13 @@
 HAVE_GETOPT_H = @HAVE_GETOPT_H@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETPASS = @HAVE_GETPASS@
+HAVE_GETPROGNAME = @HAVE_GETPROGNAME@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
 HAVE_GETUMASK = @HAVE_GETUMASK@
 HAVE_GRANTPT = @HAVE_GRANTPT@
 HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_IMAXABS = @HAVE_IMAXABS@
+HAVE_IMAXDIV = @HAVE_IMAXDIV@
 HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@
 HAVE_INITSTATE = @HAVE_INITSTATE@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -1119,6 +1279,7 @@
 HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
 HAVE_MBTOWC = @HAVE_MBTOWC@
 HAVE_MEMPCPY = @HAVE_MEMPCPY@
+HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@
 HAVE_MKDIRAT = @HAVE_MKDIRAT@
 HAVE_MKDTEMP = @HAVE_MKDTEMP@
 HAVE_MKFIFO = @HAVE_MKFIFO@
@@ -1194,6 +1355,7 @@
 HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@
 HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNISTRING_WOE32DLL_H = @HAVE_UNISTRING_WOE32DLL_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
 HAVE_USLEEP = @HAVE_USLEEP@
@@ -1255,6 +1417,10 @@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LCOV = @LCOV@
+LC_COLLATE_IMPLEMENTED = @LC_COLLATE_IMPLEMENTED@
+LC_MONETARY_IMPLEMENTED = @LC_MONETARY_IMPLEMENTED@
+LC_NUMERIC_IMPLEMENTED = @LC_NUMERIC_IMPLEMENTED@
+LC_TIME_IMPLEMENTED = @LC_TIME_IMPLEMENTED@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -1274,6 +1440,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
 LOG_VALGRIND = @LOG_VALGRIND@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
@@ -1294,6 +1461,7 @@
 NEXT_ASSERT_H = @NEXT_ASSERT_H@
 NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
+NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
@@ -1311,6 +1479,7 @@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
+NEXT_ERROR_H = @NEXT_ERROR_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
@@ -1366,6 +1535,9 @@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
+REPLACE_DUP3 = @REPLACE_DUP3@
+REPLACE_ERROR = @REPLACE_ERROR@
+REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@
 REPLACE_EXECL = @REPLACE_EXECL@
 REPLACE_EXECLE = @REPLACE_EXECLE@
 REPLACE_EXECLP = @REPLACE_EXECLP@
@@ -1374,10 +1546,12 @@
 REPLACE_EXECVP = @REPLACE_EXECVP@
 REPLACE_EXECVPE = @REPLACE_EXECVPE@
 REPLACE_FACCESSAT = @REPLACE_FACCESSAT@
+REPLACE_FCHDIR = @REPLACE_FCHDIR@
 REPLACE_FCHMODAT = @REPLACE_FCHMODAT@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
+REPLACE_FDATASYNC = @REPLACE_FDATASYNC@
 REPLACE_FDOPEN = @REPLACE_FDOPEN@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FFSLL = @REPLACE_FFSLL@
@@ -1399,16 +1573,22 @@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
 REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
 REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
+REPLACE_GETENTROPY = @REPLACE_GETENTROPY@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
+REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@
 REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETPASS = @REPLACE_GETPASS@
 REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@
+REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@
+REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@
 REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
+REPLACE_IMAXABS = @REPLACE_IMAXABS@
+REPLACE_IMAXDIV = @REPLACE_IMAXDIV@
 REPLACE_INITSTATE = @REPLACE_INITSTATE@
 REPLACE_ISATTY = @REPLACE_ISATTY@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
@@ -1426,14 +1606,20 @@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_MBSTOWCS = @REPLACE_MBSTOWCS@
 REPLACE_MBTOWC = @REPLACE_MBTOWC@
+REPLACE_MB_CUR_MAX = @REPLACE_MB_CUR_MAX@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
+REPLACE_MEMPCPY = @REPLACE_MEMPCPY@
+REPLACE_MEMSET_EXPLICIT = @REPLACE_MEMSET_EXPLICIT@
 REPLACE_MKDIR = @REPLACE_MKDIR@
 REPLACE_MKFIFO = @REPLACE_MKFIFO@
 REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@
 REPLACE_MKNOD = @REPLACE_MKNOD@
 REPLACE_MKNODAT = @REPLACE_MKNODAT@
+REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@
+REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@
 REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
 REPLACE_MKTIME = @REPLACE_MKTIME@
 REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
@@ -1442,8 +1628,10 @@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
 REPLACE_PERROR = @REPLACE_PERROR@
+REPLACE_PIPE2 = @REPLACE_PIPE2@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@
+REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
 REPLACE_PTSNAME = @REPLACE_PTSNAME@
@@ -1451,6 +1639,7 @@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
 REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RAND = @REPLACE_RAND@
 REPLACE_RANDOM = @REPLACE_RANDOM@
 REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
 REPLACE_READ = @REPLACE_READ@
@@ -1465,6 +1654,7 @@
 REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SETENV = @REPLACE_SETENV@
+REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@
 REPLACE_SETSTATE = @REPLACE_SETSTATE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
@@ -1472,6 +1662,7 @@
 REPLACE_STAT = @REPLACE_STAT@
 REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
+REPLACE_STPCPY = @REPLACE_STPCPY@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
 REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
@@ -1494,9 +1685,13 @@
 REPLACE_STRTOUL = @REPLACE_STRTOUL@
 REPLACE_STRTOULL = @REPLACE_STRTOULL@
 REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
+REPLACE_STRVERSCMP = @REPLACE_STRVERSCMP@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
+REPLACE_TIME = @REPLACE_TIME@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
+REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@
+REPLACE_TIMESPEC_GETRES = @REPLACE_TIMESPEC_GETRES@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
 REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
@@ -1513,21 +1708,26 @@
 REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@
 REPLACE_VSPRINTF = @REPLACE_VSPRINTF@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSCMP = @REPLACE_WCSCMP@
 REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
+REPLACE_WCSNCMP = @REPLACE_WCSNCMP@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
+REPLACE_WCSSTR = @REPLACE_WCSSTR@
 REPLACE_WCSTOK = @REPLACE_WCSTOK@
 REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
 REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+REPLACE_WMEMCMP = @REPLACE_WMEMCMP@
+REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@
 REPLACE_WRITE = @REPLACE_WRITE@
+REPLACE__EXIT = @REPLACE__EXIT@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
-STDALIGN_H = @STDALIGN_H@
 STDARG_H = @STDARG_H@
 STDCKDINT_H = @STDCKDINT_H@
 STDDEF_H = @STDDEF_H@
@@ -1550,6 +1750,8 @@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WERROR_CFLAGS = @WERROR_CFLAGS@
+WERROR_TESTS_CFLAGS = @WERROR_TESTS_CFLAGS@
 WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
 WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
@@ -1637,10 +1839,10 @@
 	$(top_srcdir)/build-aux/announce-gen assert.in.h verify.h \
 	basename-lgpl.h cloexec.h \
 	$(top_srcdir)/build-aux/do-release-commit-and-tag errno.in.h \
-	error.h fcntl.in.h fd-hook.h filename.h stat-w32.c stat-w32.h \
-	$(top_srcdir)/build-aux/gendocs.sh getopt-cdefs.in.h \
-	getopt-core.h getopt-ext.h getopt-pfx-core.h getopt-pfx-ext.h \
-	getopt.in.h getopt_int.h \
+	error.in.h fcntl.in.h fd-hook.h filename.h stat-w32.c \
+	stat-w32.h $(top_srcdir)/build-aux/gendocs.sh \
+	getopt-cdefs.in.h getopt-core.h getopt-ext.h getopt-pfx-core.h \
+	getopt-pfx-ext.h getopt.in.h getopt_int.h getprogname.h \
 	$(top_srcdir)/build-aux/git-version-gen \
 	$(top_srcdir)/build-aux/gitlog-to-changelog \
 	$(top_srcdir)/build-aux/gnu-web-doc-update \
@@ -1649,26 +1851,28 @@
 	limits.in.h $(top_srcdir)/maint.mk malloca.h msvc-inval.h \
 	msvc-nothrow.h pathmax.h rawmemchr.valgrind _Noreturn.h \
 	arg-nonnull.h c++defs.h warn-on-use.h stat-w32.c stat-w32.h \
-	stat-time.h stdalign.in.h stdarg.in.h intprops-internal.h \
-	stdckdint.in.h stddef.in.h stdint.in.h stdio.in.h stdlib.in.h \
+	stat-time.h stdarg.in.h intprops-internal.h stdckdint.in.h \
+	stddef.in.h stdint.in.h stdio.in.h stdlib.in.h \
 	strchrnul.valgrind strerror-override.h string.in.h \
 	sys_stat.in.h sys_types.in.h time.in.h unistd.in.h \
 	$(top_srcdir)/build-aux/update-copyright \
 	$(top_srcdir)/build-aux/useless-if-before-free \
 	$(top_srcdir)/build-aux/vc-list-files xalloc-oversized.h
-BUILT_SOURCES = $(ALLOCA_H) $(ASSERT_H) $(ERRNO_H) fcntl.h $(GETOPT_H) \
-	$(GETOPT_CDEFS_H) $(LIMITS_H) $(STDALIGN_H) $(STDARG_H) \
+BUILT_SOURCES = $(ALLOCA_H) $(ASSERT_H) $(ERRNO_H) error.h fcntl.h \
+	$(GETOPT_H) $(GETOPT_CDEFS_H) $(LIMITS_H) $(STDARG_H) \
 	$(STDCKDINT_H) $(STDDEF_H) $(STDINT_H) stdio.h stdlib.h \
 	string.h sys/stat.h sys/types.h time.h unistd.h
 SUFFIXES = 
 MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t assert.h \
-	assert.h-t errno.h errno.h-t fcntl.h fcntl.h-t getopt.h \
-	getopt.h-t getopt-cdefs.h getopt-cdefs.h-t limits.h limits.h-t \
-	stdalign.h stdalign.h-t stdarg.h stdarg.h-t stdckdint.h \
+	assert.h-t errno.h errno.h-t error.h error.h-t fcntl.h \
+	fcntl.h-t getopt.h getopt.h-t getopt-cdefs.h getopt-cdefs.h-t \
+	limits.h limits.h-t stdarg.h stdarg.h-t stdckdint.h \
 	stdckdint.h-t stddef.h stddef.h-t stdint.h stdint.h-t stdio.h \
-	stdio.h-t stdlib.h stdlib.h-t string.h string.h-t sys/stat.h \
-	sys/stat.h-t sys/types.h sys/types.h-t time.h time.h-t \
-	unistd.h unistd.h-t
+	stdio.h-t1 stdio.h-t2 stdio.h-t3 stdlib.h stdlib.h-t1 \
+	stdlib.h-t2 stdlib.h-t3 string.h string.h-t1 string.h-t2 \
+	sys/stat.h sys/stat.h-t sys/types.h sys/types.h-t time.h \
+	time.h-t unistd.h unistd.h-t1 unistd.h-t2 unistd.h-t3 \
+	unistd.h-t4
 MOSTLYCLEANDIRS = sys
 CLEANFILES = 
 DISTCLEANFILES = 
@@ -1683,12 +1887,12 @@
 libgnu_la_SOURCES = basename-lgpl.c cloexec.c $(am__append_1) \
 	$(am__append_2) $(am__append_3) $(am__append_4) fd-hook.c \
 	$(am__append_5) $(am__append_6) $(am__append_7) \
-	$(am__append_8) $(am__append_9) getprogname.h getprogname.c \
-	gettext.h idx.h malloca.c $(am__append_10) $(am__append_11) \
-	$(am__append_12) progname.h progname.c $(am__append_13) \
-	$(am__append_14) stat-time.c $(am__append_15) $(am__append_16) \
-	$(am__append_17) $(am__append_18) $(am__append_19) \
-	$(am__append_20) unistd.c version-etc.h version-etc.c
+	$(am__append_8) $(am__append_9) $(am__append_10) gettext.h \
+	idx.h malloca.c $(am__append_11) $(am__append_12) \
+	$(am__append_13) progname.h progname.c $(am__append_14) \
+	$(am__append_15) stat-time.c $(am__append_16) $(am__append_17) \
+	$(am__append_18) $(am__append_19) $(am__append_20) \
+	$(am__append_21) unistd.c version-etc.h version-etc.c
 libgnu_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAG_GNULIB_WARNINGS)
 libgnu_la_LIBADD = $(gl_LTLIBOBJS)
 libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS)
@@ -2479,6 +2683,21 @@
 @GL_GENERATE_ERRNO_H_FALSE@errno.h: $(top_builddir)/config.status
 @GL_GENERATE_ERRNO_H_FALSE@	rm -f $@
 
+# We need the following in order to override <error.h>.
+error.h: error.in.h $(top_builddir)/config.status $(CXXDEFS_H)
+	$(gl_V_at)$(SED_HEADER_STDOUT) \
+	      -e 's|@''GUARD_PREFIX''@|GL|g' \
+	      -e 's|@''HAVE_ERROR_H''@|$(HAVE_ERROR_H)|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''NEXT_ERROR_H''@|$(NEXT_ERROR_H)|g' \
+	      -e 's|@''HAVE_ERROR''@|$(HAVE_ERROR)|g' \
+	      -e 's|@''HAVE_ERROR_AT_LINE''@|$(HAVE_ERROR_AT_LINE)|g' \
+	      -e 's|@''REPLACE_ERROR''@|$(REPLACE_ERROR)|g' \
+	      -e 's|@''REPLACE_ERROR_AT_LINE''@|$(REPLACE_ERROR_AT_LINE)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      $(srcdir)/error.in.h > $@-t
+	$(AM_V_at)mv $@-t $@
+
 # We need the following in order to create <fcntl.h> when the system
 # doesn't have one that works with the given compiler.
 fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
@@ -2548,14 +2767,6 @@
 @GL_GENERATE_LIMITS_H_FALSE@limits.h: $(top_builddir)/config.status
 @GL_GENERATE_LIMITS_H_FALSE@	rm -f $@
 
-# We need the following in order to create <stdalign.h> when the system
-# doesn't have one that works.
-@GL_GENERATE_STDALIGN_H_TRUE@stdalign.h: stdalign.in.h $(top_builddir)/config.status
-@GL_GENERATE_STDALIGN_H_TRUE@	$(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/stdalign.in.h
-@GL_GENERATE_STDALIGN_H_TRUE@	$(AM_V_at)mv $@-t $@
-@GL_GENERATE_STDALIGN_H_FALSE@stdalign.h: $(top_builddir)/config.status
-@GL_GENERATE_STDALIGN_H_FALSE@	rm -f $@
-
 # We need the following in order to create <stdarg.h> when the system
 # doesn't have one that works with the given compiler.
 @GL_GENERATE_STDARG_H_TRUE@stdarg.h: stdarg.in.h $(top_builddir)/config.status
@@ -2701,14 +2912,17 @@
 	      -e 's/@''GNULIB_MDA_GETW''@/$(GL_GNULIB_MDA_GETW)/g' \
 	      -e 's/@''GNULIB_MDA_PUTW''@/$(GL_GNULIB_MDA_PUTW)/g' \
 	      -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GL_GNULIB_MDA_TEMPNAM)/g' \
-	      < $(srcdir)/stdio.in.h | \
-	  sed -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \
+	      < $(srcdir)/stdio.in.h > $@-t1
+	$(AM_V_at)sed \
+	      -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \
 	      -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \
 	      -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \
 	      -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \
 	      -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
 	      -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
+	      -e 's|@''HAVE_DECL_GETW''@|$(HAVE_DECL_GETW)|g' \
 	      -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \
+	      -e 's|@''HAVE_DECL_PUTW''@|$(HAVE_DECL_PUTW)|g' \
 	      -e 's|@''HAVE_DECL_SNPRINTF''@|$(HAVE_DECL_SNPRINTF)|g' \
 	      -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \
 	      -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \
@@ -2719,6 +2933,8 @@
 	      -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \
 	      -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \
 	      -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \
+	      < $@-t1 > $@-t2
+	$(AM_V_at)sed \
 	      -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \
 	      -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \
 	      -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \
@@ -2756,8 +2972,9 @@
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      > $@-t
-	$(AM_V_at)mv $@-t $@
+	      < $@-t2 > $@-t3
+	$(AM_V_at)rm -f $@-t1 $@-t2
+	$(AM_V_at)mv $@-t3 $@
 
 # We need the following in order to create <stdlib.h> when the system
 # doesn't have one that works with the given compiler.
@@ -2777,10 +2994,12 @@
 	      -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GL_GNULIB_CANONICALIZE_FILE_NAME)/g' \
 	      -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \
 	      -e 's/@''GNULIB_GETLOADAVG''@/$(GL_GNULIB_GETLOADAVG)/g' \
+	      -e 's/@''GNULIB_GETPROGNAME''@/$(GL_GNULIB_GETPROGNAME)/g' \
 	      -e 's/@''GNULIB_GETSUBOPT''@/$(GL_GNULIB_GETSUBOPT)/g' \
 	      -e 's/@''GNULIB_GRANTPT''@/$(GL_GNULIB_GRANTPT)/g' \
 	      -e 's/@''GNULIB_MALLOC_GNU''@/$(GL_GNULIB_MALLOC_GNU)/g' \
 	      -e 's/@''GNULIB_MALLOC_POSIX''@/$(GL_GNULIB_MALLOC_POSIX)/g' \
+	      -e 's/@''GNULIB_MBSTOWCS''@/$(GL_GNULIB_MBSTOWCS)/g' \
 	      -e 's/@''GNULIB_MBTOWC''@/$(GL_GNULIB_MBTOWC)/g' \
 	      -e 's/@''GNULIB_MKDTEMP''@/$(GL_GNULIB_MKDTEMP)/g' \
 	      -e 's/@''GNULIB_MKOSTEMP''@/$(GL_GNULIB_MKOSTEMP)/g' \
@@ -2793,6 +3012,7 @@
 	      -e 's/@''GNULIB_PTSNAME_R''@/$(GL_GNULIB_PTSNAME_R)/g' \
 	      -e 's/@''GNULIB_PUTENV''@/$(GL_GNULIB_PUTENV)/g' \
 	      -e 's/@''GNULIB_QSORT_R''@/$(GL_GNULIB_QSORT_R)/g' \
+	      -e 's/@''GNULIB_RAND''@/$(GL_GNULIB_RAND)/g' \
 	      -e 's/@''GNULIB_RANDOM''@/$(GL_GNULIB_RANDOM)/g' \
 	      -e 's/@''GNULIB_RANDOM_R''@/$(GL_GNULIB_RANDOM_R)/g' \
 	      -e 's/@''GNULIB_REALLOC_GNU''@/$(GL_GNULIB_REALLOC_GNU)/g' \
@@ -2817,8 +3037,9 @@
 	      -e 's/@''GNULIB_MDA_GCVT''@/$(GL_GNULIB_MDA_GCVT)/g' \
 	      -e 's/@''GNULIB_MDA_MKTEMP''@/$(GL_GNULIB_MDA_MKTEMP)/g' \
 	      -e 's/@''GNULIB_MDA_PUTENV''@/$(GL_GNULIB_MDA_PUTENV)/g' \
-	      < $(srcdir)/stdlib.in.h | \
-	  sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
+	      < $(srcdir)/stdlib.in.h > $@-t1
+	$(AM_V_at)sed \
+	      -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
 	      -e 's|@''HAVE_ALIGNED_ALLOC''@|$(HAVE_ALIGNED_ALLOC)|g' \
 	      -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
 	      -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
@@ -2826,6 +3047,8 @@
 	      -e 's|@''HAVE_DECL_FCVT''@|$(HAVE_DECL_FCVT)|g' \
 	      -e 's|@''HAVE_DECL_GCVT''@|$(HAVE_DECL_GCVT)|g' \
 	      -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
+	      -e 's|@''HAVE_DECL_PROGRAM_INVOCATION_NAME''@|$(HAVE_DECL_PROGRAM_INVOCATION_NAME)|g' \
+	      -e 's|@''HAVE_GETPROGNAME''@|$(HAVE_GETPROGNAME)|g' \
 	      -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
 	      -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \
 	      -e 's|@''HAVE_INITSTATE''@|$(HAVE_INITSTATE)|g' \
@@ -2861,21 +3084,33 @@
 	      -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
 	      -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
 	      -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \
+	      < $@-t1 > $@-t2
+	$(AM_V_at)sed \
+	      -e 's|@''REPLACE__EXIT''@|$(REPLACE__EXIT)|g' \
 	      -e 's|@''REPLACE_ALIGNED_ALLOC''@|$(REPLACE_ALIGNED_ALLOC)|g' \
 	      -e 's|@''REPLACE_CALLOC_FOR_CALLOC_GNU''@|$(REPLACE_CALLOC_FOR_CALLOC_GNU)|g' \
 	      -e 's|@''REPLACE_CALLOC_FOR_CALLOC_POSIX''@|$(REPLACE_CALLOC_FOR_CALLOC_POSIX)|g' \
 	      -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \
 	      -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \
+	      -e 's|@''REPLACE_GETLOADAVG''@|$(REPLACE_GETLOADAVG)|g' \
+	      -e 's|@''REPLACE_GETPROGNAME''@|$(REPLACE_GETPROGNAME)|g' \
+	      -e 's|@''REPLACE_GETSUBOPT''@|$(REPLACE_GETSUBOPT)|g' \
 	      -e 's|@''REPLACE_INITSTATE''@|$(REPLACE_INITSTATE)|g' \
 	      -e 's|@''REPLACE_MALLOC_FOR_MALLOC_GNU''@|$(REPLACE_MALLOC_FOR_MALLOC_GNU)|g' \
 	      -e 's|@''REPLACE_MALLOC_FOR_MALLOC_POSIX''@|$(REPLACE_MALLOC_FOR_MALLOC_POSIX)|g' \
+	      -e 's|@''REPLACE_MB_CUR_MAX''@|$(REPLACE_MB_CUR_MAX)|g' \
+	      -e 's|@''REPLACE_MBSTOWCS''@|$(REPLACE_MBSTOWCS)|g' \
 	      -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
+	      -e 's|@''REPLACE_MKOSTEMP''@|$(REPLACE_MKOSTEMP)|g' \
+	      -e 's|@''REPLACE_MKOSTEMPS''@|$(REPLACE_MKOSTEMPS)|g' \
 	      -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
 	      -e 's|@''REPLACE_POSIX_MEMALIGN''@|$(REPLACE_POSIX_MEMALIGN)|g' \
+	      -e 's|@''REPLACE_POSIX_OPENPT''@|$(REPLACE_POSIX_OPENPT)|g' \
 	      -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
 	      -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
 	      -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
 	      -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \
+	      -e 's|@''REPLACE_RAND''@|$(REPLACE_RAND)|g' \
 	      -e 's|@''REPLACE_RANDOM''@|$(REPLACE_RANDOM)|g' \
 	      -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \
 	      -e 's|@''REPLACE_REALLOC_FOR_REALLOC_GNU''@|$(REPLACE_REALLOC_FOR_REALLOC_GNU)|g' \
@@ -2896,8 +3131,9 @@
 	      -e '/definition of _Noreturn/r $(_NORETURN_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      > $@-t
-	$(AM_V_at)mv $@-t $@
+	      < $@-t2 > $@-t3
+	$(AM_V_at)rm -f $@-t1 $@-t2
+	$(AM_V_at)mv $@-t3 $@
 
 # We need the following in order to create <string.h> when the system
 # doesn't have one that works with the given compiler.
@@ -2929,6 +3165,7 @@
 	      -e 's/@''GNULIB_MEMMEM''@/$(GL_GNULIB_MEMMEM)/g' \
 	      -e 's/@''GNULIB_MEMPCPY''@/$(GL_GNULIB_MEMPCPY)/g' \
 	      -e 's/@''GNULIB_MEMRCHR''@/$(GL_GNULIB_MEMRCHR)/g' \
+	      -e 's/@''GNULIB_MEMSET_EXPLICIT''@/$(GL_GNULIB_MEMSET_EXPLICIT)/g' \
 	      -e 's/@''GNULIB_RAWMEMCHR''@/$(GL_GNULIB_RAWMEMCHR)/g' \
 	      -e 's/@''GNULIB_STPCPY''@/$(GL_GNULIB_STPCPY)/g' \
 	      -e 's/@''GNULIB_STPNCPY''@/$(GL_GNULIB_STPNCPY)/g' \
@@ -2952,14 +3189,16 @@
 	      -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GL_GNULIB_MDA_MEMCCPY)/g' \
 	      -e 's/@''GNULIB_MDA_STRDUP''@/$(GL_GNULIB_MDA_STRDUP)/g' \
 	      -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \
-	      < $(srcdir)/string.in.h | \
-	  sed -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \
+	      < $(srcdir)/string.in.h > $@-t1
+	$(AM_V_at)sed \
+	      -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \
 	      -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \
 	      -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \
 	      -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
 	      -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
 	      -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
 	      -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \
+	      -e 's|@''HAVE_MEMSET_EXPLICIT''@|$(HAVE_MEMSET_EXPLICIT)|g' \
 	      -e 's|@''HAVE_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \
 	      -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \
 	      -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \
@@ -2980,7 +3219,10 @@
 	      -e 's|@''REPLACE_FFSLL''@|$(REPLACE_FFSLL)|g' \
 	      -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \
 	      -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \
+	      -e 's|@''REPLACE_MEMPCPY''@|$(REPLACE_MEMPCPY)|g' \
+	      -e 's|@''REPLACE_MEMSET_EXPLICIT''@|$(REPLACE_MEMSET_EXPLICIT)|g' \
 	      -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \
+	      -e 's|@''REPLACE_STPCPY''@|$(REPLACE_STPCPY)|g' \
 	      -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \
 	      -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \
 	      -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \
@@ -2994,12 +3236,14 @@
 	      -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \
 	      -e 's|@''REPLACE_STRERRORNAME_NP''@|$(REPLACE_STRERRORNAME_NP)|g' \
 	      -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \
+	      -e 's|@''REPLACE_STRVERSCMP''@|$(REPLACE_STRVERSCMP)|g' \
 	      -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      > $@-t
-	$(AM_V_at)mv $@-t $@
+	      < $@-t1 > $@-t2
+	$(AM_V_at)rm -f $@-t1
+	$(AM_V_at)mv $@-t2 $@
 
 # We need the following in order to create <sys/stat.h> when the system
 # has one that is incomplete.
@@ -3094,6 +3338,7 @@
 	      -e 's/@''GNULIB_NANOSLEEP''@/$(GL_GNULIB_NANOSLEEP)/g' \
 	      -e 's/@''GNULIB_STRFTIME''@/$(GL_GNULIB_STRFTIME)/g' \
 	      -e 's/@''GNULIB_STRPTIME''@/$(GL_GNULIB_STRPTIME)/g' \
+	      -e 's/@''GNULIB_TIME''@/$(GL_GNULIB_TIME)/g' \
 	      -e 's/@''GNULIB_TIMEGM''@/$(GL_GNULIB_TIMEGM)/g' \
 	      -e 's/@''GNULIB_TIMESPEC_GET''@/$(GL_GNULIB_TIMESPEC_GET)/g' \
 	      -e 's/@''GNULIB_TIMESPEC_GETRES''@/$(GL_GNULIB_TIMESPEC_GETRES)/g' \
@@ -3115,7 +3360,10 @@
 	      -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \
 	      -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
 	      -e 's|@''REPLACE_STRFTIME''@|$(REPLACE_STRFTIME)|g' \
+	      -e 's|@''REPLACE_TIME''@|$(REPLACE_TIME)|g' \
 	      -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \
+	      -e 's|@''REPLACE_TIMESPEC_GET''@|$(REPLACE_TIMESPEC_GET)|g' \
+	      -e 's|@''REPLACE_TIMESPEC_GETRES''@|$(REPLACE_TIMESPEC_GETRES)|g' \
 	      -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \
 	      -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \
 	      -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
@@ -3162,6 +3410,8 @@
 	      -e 's/@''GNULIB_FDATASYNC''@/$(GL_GNULIB_FDATASYNC)/g' \
 	      -e 's/@''GNULIB_FSYNC''@/$(GL_GNULIB_FSYNC)/g' \
 	      -e 's/@''GNULIB_FTRUNCATE''@/$(GL_GNULIB_FTRUNCATE)/g' \
+	      < $(srcdir)/unistd.in.h > $@-t1
+	$(AM_V_at)sed \
 	      -e 's/@''GNULIB_GETCWD''@/$(GL_GNULIB_GETCWD)/g' \
 	      -e 's/@''GNULIB_GETDOMAINNAME''@/$(GL_GNULIB_GETDOMAINNAME)/g' \
 	      -e 's/@''GNULIB_GETDTABLESIZE''@/$(GL_GNULIB_GETDTABLESIZE)/g' \
@@ -3223,8 +3473,9 @@
 	      -e 's/@''GNULIB_MDA_SWAB''@/$(GL_GNULIB_MDA_SWAB)/g' \
 	      -e 's/@''GNULIB_MDA_UNLINK''@/$(GL_GNULIB_MDA_UNLINK)/g' \
 	      -e 's/@''GNULIB_MDA_WRITE''@/$(GL_GNULIB_MDA_WRITE)/g' \
-	      < $(srcdir)/unistd.in.h | \
-	  sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
+	      < $@-t1 > $@-t2
+	$(AM_V_at)sed \
+	      -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
 	      -e 's|@''HAVE_COPY_FILE_RANGE''@|$(HAVE_COPY_FILE_RANGE)|g' \
 	      -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \
 	      -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \
@@ -3271,13 +3522,15 @@
 	      -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
 	      -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
 	      -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
-	  | \
-	  sed -e 's|@''REPLACE_ACCESS''@|$(REPLACE_ACCESS)|g' \
+	      < $@-t2 > $@-t3
+	$(AM_V_at)sed \
+	      -e 's|@''REPLACE_ACCESS''@|$(REPLACE_ACCESS)|g' \
 	      -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
 	      -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \
 	      -e 's|@''REPLACE_COPY_FILE_RANGE''@|$(REPLACE_COPY_FILE_RANGE)|g' \
 	      -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \
 	      -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \
+	      -e 's|@''REPLACE_DUP3''@|$(REPLACE_DUP3)|g' \
 	      -e 's|@''REPLACE_EXECL''@|$(REPLACE_EXECL)|g' \
 	      -e 's|@''REPLACE_EXECLE''@|$(REPLACE_EXECLE)|g' \
 	      -e 's|@''REPLACE_EXECLP''@|$(REPLACE_EXECLP)|g' \
@@ -3286,11 +3539,14 @@
 	      -e 's|@''REPLACE_EXECVP''@|$(REPLACE_EXECVP)|g' \
 	      -e 's|@''REPLACE_EXECVPE''@|$(REPLACE_EXECVPE)|g' \
 	      -e 's|@''REPLACE_FACCESSAT''@|$(REPLACE_FACCESSAT)|g' \
+	      -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \
 	      -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \
+	      -e 's|@''REPLACE_FDATASYNC''@|$(REPLACE_FDATASYNC)|g' \
 	      -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \
 	      -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
 	      -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \
 	      -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \
+	      -e 's|@''REPLACE_GETENTROPY''@|$(REPLACE_GETENTROPY)|g' \
 	      -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
 	      -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
 	      -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
@@ -3301,12 +3557,14 @@
 	      -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
 	      -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \
 	      -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
+	      -e 's|@''REPLACE_PIPE2''@|$(REPLACE_PIPE2)|g' \
 	      -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \
 	      -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \
 	      -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \
 	      -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \
 	      -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \
 	      -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \
+	      -e 's|@''REPLACE_SETHOSTNAME''@|$(REPLACE_SETHOSTNAME)|g' \
 	      -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
 	      -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \
 	      -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \
@@ -3322,8 +3580,9 @@
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      > $@-t
-	$(AM_V_at)mv $@-t $@
+	      < $@-t3 > $@-t4
+	$(AM_V_at)rm -f $@-t1 $@-t2 $@-t3
+	$(AM_V_at)mv $@-t4 $@
 
 mostlyclean-local: mostlyclean-generic
 	@for dir in '' $(MOSTLYCLEANDIRS); do \

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/_Noreturn.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/_Noreturn.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/alloca.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/alloca.in.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/arg-nonnull.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/arg-nonnull.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/assert.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/assert.in.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/basename-lgpl.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/basename-lgpl.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/basename-lgpl.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/basename-lgpl.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/c++defs.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/c++defs.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/cdefs.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/cdefs.h Changed

@@ -1,4 +1,4 @@
-/* Copyright (C) 1992-2022 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2024 Free Software Foundation, Inc.
    Copyright The GNU Toolchain Authors.
    This file is part of the GNU C Library.
 
@@ -140,32 +140,37 @@
 #endif
 
 
+/* Gnulib avoids these definitions, as they don't work on non-glibc platforms.
+   In particular, __bos and __bos0 are defined differently in the Android libc.
+ */
+#ifndef __GNULIB_CDEFS
+
 /* Fortify support.  */
-#define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
-#define __bos0(ptr) __builtin_object_size (ptr, 0)
+# define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
+# define __bos0(ptr) __builtin_object_size (ptr, 0)
 
 /* Use __builtin_dynamic_object_size at _FORTIFY_SOURCE=3 when available.  */
-#if __USE_FORTIFY_LEVEL == 3 && (__glibc_clang_prereq (9, 0)		      \
-				 || __GNUC_PREREQ (12, 0))
-# define __glibc_objsize0(__o) __builtin_dynamic_object_size (__o, 0)
-# define __glibc_objsize(__o) __builtin_dynamic_object_size (__o, 1)
-#else
-# define __glibc_objsize0(__o) __bos0 (__o)
-# define __glibc_objsize(__o) __bos (__o)
-#endif
+# if __USE_FORTIFY_LEVEL == 3 && (__glibc_clang_prereq (9, 0)		      \
+				  || __GNUC_PREREQ (12, 0))
+#  define __glibc_objsize0(__o) __builtin_dynamic_object_size (__o, 0)
+#  define __glibc_objsize(__o) __builtin_dynamic_object_size (__o, 1)
+# else
+#  define __glibc_objsize0(__o) __bos0 (__o)
+#  define __glibc_objsize(__o) __bos (__o)
+# endif
 
 /* Compile time conditions to choose between the regular, _chk and _chk_warn
    variants.  These conditions should get evaluated to constant and optimized
    away.  */
 
-#define __glibc_safe_len_cond(__l, __s, __osz) ((__l) <= (__osz) / (__s))
-#define __glibc_unsigned_or_positive(__l) \
+# define __glibc_safe_len_cond(__l, __s, __osz) ((__l) <= (__osz) / (__s))
+# define __glibc_unsigned_or_positive(__l) \
   ((__typeof (__l)) 0 < (__typeof (__l)) -1				      \
    || (__builtin_constant_p (__l) && (__l) > 0))
 
 /* Length is known to be safe at compile time if the __L * __S <= __OBJSZ
    condition can be folded to a constant and if it is true, or unknown (-1) */
-#define __glibc_safe_or_unknown_len(__l, __s, __osz) \
+# define __glibc_safe_or_unknown_len(__l, __s, __osz) \
   ((__osz) == (__SIZE_TYPE__) -1					      \
    || (__glibc_unsigned_or_positive (__l)				      \
        && __builtin_constant_p (__glibc_safe_len_cond ((__SIZE_TYPE__) (__l), \
@@ -175,7 +180,7 @@
 /* Conversely, we know at compile time that the length is unsafe if the
    __L * __S <= __OBJSZ condition can be folded to a constant and if it is
    false.  */
-#define __glibc_unsafe_len(__l, __s, __osz) \
+# define __glibc_unsafe_len(__l, __s, __osz) \
   (__glibc_unsigned_or_positive (__l)					      \
    && __builtin_constant_p (__glibc_safe_len_cond ((__SIZE_TYPE__) (__l),     \
 						   __s, __osz))		      \
@@ -184,7 +189,7 @@
 /* Fortify function f.  __f_alias, __f_chk and __f_chk_warn must be
    declared.  */
 
-#define __glibc_fortify(f, __l, __s, __osz, ...) \
+# define __glibc_fortify(f, __l, __s, __osz, ...) \
   (__glibc_safe_or_unknown_len (__l, __s, __osz)			      \
    ? __ ## f ## _alias (__VA_ARGS__)					      \
    : (__glibc_unsafe_len (__l, __s, __osz)				      \
@@ -194,13 +199,16 @@
 /* Fortify function f, where object size argument passed to f is the number of
    elements and not total size.  */
 
-#define __glibc_fortify_n(f, __l, __s, __osz, ...) \
+# define __glibc_fortify_n(f, __l, __s, __osz, ...) \
   (__glibc_safe_or_unknown_len (__l, __s, __osz)			      \
    ? __ ## f ## _alias (__VA_ARGS__)					      \
    : (__glibc_unsafe_len (__l, __s, __osz)				      \
       ? __ ## f ## _chk_warn (__VA_ARGS__, (__osz) / (__s))		      \
       : __ ## f ## _chk (__VA_ARGS__, (__osz) / (__s))))		      \
 
+#endif
+
+
 #if __GNUC_PREREQ (4,3)
 # define __warnattr(msg) __attribute__((__warning__ (msg)))
 # define __errordecl(name, msg) \

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/cloexec.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/cloexec.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/cloexec.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/cloexec.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/close.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/close.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/dup2.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/dup2.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/errno.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/errno.in.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/error.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/error.c Changed

_service:tar_scm:libidn2-2.3.7.tar.gz/gl/error.in.h Added

@@ -0,0 +1,216 @@
+/* Declarations for error-reporting functions.
+   Copyright (C) 1995-1997, 2003, 2006, 2008-2024 Free Software Foundation,
+   Inc.
+   This file is part of the GNU C Library.
+
+   This file 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 file 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 <https://www.gnu.org/licenses/>.  */
+
+#ifndef _@GUARD_PREFIX@_ERROR_H
+
+/* No @PRAGMA_SYSTEM_HEADER@ here, because it would prevent
+   -Wimplicit-fallthrough warnings for missing FALLTHROUGH after error(...)
+   or error_at_line(...) invocations.  */
+
+/* The include_next requires a split double-inclusion guard.  */
+#if @HAVE_ERROR_H@
+# @INCLUDE_NEXT@ @NEXT_ERROR_H@
+#endif
+
+#ifndef _@GUARD_PREFIX@_ERROR_H
+#define _@GUARD_PREFIX@_ERROR_H
+
+/* This file uses _GL_ATTRIBUTE_ALWAYS_INLINE, _GL_ATTRIBUTE_FORMAT,
+  _GL_ATTRIBUTE_MAYBE_UNUSED.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
+/* Get 'unreachable'.  */
+#include <stddef.h>
+
+/* Get _GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, _GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM.  */
+#include <stdio.h>
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
+#if GNULIB_VFPRINTF_POSIX
+# define _GL_ATTRIBUTE_SPEC_PRINTF_ERROR _GL_ATTRIBUTE_SPEC_PRINTF_STANDARD
+#else
+# define _GL_ATTRIBUTE_SPEC_PRINTF_ERROR _GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM
+#endif
+
+/* Helper macro for supporting the compiler's control flow analysis better.
+   It evaluates its arguments only once.
+   Test case: Compile copy-file.c with "gcc -Wimplicit-fallthrough".  */
+#if defined __GNUC__ || defined __clang__
+/* Use 'unreachable' to tell the compiler when the function call does not
+   return.  */
+# define __gl_error_call1(function, status, ...) \
+    ((function) (status, __VA_ARGS__), \
+     (status) != 0 ? unreachable () : (void) 0)
+/* If STATUS is a not a constant, the function call may or may not return;
+   therefore -Wimplicit-fallthrough will produce a warning.  Use a compound
+   statement in order to evaluate STATUS only once.
+   If STATUS is a constant, we don't use a compound statement, because that
+   would trigger a -Wimplicit-fallthrough warning even when STATUS is != 0,
+   when not optimizing.  This causes STATUS to be evaluated twice, but
+   that's OK since it does not have side effects.  */
+# define __gl_error_call(function, status, ...)                 \
+    (__builtin_constant_p (status)                              \
+     ? __gl_error_call1 (function, status, __VA_ARGS__)         \
+     : __extension__                                            \
+       ({                                                       \
+         int const __errstatus = status;                        \
+         __gl_error_call1 (function, __errstatus, __VA_ARGS__); \
+       }))
+#else
+# define __gl_error_call(function, status, ...) \
+    (function) (status, __VA_ARGS__)
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Print a message with 'fprintf (stderr, FORMAT, ...)';
+   if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
+   If STATUS is nonzero, terminate the program with 'exit (STATUS)'.  */
+#if @REPLACE_ERROR@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  undef error
+#  define error rpl_error
+# endif
+_GL_FUNCDECL_RPL (error, void,
+                  (int __status, int __errnum, const char *__format, ...)
+                  _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 3, 4)));
+_GL_CXXALIAS_RPL (error, void,
+                  (int __status, int __errnum, const char *__format, ...));
+# ifndef _GL_NO_INLINE_ERROR
+#  undef error
+#  define error(status, ...) \
+     __gl_error_call (rpl_error, status, __VA_ARGS__)
+# endif
+#else
+# if ! @HAVE_ERROR@
+_GL_FUNCDECL_SYS (error, void,
+                  (int __status, int __errnum, const char *__format, ...)
+                  _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 3, 4)));
+# endif
+_GL_CXXALIAS_SYS (error, void,
+                  (int __status, int __errnum, const char *__format, ...));
+# ifndef _GL_NO_INLINE_ERROR
+#  ifdef error
+/* Only gcc ≥ 4.7 has __builtin_va_arg_pack.  */
+#   if _GL_GNUC_PREREQ (4, 7)
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wattributes"
+_GL_ATTRIBUTE_MAYBE_UNUSED
+static void
+_GL_ATTRIBUTE_ALWAYS_INLINE
+_GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 3, 4))
+_gl_inline_error (int __status, int __errnum, const char *__format, ...)
+{
+  return error (__status, __errnum, __format, __builtin_va_arg_pack ());
+}
+#    pragma GCC diagnostic pop
+#    undef error
+#    define error(status, ...) \
+       __gl_error_call (_gl_inline_error, status, __VA_ARGS__)
+#   endif
+#  else
+#   define error(status, ...) \
+      __gl_error_call (error, status, __VA_ARGS__)
+#  endif
+# endif
+#endif
+#if __GLIBC__ >= 2
+_GL_CXXALIASWARN (error);
+#endif
+
+/* Likewise.  If FILENAME is non-NULL, include FILENAME:LINENO: in the
+   message.  */
+#if @REPLACE_ERROR_AT_LINE@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  undef error_at_line
+#  define error_at_line rpl_error_at_line
+# endif
+_GL_FUNCDECL_RPL (error_at_line, void,
+                  (int __status, int __errnum, const char *__filename,
+                   unsigned int __lineno, const char *__format, ...)
+                  _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 5, 6)));
+_GL_CXXALIAS_RPL (error_at_line, void,
+                  (int __status, int __errnum, const char *__filename,
+                   unsigned int __lineno, const char *__format, ...));
+# ifndef _GL_NO_INLINE_ERROR
+#  undef error_at_line
+#  define error_at_line(status, ...) \
+     __gl_error_call (rpl_error_at_line, status, __VA_ARGS__)
+# endif
+#else
+# if ! @HAVE_ERROR_AT_LINE@
+_GL_FUNCDECL_SYS (error_at_line, void,
+                  (int __status, int __errnum, const char *__filename,
+                   unsigned int __lineno, const char *__format, ...)
+                  _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 5, 6)));
+# endif
+_GL_CXXALIAS_SYS (error_at_line, void,
+                  (int __status, int __errnum, const char *__filename,
+                   unsigned int __lineno, const char *__format, ...));
+# ifndef _GL_NO_INLINE_ERROR
+#  ifdef error_at_line
+/* Only gcc ≥ 4.7 has __builtin_va_arg_pack.  */
+#   if _GL_GNUC_PREREQ (4, 7)
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wattributes"
+_GL_ATTRIBUTE_MAYBE_UNUSED
+static void
+_GL_ATTRIBUTE_ALWAYS_INLINE
+_GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 5, 6))
+_gl_inline_error_at_line (int __status, int __errnum, const char *__filename,
+                          unsigned int __lineno, const char *__format, ...)
+{
+  return error_at_line (__status, __errnum, __filename, __lineno, __format,
+                        __builtin_va_arg_pack ());
+}
+#    pragma GCC diagnostic pop
+#    undef error_at_line
+#    define error_at_line(status, ...) \
+       __gl_error_call (_gl_inline_error_at_line, status, __VA_ARGS__)
+#   endif
+#  else
+#   define error_at_line(status, ...) \
+      __gl_error_call (error_at_line, status, __VA_ARGS__)
+#  endif
+# endif
+#endif
+_GL_CXXALIASWARN (error_at_line);
+
+/* If NULL, error will flush stdout, then print on stderr the program
+   name, a colon and a space.  Otherwise, error will call this
+   function without parameters instead.  */
+extern void (*error_print_progname) (void);
+
+/* This variable is incremented each time 'error' is called.  */
+extern unsigned int error_message_count;
+
+/* Sometimes we want to have at most one error per line.  This
+   variable controls whether this mode is selected or not.  */
+extern int error_one_per_line;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _@GUARD_PREFIX@_ERROR_H */
+#endif /* _@GUARD_PREFIX@_ERROR_H */

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/fcntl.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/fcntl.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/fcntl.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/fcntl.in.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/fd-hook.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/fd-hook.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/fd-hook.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/fd-hook.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/filename.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/filename.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/fstat.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/fstat.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/getdelim.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/getdelim.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/getdtablesize.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/getdtablesize.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/getline.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/getline.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/getopt-cdefs.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/getopt-cdefs.in.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/getopt-core.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/getopt-core.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/getopt-ext.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/getopt-ext.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/getopt-pfx-core.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/getopt-pfx-core.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/getopt-pfx-ext.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/getopt-pfx-ext.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/getopt.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/getopt.c Changed

@@ -1,5 +1,5 @@
 /* Getopt for GNU.
-   Copyright (C) 1987-2022 Free Software Foundation, Inc.
+   Copyright (C) 1987-2024 Free Software Foundation, Inc.
    This file is part of the GNU C Library and is also part of gnulib.
    Patches to this file should be submitted to both projects.
 
@@ -21,7 +21,7 @@
 # include <config.h>
 #endif
 
-#include "getopt.h"
+#include <getopt.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -223,8 +223,9 @@
     {
       /* Didn't find an exact match, so look for abbreviations.  */
       unsigned char *ambig_set = NULL;
-      int ambig_malloced = 0;
-      int ambig_fallback = 0;
+      /* Use simpler fallback diagnostic if ambig_set == &ambig_fallback.  */
+      unsigned char ambig_fallback;
+      void *ambig_malloced = NULL;
       int indfound = -1;
 
       for (p = longopts, option_index = 0; p->name; p++, option_index++)
@@ -242,39 +243,42 @@
 		     || pfound->val != p->val)
 	      {
 		/* Second or later nonexact match found.  */
-		if (!ambig_fallback)
+		if (ambig_set != &ambig_fallback)
 		  {
 		    if (!print_errors)
 		      /* Don't waste effort tracking the ambig set if
 			 we're not going to print it anyway.  */
-		      ambig_fallback = 1;
+		      ambig_set = &ambig_fallback;
 		    else if (!ambig_set)
 		      {
 			if (__libc_use_alloca (n_options))
 			  ambig_set = alloca (n_options);
-			else if ((ambig_set = malloc (n_options)) == NULL)
-			  /* Fall back to simpler error message.  */
-			  ambig_fallback = 1;
 			else
-			  ambig_malloced = 1;
+			  {
+			    ambig_malloced = malloc (n_options);
+			    /* Fall back to simpler diagnostic if
+			       memory allocation fails.  */
+			    ambig_set = (ambig_malloced ? ambig_malloced
+					 : &ambig_fallback);
+			  }
 
-			if (ambig_set)
+			if (ambig_set != &ambig_fallback)
 			  {
 			    memset (ambig_set, 0, n_options);
 			    ambig_setindfound = 1;
 			  }
 		      }
-		    if (ambig_set)
+		    if (ambig_set && ambig_set != &ambig_fallback)
 		      ambig_setoption_index = 1;
 		  }
 	      }
 	  }
 
-      if (ambig_set || ambig_fallback)
+      if (ambig_set)
 	{
 	  if (print_errors)
 	    {
-	      if (ambig_fallback)
+	      if (ambig_set == &ambig_fallback)
 		fprintf (stderr, _("%s: option '%s%s' is ambiguous\n"),
 			 argv0, prefix, d->__nextchar);
 	      else
@@ -296,8 +300,7 @@
 		  funlockfile (stderr);
 		}
 	    }
-	  if (ambig_malloced)
-	    free (ambig_set);
+	  free (ambig_malloced);
 	  d->__nextchar += strlen (d->__nextchar);
 	  d->optind++;
 	  d->optopt = 0;

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/getopt.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/getopt.in.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/getopt1.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/getopt1.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/getopt_int.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/getopt_int.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/getprogname.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/getprogname.c Changed

@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2016-2022 Free Software Foundation, Inc.
+   Copyright (C) 2016-2024 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
@@ -16,11 +16,10 @@
 
 #include <config.h>
 
-/* Specification.  */
-#include "getprogname.h"
+/* Specification.  Also get __argv declaration.  */
+#include <stdlib.h>
 
 #include <errno.h> /* get program_invocation_name declaration */
-#include <stdlib.h> /* get __argv declaration */
 
 #ifdef _AIX
 # include <unistd.h>
@@ -53,13 +52,12 @@
 
 #if defined __SCO_VERSION__ || defined __sysv5__
 # include <fcntl.h>
-# include <stdlib.h>
 # include <string.h>
 #endif
 
 #include "basename-lgpl.h"
 
-#ifndef HAVE_GETPROGNAME             /* not Mac OS X, FreeBSD, NetBSD, OpenBSD >= 5.4, Cygwin */
+#ifndef HAVE_GETPROGNAME  /* not Mac OS X, FreeBSD, NetBSD, OpenBSD >= 5.4, Solaris >= 11, Cygwin, Android API level >= 21 */
 char const *
 getprogname (void)
 {
@@ -214,7 +212,19 @@
                 {
                   char *s = strdup (last_component (buf.ps_pathptr));
                   if (s)
-                    p = s;
+                    {
+#  if defined __XPLINK__ && __CHARSET_LIB == 1
+                      /* The compiler option -qascii is in use.
+                         https://makingdeveloperslivesbetter.wordpress.com/2022/01/07/is-z-os-ascii-or-ebcdic-yes/
+                         https://www.ibm.com/docs/en/zos/2.5.0?topic=features-macros-related-compiler-option-settings
+                         So, convert the result from EBCDIC to ASCII.
+                         https://www.ibm.com/docs/en/zos/2.5.0?topic=functions-e2a-s-convert-string-from-ebcdic-ascii */
+                      if (__e2a_s (s) == (size_t)-1)
+                        free (s);
+                      else
+#  endif
+                        p = s;
+                    }
                   break;
                 }
             }

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/getprogname.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/getprogname.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/gettext.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/gettext.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/idx.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/idx.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/intprops-internal.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/intprops-internal.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/intprops.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/intprops.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/libc-config.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/libc-config.h Changed

@@ -1,6 +1,6 @@
 /* System definitions for code taken from the GNU C Library
 
-   Copyright 2017-2022 Free Software Foundation, Inc.
+   Copyright 2017-2024 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
@@ -137,8 +137,6 @@
 # undef __attribute_returns_twice__
 # undef __attribute_used__
 # undef __attribute_warn_unused_result__
-# undef __bos
-# undef __bos0
 # undef __errordecl
 # undef __extension__
 # undef __extern_always_inline
@@ -147,21 +145,13 @@
 # undef __fortified_attr_access
 # undef __fortify_function
 # undef __glibc_c99_flexarr_available
-# undef __glibc_fortify
-# undef __glibc_fortify_n
 # undef __glibc_has_attribute
 # undef __glibc_has_builtin
 # undef __glibc_has_extension
 # undef __glibc_likely
 # undef __glibc_macro_warning
 # undef __glibc_macro_warning1
-# undef __glibc_objsize
-# undef __glibc_objsize0
-# undef __glibc_safe_len_cond
-# undef __glibc_safe_or_unknown_len
 # undef __glibc_unlikely
-# undef __glibc_unsafe_len
-# undef __glibc_unsigned_or_positive
 # undef __inline
 # undef __ptr_t
 # undef __restrict
@@ -170,6 +160,18 @@
 # undef __va_arg_pack_len
 # undef __warnattr
 # undef __wur
+# ifndef __GNULIB_CDEFS
+#  undef __bos
+#  undef __bos0
+#  undef __glibc_fortify
+#  undef __glibc_fortify_n
+#  undef __glibc_objsize
+#  undef __glibc_objsize0
+#  undef __glibc_safe_len_cond
+#  undef __glibc_safe_or_unknown_len
+#  undef __glibc_unsafe_len
+#  undef __glibc_unsigned_or_positive
+# endif
 
 /* Include our copy of glibc <sys/cdefs.h>.  */
 # include <cdefs.h>

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/limits.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/limits.in.h Changed

@@ -1,6 +1,6 @@
 /* A GNU-like <limits.h>.
 
-   Copyright 2016-2022 Free Software Foundation, Inc.
+   Copyright 2016-2024 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -99,7 +99,12 @@
 # endif
 #endif
 
-/* Macros specified by C2x and by ISO/IEC TS 18661-1:2014.  */
+/* Assume no multibyte character is longer than 16 bytes.  */
+#ifndef MB_LEN_MAX
+# define MB_LEN_MAX 16
+#endif
+
+/* Macros specified by C23 and by ISO/IEC TS 18661-1:2014.  */
 
 #if (! defined ULLONG_WIDTH                                             \
      && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__ \
@@ -117,13 +122,28 @@
 # define ULLONG_WIDTH _GL_INTEGER_WIDTH (0, ULLONG_MAX)
 #endif
 
-/* Macros specified by C2x.  */
+/* Macros specified by C23.  */
 
-#if (! defined BOOL_WIDTH \
-     && (defined _GNU_SOURCE \
-         || (defined __STDC_VERSION__ && 201710 < __STDC_VERSION__)))
-# define BOOL_MAX 1
-# define BOOL_WIDTH 1
+#if (defined _GNU_SOURCE \
+     || (defined __STDC_VERSION__ && 201710 < __STDC_VERSION__))
+# if ! defined BOOL_WIDTH
+#  define BOOL_WIDTH 1
+#  define BOOL_MAX 1
+# elif ! defined BOOL_MAX
+#  define BOOL_MAX ((((1U << (BOOL_WIDTH - 1)) - 1) << 1) + 1)
+# endif
+#endif
+
+/* Macro specified by POSIX.  */
+
+/* The maximum ssize_t value.  Although it might not be of ssize_t type
+   as it should be, it's too much trouble to fix this minor detail.  */
+#ifndef SSIZE_MAX
+# ifdef _WIN64
+#  define SSIZE_MAX LLONG_MAX
+# else
+#  define SSIZE_MAX LONG_MAX
+# endif
 #endif
 
 #endif /* _@GUARD_PREFIX@_LIMITS_H */

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/00gnulib.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/00gnulib.m4 Changed

@@ -1,5 +1,5 @@
-# 00gnulib.m4 serial 8
-dnl Copyright (C) 2009-2022 Free Software Foundation, Inc.
+# 00gnulib.m4 serial 9
+dnl Copyright (C) 2009-2024 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.
@@ -49,14 +49,14 @@
     if test $gl_cv_compiler_clang = yes; then
        dnl Test whether the compiler supports the option
        dnl '-Werror=implicit-function-declaration'.
-       save_ac_compile="$ac_compile"
+       saved_ac_compile="$ac_compile"
        ac_compile="$ac_compile -Werror=implicit-function-declaration"
        dnl Use _AC_COMPILE_IFELSE instead of AC_COMPILE_IFELSE, to avoid a
        dnl warning "AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS".
        _AC_COMPILE_IFELSE(AC_LANG_PROGRAM(,),
          gl_cv_compiler_check_decl_option='-Werror=implicit-function-declaration',
          gl_cv_compiler_check_decl_option=none)
-       ac_compile="$save_ac_compile"
+       ac_compile="$saved_ac_compile"
      else
        gl_cv_compiler_check_decl_option=none
      fi
@@ -71,11 +71,11 @@
 dnl instead of ac_compile.  If, for whatever reason, the override of AC_PROG_CC
 dnl in zzgnulib.m4 is inactive, use the original ac_compile.
 m4_define(_AC_CHECK_DECL_BODY,
-  ac_save_ac_compile="$ac_compile"
+  ac_saved_ac_compile="$ac_compile"
   if test -n "$ac_compile_for_check_decl"; then
     ac_compile="$ac_compile_for_check_decl"
   fi
-m4_defn(_AC_CHECK_DECL_BODY)  ac_compile="$ac_save_ac_compile"
+m4_defn(_AC_CHECK_DECL_BODY)  ac_compile="$ac_saved_ac_compile"
 )
 
 # gl_00GNULIB

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/__inline.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/__inline.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/absolute-header.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/absolute-header.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/alloca.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/alloca.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/assert_h.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/assert_h.m4 Changed

@@ -1,5 +1,5 @@
 # assert-h.m4
-dnl Copyright (C) 2011-2022 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2024 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.
@@ -9,16 +9,16 @@
 AC_DEFUN(gl_ASSERT_H,
 
   AC_CACHE_CHECK(for static_assert, gl_cv_static_assert,
-    gl_save_CFLAGS=$CFLAGS
+    gl_saved_CFLAGS=$CFLAGS
      for gl_working in "yes, a keyword" "yes, an <assert.h> macro"; do
       AS_CASE($gl_working,
-        *assert.h*, CFLAGS="$gl_save_CFLAGS -DINCLUDE_ASSERT_H")
+        *assert.h*, CFLAGS="$gl_saved_CFLAGS -DINCLUDE_ASSERT_H")
 
       AC_COMPILE_IFELSE(
        AC_LANG_PROGRAM(
           #if defined __clang__ && __STDC_VERSION__ < 202311
              #pragma clang diagnostic error "-Wc2x-extensions"
-             #pragma clang diagnostic error "-Wc++17-extensions"
+             #pragma clang diagnostic error "-Wc++1z-extensions"
             #endif
             #ifdef INCLUDE_ASSERT_H
              #include <assert.h>
@@ -32,7 +32,7 @@
           ),
        gl_cv_static_assert=$gl_working,
        gl_cv_static_assert=no)
-      CFLAGS=$gl_save_CFLAGS
+      CFLAGS=$gl_saved_CFLAGS
       test "$gl_cv_static_assert" != no && break
      done)
 
@@ -46,10 +46,13 @@
        gl_NEXT_HEADERS(assert.h))
 
   dnl The "zz" puts this toward config.h's end, to avoid potential
-  dnl collisions with other definitions.  #undef assert so that
-  dnl programs are not tempted to use it without specifically
-  dnl including assert.h.  Break the #undef apart with a comment
-  dnl so that 'configure' does not comment it out.
+  dnl collisions with other definitions.
+  dnl #undef assert so that programs are not tempted to use it without
+  dnl specifically including assert.h.
+  dnl #undef __ASSERT_H__ so that on IRIX, when programs later include
+  dnl <assert.h>, this include actually defines assert.
+  dnl Break the #undef_s apart with a comment so that 'configure' does
+  dnl not comment them out.
   AH_VERBATIM(zzstatic_assert,
 #if (!defined HAVE_C_STATIC_ASSERT && !defined assert \
      && (!defined __cplusplus \
@@ -57,5 +60,14 @@
              && __GNUG__ < 6 && __clang_major__ < 6)))
  #include <assert.h>
  #undef/**/assert
+ #ifdef __sgi
+  #undef/**/__ASSERT_H__
+ #endif
+ /* Solaris 11.4 <assert.h> defines static_assert as a macro with 2 arguments.
+    We need it also to be invocable with a single argument.  */
+ #if defined __sun && (__STDC_VERSION__ - 0 >= 201112L) && !defined __cplusplus
+  #undef/**/static_assert
+  #define static_assert _Static_assert
+ #endif
 #endif)
 )

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/c-bool.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/c-bool.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/close.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/close.m4 Changed

_service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/codeset.m4 Added

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/double-slash-root.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/double-slash-root.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/dup2.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/dup2.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/eealloc.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/eealloc.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/errno_h.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/errno_h.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/error.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/error.m4 Changed

_service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/error_h.m4 Added

@@ -0,0 +1,124 @@
+# error_h.m4 serial 4
+dnl Copyright (C) 1996-2024 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 Bruno Haible.
+dnl Provide a working "error.h".
+
+AC_DEFUN_ONCE(gl_ERROR_H,
+
+  AC_REQUIRE(AC_CANONICAL_HOST) dnl for cross-compiles
+
+  gl_CHECK_NEXT_HEADERS(error.h)
+  if test $ac_cv_header_error_h = yes; then
+    HAVE_ERROR_H=1
+  else
+    HAVE_ERROR_H=0
+  fi
+  AC_SUBST(HAVE_ERROR_H)
+
+  REPLACE_ERROR=0
+
+  gl_CHECK_FUNCS_ANDROID(error, #include <error.h>)
+  if test $ac_cv_func_error = yes; then
+    HAVE_ERROR=1
+  else
+    HAVE_ERROR=0
+    case "$gl_cv_onwards_func_error" in
+      future*) REPLACE_ERROR=1 ;;
+    esac
+  fi
+
+  dnl We don't use AC_FUNC_ERROR_AT_LINE any more, because it is no longer
+  dnl maintained in Autoconf and because it invokes AC_LIBOBJ.
+  dnl We need to notice a missing declaration, like gl_CHECK_FUNCS_ANDROID does.
+  AC_CHECK_DECL(error_at_line, , , #include <error.h>)
+  if test $ac_cv_have_decl_error_at_line = yes; then
+    AC_CACHE_CHECK(for error_at_line, ac_cv_lib_error_at_line,
+      AC_LINK_IFELSE(
+         AC_LANG_PROGRAM(
+            #include <error.h>,
+            error_at_line (0, 0, "", 0, "an error occurred");),
+         ac_cv_lib_error_at_line=yes,
+         ac_cv_lib_error_at_line=no))
+  else
+    ac_cv_lib_error_at_line=no
+  fi
+  if test $ac_cv_lib_error_at_line = yes; then
+    HAVE_ERROR_AT_LINE=1
+  else
+    HAVE_ERROR_AT_LINE=0
+  fi
+  REPLACE_ERROR_AT_LINE=0
+
+  if test $ac_cv_func_error = yes && test $ac_cv_lib_error_at_line = yes; then
+    dnl On Android 11, when error_print_progname is set, the output of the
+    dnl error() function contains an extra space.
+    AC_CACHE_CHECK(for working error function,
+      gl_cv_func_working_error,
+      if test $cross_compiling != yes; then
+         AC_LINK_IFELSE(
+           AC_LANG_PROGRAM(
+              #include <error.h>
+              static void print_no_progname (void) {}
+            , 
+              error_print_progname = print_no_progname;
+              error (0, 0, "foo");
+            )
+           ,
+           rm -f conftest.out
+            if test -s conftest$ac_exeext \
+               && ./conftest$ac_exeext 2> conftest.out; then
+              if grep ' ' conftest.out >/dev/null; then
+                gl_cv_func_working_error=no
+              else
+                gl_cv_func_working_error=yes
+              fi
+            else
+              gl_cv_func_working_error=no
+            fi
+            rm -f conftest.out
+           ,
+           gl_cv_func_working_error=no)
+       else
+         AC_COMPILE_IFELSE(
+           AC_LANG_PROGRAM(
+              #include <error.h>
+            , 
+              error (0, 0, "foo");
+            )
+           ,
+           case "$host_os" in
+                               # Guess yes on glibc systems.
+              *-gnu* | gnu*)   gl_cv_func_working_error="guessing yes" ;;
+                               # Guess no on Android.
+              linux*-android*) gl_cv_func_working_error="guessing no" ;;
+                               # If we don't know, obey --enable-cross-guesses.
+              *)               gl_cv_func_working_error="$gl_cross_guess_normal" ;;
+            esac
+           ,
+           gl_cv_func_working_error=no)
+       fi
+      )
+    case "$gl_cv_func_working_error" in
+      *no)
+        REPLACE_ERROR=1
+        REPLACE_ERROR_AT_LINE=1
+        ;;
+    esac
+  fi
+
+  if test $HAVE_ERROR = 0 || test $REPLACE_ERROR = 1 \
+     || test $HAVE_ERROR_AT_LINE = 0 || test $REPLACE_ERROR_AT_LINE = 1; then
+    COMPILE_ERROR_C=1
+  else
+    COMPILE_ERROR_C=0
+  fi
+
+  AC_SUBST(HAVE_ERROR)
+  AC_SUBST(HAVE_ERROR_AT_LINE)
+  AC_SUBST(REPLACE_ERROR)
+  AC_SUBST(REPLACE_ERROR_AT_LINE)
+)

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/extensions.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/extensions.m4 Changed

@@ -1,7 +1,7 @@
-# serial 22  -*- Autoconf -*-
+# serial 23  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
 
-# Copyright (C) 2003, 2006-2022 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2024 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.
@@ -31,7 +31,7 @@
 #      its dependencies. This will ensure that the gl_USE_SYSTEM_EXTENSIONS
 #      invocation occurs in gl_EARLY, not in gl_INIT.
 
-m4_version_prereq(2.70.1, , 
+m4_version_prereq(2.72, , 
 
 # AC_USE_SYSTEM_EXTENSIONS
 # ------------------------
@@ -113,11 +113,15 @@
 #ifndef __STDC_WANT_IEC_60559_DFP_EXT__
 # undef __STDC_WANT_IEC_60559_DFP_EXT__
 #endif
+/* Enable extensions specified by C23 Annex F.  */
+#ifndef __STDC_WANT_IEC_60559_EXT__
+# undef __STDC_WANT_IEC_60559_EXT__
+#endif
 /* Enable extensions specified by ISO/IEC TS 18661-4:2015.  */
 #ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
 # undef __STDC_WANT_IEC_60559_FUNCS_EXT__
 #endif
-/* Enable extensions specified by ISO/IEC TS 18661-3:2015.  */
+/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015.  */
 #ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
 # undef __STDC_WANT_IEC_60559_TYPES_EXT__
 #endif
@@ -187,6 +191,7 @@
   AC_DEFINE(__STDC_WANT_IEC_60559_ATTRIBS_EXT__)
   AC_DEFINE(__STDC_WANT_IEC_60559_BFP_EXT__)
   AC_DEFINE(__STDC_WANT_IEC_60559_DFP_EXT__)
+  AC_DEFINE(__STDC_WANT_IEC_60559_EXT__)
   AC_DEFINE(__STDC_WANT_IEC_60559_FUNCS_EXT__)
   AC_DEFINE(__STDC_WANT_IEC_60559_TYPES_EXT__)
   AC_DEFINE(__STDC_WANT_LIB_EXT2__)

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/extern-inline.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/extern-inline.m4 Changed

@@ -1,6 +1,6 @@
 dnl 'extern inline' a la ISO C99.
 
-dnl Copyright 2012-2022 Free Software Foundation, Inc.
+dnl Copyright 2012-2024 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.
@@ -79,7 +79,8 @@
 # define _GL_EXTERN_INLINE_STDHEADER_BUG
 #endif
 #if ((__GNUC__ \
-      ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
+      ? (defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
+         && !defined __PCC__) \
       : (199901L <= __STDC_VERSION__ \
          && !defined __HP_cc \
          && !defined __PGI \
@@ -89,6 +90,7 @@
 # define _GL_EXTERN_INLINE extern inline
 # define _GL_EXTERN_INLINE_IN_USE
 #elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
+       && !defined __PCC__ \
        && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
 # if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__
    /* __gnu_inline__ suppresses a GCC 4.2 diagnostic.  */

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/fcntl-o.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/fcntl-o.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/fcntl.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/fcntl.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/fcntl_h.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/fcntl_h.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/fstat.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/fstat.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/getdelim.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/getdelim.m4 Changed

@@ -1,6 +1,6 @@
-# getdelim.m4 serial 15
+# getdelim.m4 serial 19
 
-dnl Copyright (C) 2005-2007, 2009-2022 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2007, 2009-2024 Free Software Foundation, Inc.
 dnl
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -11,21 +11,31 @@
 AC_DEFUN(gl_FUNC_GETDELIM,
 
   AC_REQUIRE(gl_STDIO_H_DEFAULTS)
-  AC_REQUIRE(AC_CANONICAL_HOST) dnl for cross-compiles
+  AC_REQUIRE(AC_CANONICAL_HOST)
 
   dnl Persuade glibc <stdio.h> to declare getdelim().
   AC_REQUIRE(AC_USE_SYSTEM_EXTENSIONS)
 
   AC_CHECK_DECLS_ONCE(getdelim)
 
-  AC_CHECK_FUNCS_ONCE(getdelim)
+  gl_CHECK_FUNCS_ANDROID(getdelim, #include <stdio.h>)
   if test $ac_cv_func_getdelim = yes; then
     HAVE_GETDELIM=1
     dnl Found it in some library.  Verify that it works.
     AC_CACHE_CHECK(for working getdelim function,
       gl_cv_func_working_getdelim,
-      echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
-       AC_RUN_IFELSE(AC_LANG_SOURCE(
+      case "$host_os" in
+         darwin*)
+           dnl On macOS 10.13, valgrind detected an out-of-bounds read during
+           dnl the GNU sed test suite:
+           dnl   Invalid read of size 16
+           dnl      at 0x100EE6A05: _platform_memchr$VARIANT$Base (in /usr/lib/system/libsystem_platform.dylib)
+           dnl      by 0x100B7B0BD: getdelim (in /usr/lib/system/libsystem_c.dylib)
+           dnl      by 0x10000B0BE: ck_getdelim (utils.c:254)
+           gl_cv_func_working_getdelim=no ;;
+         *)
+           echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
+           AC_RUN_IFELSE(AC_LANG_SOURCE(
 #    include <stdio.h>
 #    include <stdlib.h>
 #    include <string.h>
@@ -57,26 +67,28 @@
       return 0;
     }
     ),
-         gl_cv_func_working_getdelim=yes,
-         gl_cv_func_working_getdelim=no,
-         dnl We're cross compiling.
-          dnl Guess it works on glibc2 systems and musl systems.
-          AC_EGREP_CPP(Lucky GNU user,
-            
+             gl_cv_func_working_getdelim=yes,
+             gl_cv_func_working_getdelim=no,
+             dnl We're cross compiling.
+              dnl Guess it works on glibc2 systems and musl systems.
+              AC_EGREP_CPP(Lucky GNU user,
+                
 #include <features.h>
 #ifdef __GNU_LIBRARY__
  #if (__GLIBC__ >= 2) && !defined __UCLIBC__
   Lucky GNU user
  #endif
 #endif
-            ,
-            gl_cv_func_working_getdelim="guessing yes",
-            case "$host_os" in
-               *-musl*) gl_cv_func_working_getdelim="guessing yes" ;;
-               *)       gl_cv_func_working_getdelim="$gl_cross_guess_normal" ;;
-             esac
-            )
-         )
+                ,
+                gl_cv_func_working_getdelim="guessing yes",
+                case "$host_os" in
+                   *-musl* | midipix*) gl_cv_func_working_getdelim="guessing yes" ;;
+                   *)                  gl_cv_func_working_getdelim="$gl_cross_guess_normal" ;;
+                 esac
+                )
+             )
+           ;;
+       esac
       )
     case "$gl_cv_func_working_getdelim" in
       *yes) ;;
@@ -84,6 +96,9 @@
     esac
   else
     HAVE_GETDELIM=0
+    case "$gl_cv_onwards_func_getdelim" in
+      future*) REPLACE_GETDELIM=1 ;;
+    esac
   fi
 
   if test $ac_cv_have_decl_getdelim = no; then

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/getdtablesize.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/getdtablesize.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/getline.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/getline.m4 Changed

@@ -1,6 +1,6 @@
-# getline.m4 serial 30
+# getline.m4 serial 33
 
-dnl Copyright (C) 1998-2003, 2005-2007, 2009-2022 Free Software Foundation,
+dnl Copyright (C) 1998-2003, 2005-2007, 2009-2024 Free Software Foundation,
 dnl Inc.
 dnl
 dnl This file is free software; the Free Software Foundation
@@ -23,12 +23,9 @@
 
   AC_CHECK_DECLS_ONCE(getline)
 
-  gl_getline_needs_run_time_check=no
-  AC_CHECK_FUNC(getline,
-                dnl Found it in some library.  Verify that it works.
-                 gl_getline_needs_run_time_check=yes,
-                am_cv_func_working_getline=no)
-  if test $gl_getline_needs_run_time_check = yes; then
+  gl_CHECK_FUNCS_ANDROID(getline, #include <stdio.h>)
+  if test $ac_cv_func_getline = yes; then
+    dnl Found it in some library.  Verify that it works.
     AC_CACHE_CHECK(for working getline function,
       am_cv_func_working_getline,
       echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
@@ -79,12 +76,17 @@
             ,
             am_cv_func_working_getline="guessing yes",
             case "$host_os" in
-               *-musl*) am_cv_func_working_getline="guessing yes" ;;
-               *)       am_cv_func_working_getline="$gl_cross_guess_normal" ;;
+               *-musl* | midipix*) am_cv_func_working_getline="guessing yes" ;;
+               *)                  am_cv_func_working_getline="$gl_cross_guess_normal" ;;
              esac
             )
          )
       )
+  else
+    am_cv_func_working_getline=no
+    case "$gl_cv_onwards_func_getline" in
+      future*) REPLACE_GETLINE=1 ;;
+    esac
   fi
 
   if test $ac_cv_have_decl_getline = no; then

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/getopt.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/getopt.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/getprogname.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/getprogname.m4 Changed

@@ -1,16 +1,33 @@
 # getprogname.m4 - check for getprogname or replacements for it
 
-# Copyright (C) 2016-2022 Free Software Foundation, Inc.
+# Copyright (C) 2016-2024 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.
 
-# serial 4
+# serial 8
 
 AC_DEFUN(gl_FUNC_GETPROGNAME,
 
-  AC_CHECK_FUNCS_ONCE(getprogname getexecname)
+  AC_REQUIRE(gl_STDLIB_H_DEFAULTS)
   AC_REQUIRE(gl_USE_SYSTEM_EXTENSIONS)
+  gl_CHECK_FUNCS_ANDROID(getprogname, #include <stdlib.h>)
+  if test $ac_cv_func_getprogname = no; then
+    HAVE_GETPROGNAME=0
+    case "$gl_cv_onwards_func_getprogname" in
+      future*) REPLACE_GETPROGNAME=1 ;;
+    esac
+  fi
+  AC_CHECK_DECLS(program_invocation_name,
+    ,
+    HAVE_DECL_PROGRAM_INVOCATION_NAME=0,
+    #include <errno.h>)
+)
+
+AC_DEFUN(gl_PREREQ_GETPROGNAME,
+
+  AC_REQUIRE(gl_USE_SYSTEM_EXTENSIONS)
+  AC_CHECK_FUNCS_ONCE(getexecname)
   ac_found=0
   AC_CHECK_DECLS(program_invocation_name, ac_found=1, ,
     #include <errno.h>)

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/gnulib-cache.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/gnulib-cache.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/gnulib-common.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/gnulib-common.m4 Changed

@@ -1,5 +1,5 @@
-# gnulib-common.m4 serial 74
-dnl Copyright (C) 2007-2022 Free Software Foundation, Inc.
+# gnulib-common.m4 serial 90
+dnl Copyright (C) 2007-2024 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,6 +15,10 @@
   AC_REQUIRE(gl_ZZGNULIB)
 )
 AC_DEFUN(gl_COMMON_BODY, 
+  AH_VERBATIM(0witness,
+/* Witness that <config.h> has been included.  */
+#define _GL_CONFIG_H_INCLUDED 1
+)
   AH_VERBATIM(_GL_GNUC_PREREQ,
 /* True if the compiler says it groks GNU C version MAJOR.MINOR.  */
 #if defined __GNUC__ && defined __GNUC_MINOR__
@@ -38,6 +42,11 @@
        AIX system header files and several gnulib header files use precisely
        this syntax with 'extern'.  */
 #  define _Noreturn noreturn
+# elif (defined __clang__ && __clang_major__ < 16 \
+        && defined _GL_WORK_AROUND_LLVM_BUG_59792)
+   /* Compile with -D_GL_WORK_AROUND_LLVM_BUG_59792 to work around
+      that rare LLVM bug, though you may get many false-alarm warnings.  */
+#  define _Noreturn
 # elif ((!defined __cplusplus || defined __clang__) \
         && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \
             || (!defined __STRICT_ANSI__ \
@@ -71,7 +80,7 @@
      && (!defined __clang_minor__ \
          || (defined __apple_build_version__ \
              ? 6000000 <= __apple_build_version__ \
-             : 3 < __clang_major__ + (5 <= __clang_minor__))))
+             : 5 <= __clang_major__)))
 # define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__)
 #else
 # define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr
@@ -105,16 +114,30 @@
 # define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4)
 #endif
 
-#ifdef __has_c_attribute
-# if ((defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) <= 201710 \
-      && _GL_GNUC_PREREQ (4, 6))
-#  pragma GCC diagnostic ignored "-Wpedantic"
-# endif
-# define _GL_HAS_C_ATTRIBUTE(attr) __has_c_attribute (__##attr##__)
+/* Use __has_c_attribute if available.  However, do not use with
+   pre-C23 GCC, which can issue false positives if -Wpedantic.  */
+#if (defined __has_c_attribute \
+     && ! (_GL_GNUC_PREREQ (4, 6) \
+           && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) <= 201710))
+# define _GL_HAVE___HAS_C_ATTRIBUTE 1
 #else
-# define _GL_HAS_C_ATTRIBUTE(attr) 0
+# define _GL_HAVE___HAS_C_ATTRIBUTE 0
 #endif
 
+/* Define if, in a function declaration, the attributes in bracket syntax
+   ... must come before the attributes in __attribute__((...)) syntax.
+   If this is defined, it is best to avoid the bracket syntax, so that the
+   various _GL_ATTRIBUTE_* can be cumulated on the same declaration in any
+   order.  */
+#ifdef __cplusplus
+# if defined __clang__
+#  define _GL_BRACKET_BEFORE_ATTRIBUTE 1
+# endif
+#else
+# if defined __GNUC__ && !defined __clang__
+#  define _GL_BRACKET_BEFORE_ATTRIBUTE 1
+# endif
+#endif
 dnl There is no _GL_ATTRIBUTE_ALIGNED; use stdalign's alignas instead.
 
 /* _GL_ATTRIBUTE_ALLOC_SIZE ((N)) declares that the Nth argument of the function
@@ -123,29 +146,35 @@
    by the Nth argument of the function is the size of the returned memory block.
  */
 /* Applies to: function, pointer to function, function types.  */
-#if _GL_HAS_ATTRIBUTE (alloc_size)
-# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args))
-#else
-# define _GL_ATTRIBUTE_ALLOC_SIZE(args)
+#ifndef _GL_ATTRIBUTE_ALLOC_SIZE
+# if _GL_HAS_ATTRIBUTE (alloc_size)
+#  define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args))
+# else
+#  define _GL_ATTRIBUTE_ALLOC_SIZE(args)
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_ALWAYS_INLINE tells that the compiler should always inline the
    function and report an error if it cannot do so.  */
 /* Applies to: function.  */
-#if _GL_HAS_ATTRIBUTE (always_inline)
-# define _GL_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((__always_inline__))
-#else
-# define _GL_ATTRIBUTE_ALWAYS_INLINE
+#ifndef _GL_ATTRIBUTE_ALWAYS_INLINE
+# if _GL_HAS_ATTRIBUTE (always_inline)
+#  define _GL_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((__always_inline__))
+# else
+#  define _GL_ATTRIBUTE_ALWAYS_INLINE
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_ARTIFICIAL declares that the function is not important to show
     in stack traces when debugging.  The compiler should omit the function from
     stack traces.  */
 /* Applies to: function.  */
-#if _GL_HAS_ATTRIBUTE (artificial)
-# define _GL_ATTRIBUTE_ARTIFICIAL __attribute__ ((__artificial__))
-#else
-# define _GL_ATTRIBUTE_ARTIFICIAL
+#ifndef _GL_ATTRIBUTE_ARTIFICIAL
+# if _GL_HAS_ATTRIBUTE (artificial)
+#  define _GL_ATTRIBUTE_ARTIFICIAL __attribute__ ((__artificial__))
+# else
+#  define _GL_ATTRIBUTE_ARTIFICIAL
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_COLD declares that the function is rarely executed.  */
@@ -153,14 +182,16 @@
 /* Avoid __attribute__ ((cold)) on MinGW; see thread starting at
    <https://lists.gnu.org/r/emacs-devel/2019-04/msg01152.html>.
    Also, Oracle Studio 12.6 requires 'cold' not '__cold__'.  */
-#if _GL_HAS_ATTRIBUTE (cold) && !defined __MINGW32__
-# ifndef __SUNPRO_C
-#  define _GL_ATTRIBUTE_COLD __attribute__ ((__cold__))
+#ifndef _GL_ATTRIBUTE_COLD
+# if _GL_HAS_ATTRIBUTE (cold) && !defined __MINGW32__
+#  ifndef __SUNPRO_C
+#   define _GL_ATTRIBUTE_COLD __attribute__ ((__cold__))
+#  else
+#   define _GL_ATTRIBUTE_COLD __attribute__ ((cold))
+#  endif
 # else
-#  define _GL_ATTRIBUTE_COLD __attribute__ ((cold))
+#  define _GL_ATTRIBUTE_COLD
 # endif
-#else
-# define _GL_ATTRIBUTE_COLD
 #endif
 
 /* _GL_ATTRIBUTE_CONST declares that it is OK for a compiler to omit duplicate
@@ -170,10 +201,12 @@
    forever, and does not call longjmp.
    (This attribute is stricter than _GL_ATTRIBUTE_PURE.)  */
 /* Applies to: functions.  */
-#if _GL_HAS_ATTRIBUTE (const)
-# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__))
-#else
-# define _GL_ATTRIBUTE_CONST
+#ifndef _GL_ATTRIBUTE_CONST
+# if _GL_HAS_ATTRIBUTE (const)
+#  define _GL_ATTRIBUTE_CONST __attribute__ ((__const__))
+# else
+#  define _GL_ATTRIBUTE_CONST
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_DEALLOC (F, I) declares that the function returns pointers
@@ -182,16 +215,25 @@
    _GL_ATTRIBUTE_DEALLOC_FREE declares that the function returns pointers that
    can be freed via 'free'; it can be used only after declaring 'free'.  */
 /* Applies to: functions.  Cannot be used on inline functions.  */
-#if _GL_GNUC_PREREQ (11, 0)
-# define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i)))
-#else
-# define _GL_ATTRIBUTE_DEALLOC(f, i)
+#ifndef _GL_ATTRIBUTE_DEALLOC
+# if _GL_GNUC_PREREQ (11, 0)
+#  define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i)))
+# else
+#  define _GL_ATTRIBUTE_DEALLOC(f, i)
+# endif
 #endif
 /* If gnulib's <string.h> or <wchar.h> has already defined this macro, continue
    to use this earlier definition, since <stdlib.h> may not have been included
    yet.  */
 #ifndef _GL_ATTRIBUTE_DEALLOC_FREE
-# define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (free, 1)
+# if defined __cplusplus && defined __GNUC__ && !defined __clang__
+/* Work around GCC bug <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108231> */
+#  define _GL_ATTRIBUTE_DEALLOC_FREE \
+     _GL_ATTRIBUTE_DEALLOC ((void (*) (void *)) free, 1)
+# else
+#  define _GL_ATTRIBUTE_DEALLOC_FREE \
+     _GL_ATTRIBUTE_DEALLOC (free, 1)
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_DEPRECATED: Declares that an entity is deprecated.
@@ -202,12 +244,20 @@
      - enumeration, enumeration item,
      - typedef,
    in C++ also: namespace, class, template specialization.  */
-#if _GL_HAS_C_ATTRIBUTE (deprecated)
-# define _GL_ATTRIBUTE_DEPRECATED __deprecated__
-#elif _GL_HAS_ATTRIBUTE (deprecated)
-# define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__))
-#else
-# define _GL_ATTRIBUTE_DEPRECATED
+#ifndef _GL_ATTRIBUTE_DEPRECATED
+# ifndef _GL_BRACKET_BEFORE_ATTRIBUTE
+#  if _GL_HAVE___HAS_C_ATTRIBUTE
+#   if __has_c_attribute (__deprecated__)
+#    define _GL_ATTRIBUTE_DEPRECATED __deprecated__
+#   endif
+#  endif
+# endif
+# if !defined _GL_ATTRIBUTE_DEPRECATED && _GL_HAS_ATTRIBUTE (deprecated)
+#  define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__))
+# endif
+# ifndef _GL_ATTRIBUTE_DEPRECATED
+#  define _GL_ATTRIBUTE_DEPRECATED
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_ERROR(msg) requests an error if a function is called and
@@ -215,24 +265,28 @@
    _GL_ATTRIBUTE_WARNING(msg) requests a warning if a function is called and
    the function call is not optimized away.  */
 /* Applies to: functions.  */
-#if _GL_HAS_ATTRIBUTE (error)
-# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__error__ (msg)))
-# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__warning__ (msg)))
-#elif _GL_HAS_ATTRIBUTE (diagnose_if)
-# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__diagnose_if__ (1, msg, "error")))
-# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__diagnose_if__ (1, msg, "warning")))
-#else
-# define _GL_ATTRIBUTE_ERROR(msg)
-# define _GL_ATTRIBUTE_WARNING(msg)
+#if !(defined _GL_ATTRIBUTE_ERROR && defined _GL_ATTRIBUTE_WARNING)
+# if _GL_HAS_ATTRIBUTE (error)
+#  define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__error__ (msg)))
+#  define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__warning__ (msg)))
+# elif _GL_HAS_ATTRIBUTE (diagnose_if)
+#  define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__diagnose_if__ (1, msg, "error")))
+#  define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__diagnose_if__ (1, msg, "warning")))
+# else
+#  define _GL_ATTRIBUTE_ERROR(msg)
+#  define _GL_ATTRIBUTE_WARNING(msg)
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_EXTERNALLY_VISIBLE declares that the entity should remain
    visible to debuggers etc., even with '-fwhole-program'.  */
 /* Applies to: functions, variables.  */
-#if _GL_HAS_ATTRIBUTE (externally_visible)
-# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((externally_visible))
-#else
-# define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE
+#ifndef _GL_ATTRIBUTE_EXTERNALLY_VISIBLE
+# if _GL_HAS_ATTRIBUTE (externally_visible)
+#  define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((externally_visible))
+# else
+#  define _GL_ATTRIBUTE_EXTERNALLY_VISIBLE
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_FALLTHROUGH declares that it is not a programming mistake if
@@ -240,12 +294,18 @@
    'default' label.  The compiler should not warn in this case.  */
 /* Applies to: Empty statement (;), inside a 'switch' statement.  */
 /* Always expands to something.  */
-#if _GL_HAS_C_ATTRIBUTE (fallthrough)
-# define _GL_ATTRIBUTE_FALLTHROUGH __fallthrough__
-#elif _GL_HAS_ATTRIBUTE (fallthrough)
-# define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__))
-#else
-# define _GL_ATTRIBUTE_FALLTHROUGH ((void) 0)
+#ifndef _GL_ATTRIBUTE_FALLTHROUGH
+# if _GL_HAVE___HAS_C_ATTRIBUTE
+#  if __has_c_attribute (__fallthrough__)
+#   define _GL_ATTRIBUTE_FALLTHROUGH __fallthrough__
+#  endif
+# endif
+# if !defined _GL_ATTRIBUTE_FALLTHROUGH && _GL_HAS_ATTRIBUTE (fallthrough)
+#  define _GL_ATTRIBUTE_FALLTHROUGH __attribute__ ((__fallthrough__))
+# endif
+# ifndef _GL_ATTRIBUTE_FALLTHROUGH
+#  define _GL_ATTRIBUTE_FALLTHROUGH ((void) 0)
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_FORMAT ((ARCHETYPE, STRING-INDEX, FIRST-TO-CHECK))
@@ -259,10 +319,12 @@
    If FIRST-TO-CHECK is not 0, arguments starting at FIRST-TO_CHECK
    are suitable for the format string.  */
 /* Applies to: functions.  */
-#if _GL_HAS_ATTRIBUTE (format)
-# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
-#else
-# define _GL_ATTRIBUTE_FORMAT(spec)
+#ifndef _GL_ATTRIBUTE_FORMAT
+# if _GL_HAS_ATTRIBUTE (format)
+#  define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
+# else
+#  define _GL_ATTRIBUTE_FORMAT(spec)
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_LEAF declares that if the function is called from some other
@@ -270,19 +332,23 @@
    exception handling.  This declaration lets the compiler optimize that unit
    more aggressively.  */
 /* Applies to: functions.  */
-#if _GL_HAS_ATTRIBUTE (leaf)
-# define _GL_ATTRIBUTE_LEAF __attribute__ ((__leaf__))
-#else
-# define _GL_ATTRIBUTE_LEAF
+#ifndef _GL_ATTRIBUTE_LEAF
+# if _GL_HAS_ATTRIBUTE (leaf)
+#  define _GL_ATTRIBUTE_LEAF __attribute__ ((__leaf__))
+# else
+#  define _GL_ATTRIBUTE_LEAF
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_MALLOC declares that the function returns a pointer to freshly
    allocated memory.  */
 /* Applies to: functions.  */
-#if _GL_HAS_ATTRIBUTE (malloc)
-# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
-#else
-# define _GL_ATTRIBUTE_MALLOC
+#ifndef _GL_ATTRIBUTE_MALLOC
+# if _GL_HAS_ATTRIBUTE (malloc)
+#  define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
+# else
+#  define _GL_ATTRIBUTE_MALLOC
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_MAY_ALIAS declares that pointers to the type may point to the
@@ -290,10 +356,12 @@
    strict aliasing optimization.  */
 /* Applies to: types.  */
 /* Oracle Studio 12.6 mishandles may_alias despite __has_attribute OK.  */
-#if _GL_HAS_ATTRIBUTE (may_alias) && !defined __SUNPRO_C
-# define _GL_ATTRIBUTE_MAY_ALIAS __attribute__ ((__may_alias__))
-#else
-# define _GL_ATTRIBUTE_MAY_ALIAS
+#ifndef _GL_ATTRIBUTE_MAY_ALIAS
+# if _GL_HAS_ATTRIBUTE (may_alias) && !defined __SUNPRO_C
+#  define _GL_ATTRIBUTE_MAY_ALIAS __attribute__ ((__may_alias__))
+# else
+#  define _GL_ATTRIBUTE_MAY_ALIAS
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_MAYBE_UNUSED declares that it is not a programming mistake if
@@ -305,13 +373,26 @@
      - enumeration, enumeration item,
      - typedef,
    in C++ also: class.  */
-/* In C++ and C2x, this is spelled __maybe_unused__.
+/* In C++ and C23, this is spelled __maybe_unused__.
    GCC's syntax is __attribute__ ((__unused__)).
-   clang supports both syntaxes.  */
-#if _GL_HAS_C_ATTRIBUTE (maybe_unused)
-# define _GL_ATTRIBUTE_MAYBE_UNUSED __maybe_unused__
-#else
-# define _GL_ATTRIBUTE_MAYBE_UNUSED _GL_ATTRIBUTE_UNUSED
+   clang supports both syntaxes.  Except that with clang ≥ 6, < 10, in C++ mode,
+   __has_c_attribute (__maybe_unused__) yields true but the use of
+   __maybe_unused__ nevertheless produces a warning.  */
+#ifndef _GL_ATTRIBUTE_MAYBE_UNUSED
+# ifndef _GL_BRACKET_BEFORE_ATTRIBUTE
+#  if defined __clang__ && defined __cplusplus
+#   if !defined __apple_build_version__ && __clang_major__ >= 10
+#    define _GL_ATTRIBUTE_MAYBE_UNUSED __maybe_unused__
+#   endif
+#  elif _GL_HAVE___HAS_C_ATTRIBUTE
+#   if __has_c_attribute (__maybe_unused__)
+#    define _GL_ATTRIBUTE_MAYBE_UNUSED __maybe_unused__
+#   endif
+#  endif
+# endif
+# ifndef _GL_ATTRIBUTE_MAYBE_UNUSED
+#  define _GL_ATTRIBUTE_MAYBE_UNUSED _GL_ATTRIBUTE_UNUSED
+# endif
 #endif
 /* Alternative spelling of this macro, for convenience and for
    compatibility with glibc/include/libc-symbols.h.  */
@@ -323,21 +404,40 @@
    discard the return value.  The compiler may warn if the caller does not use
    the return value, unless the caller uses something like ignore_value.  */
 /* Applies to: function, enumeration, class.  */
-#if _GL_HAS_C_ATTRIBUTE (nodiscard)
-# define _GL_ATTRIBUTE_NODISCARD __nodiscard__
-#elif _GL_HAS_ATTRIBUTE (warn_unused_result)
-# define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__))
-#else
-# define _GL_ATTRIBUTE_NODISCARD
+#ifndef _GL_ATTRIBUTE_NODISCARD
+# ifndef _GL_BRACKET_BEFORE_ATTRIBUTE
+#  if defined __clang__ && defined __cplusplus
+  /* With clang up to 15.0.6 (at least), in C++ mode, __nodiscard__ produces
+     a warning.
+     The 1000 below means a yet unknown threshold.  When clang++ version X
+     starts supporting __nodiscard__ without warning about it, you can
+     replace the 1000 with X.  */
+#   if __clang_major__ >= 1000
+#    define _GL_ATTRIBUTE_NODISCARD __nodiscard__
+#   endif
+#  elif _GL_HAVE___HAS_C_ATTRIBUTE
+#   if __has_c_attribute (__nodiscard__)
+#    define _GL_ATTRIBUTE_NODISCARD __nodiscard__
+#   endif
+#  endif
+# endif
+# if !defined _GL_ATTRIBUTE_NODISCARD && _GL_HAS_ATTRIBUTE (warn_unused_result)
+#  define _GL_ATTRIBUTE_NODISCARD __attribute__ ((__warn_unused_result__))
+# endif
+# ifndef _GL_ATTRIBUTE_NODISCARD
+#  define _GL_ATTRIBUTE_NODISCARD
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_NOINLINE tells that the compiler should not inline the
    function.  */
 /* Applies to: functions.  */
-#if _GL_HAS_ATTRIBUTE (noinline)
-# define _GL_ATTRIBUTE_NOINLINE __attribute__ ((__noinline__))
-#else
-# define _GL_ATTRIBUTE_NOINLINE
+#ifndef _GL_ATTRIBUTE_NOINLINE
+# if _GL_HAS_ATTRIBUTE (noinline)
+#  define _GL_ATTRIBUTE_NOINLINE __attribute__ ((__noinline__))
+# else
+#  define _GL_ATTRIBUTE_NOINLINE
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_NONNULL ((N1, N2,...)) declares that the arguments N1, N2,...
@@ -345,20 +445,24 @@
    _GL_ATTRIBUTE_NONNULL () declares that all pointer arguments must not be
    null.  */
 /* Applies to: functions.  */
-#if _GL_HAS_ATTRIBUTE (nonnull)
-# define _GL_ATTRIBUTE_NONNULL(args) __attribute__ ((__nonnull__ args))
-#else
-# define _GL_ATTRIBUTE_NONNULL(args)
+#ifndef _GL_ATTRIBUTE_NONNULL
+# if _GL_HAS_ATTRIBUTE (nonnull)
+#  define _GL_ATTRIBUTE_NONNULL(args) __attribute__ ((__nonnull__ args))
+# else
+#  define _GL_ATTRIBUTE_NONNULL(args)
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_NONSTRING declares that the contents of a character array is
    not meant to be NUL-terminated.  */
 /* Applies to: struct/union members and variables that are arrays of element
    type 'unsigned char'.  */
-#if _GL_HAS_ATTRIBUTE (nonstring)
-# define _GL_ATTRIBUTE_NONSTRING __attribute__ ((__nonstring__))
-#else
-# define _GL_ATTRIBUTE_NONSTRING
+#ifndef _GL_ATTRIBUTE_NONSTRING
+# if _GL_HAS_ATTRIBUTE (nonstring)
+#  define _GL_ATTRIBUTE_NONSTRING __attribute__ ((__nonstring__))
+# else
+#  define _GL_ATTRIBUTE_NONSTRING
+# endif
 #endif
 
 /* There is no _GL_ATTRIBUTE_NORETURN; use _Noreturn instead.  */
@@ -366,10 +470,26 @@
 /* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions.
  */
 /* Applies to: functions.  */
-#if _GL_HAS_ATTRIBUTE (nothrow) && !defined __cplusplus
-# define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__))
-#else
-# define _GL_ATTRIBUTE_NOTHROW
+/* After a function's parameter list, this attribute must come first, before
+   other attributes.  */
+#ifndef _GL_ATTRIBUTE_NOTHROW
+# if defined __cplusplus
+#  if _GL_GNUC_PREREQ (2, 8) || __clang_major >= 4
+#   if __cplusplus >= 201103L
+#    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
+#   else
+#    define _GL_ATTRIBUTE_NOTHROW throw ()
+#   endif
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# else
+#  if _GL_HAS_ATTRIBUTE (nothrow)
+#   define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__))
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_PACKED declares:
@@ -378,10 +498,12 @@
    minimizing the memory required.  */
 /* Applies to: struct members, struct, union,
    in C++ also: class.  */
-#if _GL_HAS_ATTRIBUTE (packed)
-# define _GL_ATTRIBUTE_PACKED __attribute__ ((__packed__))
-#else
-# define _GL_ATTRIBUTE_PACKED
+#ifndef _GL_ATTRIBUTE_PACKED
+# if _GL_HAS_ATTRIBUTE (packed)
+#  define _GL_ATTRIBUTE_PACKED __attribute__ ((__packed__))
+# else
+#  define _GL_ATTRIBUTE_PACKED
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_PURE declares that It is OK for a compiler to omit duplicate
@@ -391,19 +513,23 @@
    observable state, and always returns exactly once.
    (This attribute is looser than _GL_ATTRIBUTE_CONST.)  */
 /* Applies to: functions.  */
-#if _GL_HAS_ATTRIBUTE (pure)
-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-# define _GL_ATTRIBUTE_PURE
+#ifndef _GL_ATTRIBUTE_PURE
+# if _GL_HAS_ATTRIBUTE (pure)
+#  define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
+# else
+#  define _GL_ATTRIBUTE_PURE
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_RETURNS_NONNULL declares that the function's return value is
    a non-NULL pointer.  */
 /* Applies to: functions.  */
-#if _GL_HAS_ATTRIBUTE (returns_nonnull)
-# define _GL_ATTRIBUTE_RETURNS_NONNULL __attribute__ ((__returns_nonnull__))
-#else
-# define _GL_ATTRIBUTE_RETURNS_NONNULL
+#ifndef _GL_ATTRIBUTE_RETURNS_NONNULL
+# if _GL_HAS_ATTRIBUTE (returns_nonnull)
+#  define _GL_ATTRIBUTE_RETURNS_NONNULL __attribute__ ((__returns_nonnull__))
+# else
+#  define _GL_ATTRIBUTE_RETURNS_NONNULL
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_SENTINEL(pos) declares that the variadic function expects a
@@ -411,17 +537,21 @@
    _GL_ATTRIBUTE_SENTINEL () - The last argument is NULL (requires C99).
    _GL_ATTRIBUTE_SENTINEL ((N)) - The (N+1)st argument from the end is NULL.  */
 /* Applies to: functions.  */
-#if _GL_HAS_ATTRIBUTE (sentinel)
-# define _GL_ATTRIBUTE_SENTINEL(pos) __attribute__ ((__sentinel__ pos))
-#else
-# define _GL_ATTRIBUTE_SENTINEL(pos)
+#ifndef _GL_ATTRIBUTE_SENTINEL
+# if _GL_HAS_ATTRIBUTE (sentinel)
+#  define _GL_ATTRIBUTE_SENTINEL(pos) __attribute__ ((__sentinel__ pos))
+# else
+#  define _GL_ATTRIBUTE_SENTINEL(pos)
+# endif
 #endif
 
 /* A helper macro.  Don't use it directly.  */
-#if _GL_HAS_ATTRIBUTE (unused)
-# define _GL_ATTRIBUTE_UNUSED __attribute__ ((__unused__))
-#else
-# define _GL_ATTRIBUTE_UNUSED
+#ifndef _GL_ATTRIBUTE_UNUSED
+# if _GL_HAS_ATTRIBUTE (unused)
+#  define _GL_ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+# else
+#  define _GL_ATTRIBUTE_UNUSED
+# endif
 #endif
 
 dnl There is no _GL_ATTRIBUTE_VISIBILITY; see m4/visibility.m4 instead.
@@ -432,10 +562,24 @@
 /* Applies to: label (both in C and C++).  */
 /* Note that g++ < 4.5 does not support the '__attribute__ ((__unused__)) ;'
    syntax.  But clang does.  */
-#if !(defined __cplusplus && !_GL_GNUC_PREREQ (4, 5)) || defined __clang__
-# define _GL_UNUSED_LABEL _GL_ATTRIBUTE_UNUSED
+#ifndef _GL_UNUSED_LABEL
+# if !(defined __cplusplus && !_GL_GNUC_PREREQ (4, 5)) || defined __clang__
+#  define _GL_UNUSED_LABEL _GL_ATTRIBUTE_UNUSED
+# else
+#  define _GL_UNUSED_LABEL
+# endif
+#endif
+)
+  AH_VERBATIM(c_linkage,
+/* In C++, there is the concept of "language linkage", that encompasses
+    name mangling and function calling conventions.
+    The following macros start and end a block of "C" linkage.  */
+#ifdef __cplusplus
+# define _GL_BEGIN_C_LINKAGE extern "C" {
+# define _GL_END_C_LINKAGE }
 #else
-# define _GL_UNUSED_LABEL
+# define _GL_BEGIN_C_LINKAGE
+# define _GL_END_C_LINKAGE
 #endif
 )
   AH_VERBATIM(async_safe,
@@ -493,7 +637,7 @@
   dnl gl_cross_guess_normal    (to be used when 'yes' is good and 'no' is bad),
   dnl gl_cross_guess_inverted  (to be used when 'no' is good and 'yes' is bad).
   AC_ARG_ENABLE(cross-guesses,
-    AS_HELP_STRING(--enable-cross-guesses={conservative|risky},
+    AS_HELP_STRING(--enable-cross-guesses={conservative|risky},
        specify policy for cross-compilation guesses),
     if test "x$enableval" != xconservative && test "x$enableval" != xrisky; then
        AC_MSG_WARN(invalid argument supplied to --enable-cross-guesses)
@@ -930,6 +1074,7 @@
     dnl -Wno-pedantic                         >= 4.8          >= 3.9
     dnl -Wno-sign-compare                     >= 3            >= 3.9
     dnl -Wno-sign-conversion                  >= 4.3          >= 3.9
+    dnl -Wno-tautological-out-of-range-compare  -             >= 3.9
     dnl -Wno-type-limits                      >= 4.3          >= 3.9
     dnl -Wno-undef                            >= 3            >= 3.9
     dnl -Wno-unsuffixed-float-constants       >= 4.5
@@ -955,6 +1100,9 @@
       #if __GNUC__ + (__GNUC_MINOR__ >= 8) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3)
       -Wno-pedantic
       #endif
+      #if 3 < __clang_major__ + (9 <= __clang_minor__)
+      -Wno-tautological-constant-out-of-range-compare
+      #endif
       #if __GNUC__ + (__GNUC_MINOR__ >= 3) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3)
       -Wno-sign-conversion
       -Wno-type-limits
@@ -1005,6 +1153,238 @@
   m4_popdef(gl_header_name)
 )
 
+dnl Preparations for gl_CHECK_FUNCS_MACOS.
+AC_DEFUN(gl_PREPARE_CHECK_FUNCS_MACOS,
+
+  AC_REQUIRE(AC_CANONICAL_HOST)
+  AC_REQUIRE(gl_COMPILER_CLANG)
+  AC_CACHE_CHECK(for compiler option needed when checking for future declarations,
+    gl_cv_compiler_check_future_option,
+    case "$host_os" in
+       dnl This is only needed on macOS.
+       darwin*)
+         if test $gl_cv_compiler_clang = yes; then
+           dnl Test whether the compiler supports the option
+           dnl '-Werror=unguarded-availability-new'.
+           saved_ac_compile="$ac_compile"
+           ac_compile="$ac_compile -Werror=unguarded-availability-new"
+           AC_COMPILE_IFELSE(AC_LANG_PROGRAM(,),
+             gl_cv_compiler_check_future_option='-Werror=unguarded-availability-new',
+             gl_cv_compiler_check_future_option=none)
+           ac_compile="$saved_ac_compile"
+         else
+           gl_cv_compiler_check_future_option=none
+         fi
+         ;;
+       *) gl_cv_compiler_check_future_option=none ;;
+     esac
+    )
+)
+
+dnl Pieces of the expansion of
+dnl gl_CHECK_FUNCS_ANDROID
+dnl gl_CHECK_FUNCS_MACOS
+dnl gl_CHECK_FUNCS_ANDROID_MACOS
+
+AC_DEFUN(gl_CHECK_FUNCS_DEFAULT_CASE,
+
+         *)
+           AC_CHECK_FUNC($1)
+           gl_cv_onwards_func_$1=$ac_cv_func_$1
+           ;;
+)
+
+AC_DEFUN(gl_CHECK_FUNCS_CASE_FOR_ANDROID,
+
+         linux*-android*)
+           AC_CHECK_DECL($1, , , $2)
+           if test $ac_cv_have_decl_$1 = yes; then
+             AC_CHECK_FUNC($1)
+             if test $ac_cv_func_$1 = yes; then
+               gl_cv_onwards_func_$1=yes
+             else
+               dnl The function is declared but does not exist. This should not
+               dnl happen normally. But anyway, we know that a future version
+               dnl of Android will have the function.
+               gl_cv_onwards_func_$1='future OS version'
+             fi
+           else
+             gl_cv_onwards_func_$1='future OS version'
+           fi
+           ;;
+)
+
+AC_DEFUN(gl_CHECK_FUNCS_CASE_FOR_MACOS,
+
+         darwin*)
+           if test "x$gl_cv_compiler_check_future_option" != "xnone"; then
+             dnl Use a compile test, not a link test.
+             saved_ac_compile="$ac_compile"
+             ac_compile="$ac_compile $gl_cv_compiler_check_future_option"
+             saved_ac_compile_for_check_decl="$ac_compile_for_check_decl"
+             ac_compile_for_check_decl="$ac_compile_for_check_decl $gl_cv_compiler_check_future_option"
+             unset ac_cv_have_decl_$1
+             AC_CHECK_DECL($1, , , $2)
+             ac_compile="$saved_ac_compile"
+             ac_compile_for_check_decl="$saved_ac_compile_for_check_decl"
+             ac_cv_func_$1="$ac_cv_have_decl_$1"
+             if test $ac_cv_func_$1 = yes; then
+               gl_cv_onwards_func_$1=yes
+             else
+               unset ac_cv_have_decl_$1
+               AC_CHECK_DECL($1, , , $2)
+               if test $ac_cv_have_decl_$1 = yes; then
+                 gl_cv_onwards_func_$1='future OS version'
+               else
+                 gl_cv_onwards_func_$1=no
+               fi
+             fi
+           else
+             AC_CHECK_FUNC($1)
+             gl_cv_onwards_func_$1=$ac_cv_func_$1
+           fi
+           ;;
+)
+
+AC_DEFUN(gl_CHECK_FUNCS_SET_RESULTS,
+
+  case "$gl_cv_onwards_func_$1" in
+    future*) ac_cv_func_$1=no ;;
+    *)       ac_cv_func_$1=$gl_cv_onwards_func_$1 ;;
+  esac
+  if test $ac_cv_func_$1 = yes; then
+    AC_DEFINE(HAVE_m4_translit($1,
+                                 abcdefghijklmnopqrstuvwxyz,
+                                 ABCDEFGHIJKLMNOPQRSTUVWXYZ),
+              1, Define to 1 if you have the `$1' function.)
+  fi
+)
+
+dnl gl_CHECK_FUNCS_ANDROID(func, #include <foo.h>)
+dnl is like AC_CHECK_FUNCS(func), taking into account a portability problem
+dnl on Android.
+dnl
+dnl When code is compiled on Android, it is in the context of a certain
+dnl "Android API level", which indicates the minimum version of Android on
+dnl which the app can be installed. In other words, you don't compile for a
+dnl specific version of Android. You compile for all versions of Android,
+dnl onwards from the given API level.
+dnl Thus, the question "does the OS have the function func" has three possible
+dnl answers:
+dnl   - yes, in all versions starting from the given API level,
+dnl   - no, in no version,
+dnl   - not in the given API level, but in a later version of Android.
+dnl
+dnl In detail, this works as follows:
+dnl If func was added to Android API level, say, 28, then the libc.so has the
+dnl symbol func always, whereas the header file <foo.h> declares func
+dnl conditionally:
+dnl   #if __ANDROID_API__ >= 28
+dnl   ... func (...) __INTRODUCED_IN(28);
+dnl   #endif
+dnl Thus, when compiling with "clang -target armv7a-unknown-linux-android28",
+dnl the function func is declared and exists in libc.
+dnl Whereas when compiling with "clang -target armv7a-unknown-linux-android27",
+dnl the function func is not declared but exists in libc.
+dnl
+dnl This macro sets two variables:
+dnl   - gl_cv_onwards_func_<func>   to yes / no / "future OS version"
+dnl   - ac_cv_func_<func>           to yes / no / no
+dnl The first variable allows to distinguish all three cases.
+dnl The second variable is set, so that an invocation
+dnl   gl_CHECK_FUNCS_ANDROID(func, #include <foo.h>)
+dnl can be used as a drop-in replacement for
+dnl   AC_CHECK_FUNCS(func).
+AC_DEFUN(gl_CHECK_FUNCS_ANDROID,
+
+  AC_REQUIRE(AC_CANONICAL_HOST)
+  AC_CACHE_CHECK(for $1,
+    gl_cv_onwards_func_$1,
+    gl_SILENT(
+       case "$host_os" in
+         gl_CHECK_FUNCS_CASE_FOR_ANDROID($1, $2)
+         gl_CHECK_FUNCS_DEFAULT_CASE($1)
+       esac
+      )
+    )
+  gl_CHECK_FUNCS_SET_RESULTS($1)
+)
+
+dnl gl_CHECK_FUNCS_MACOS(func, #include <foo.h>)
+dnl is like AC_CHECK_FUNCS(func), taking into account a portability problem
+dnl on macOS.
+dnl
+dnl When code is compiled on macOS, it is in the context of a certain minimum
+dnl macOS version, that can be set through the option '-mmacosx-version-min='.
+dnl In other words, you don't compile for a specific version of macOS. You
+dnl compile for all versions of macOS, onwards from the given version.
+dnl Thus, the question "does the OS have the function func" has three possible
+dnl answers:
+dnl   - yes, in all versions starting from the given version,
+dnl   - no, in no version,
+dnl   - not in the given version, but in a later version of macOS.
+dnl
+dnl In detail, this works as follows:
+dnl If func was added to, say, macOS version 13, then the libc has the
+dnl symbol func always, whereas the header file <foo.h> declares func
+dnl conditionally with a special availability attribute:
+dnl   ... func (...) __attribute__((availability(macos,introduced=13.0)));
+dnl Thus, when compiling with "clang mmacosx-version-min=13", there is no
+dnl warning about the use of func, and the resulting binary
+dnl   - runs fine on macOS 13,
+dnl   - aborts with a dyld "Symbol not found" message on macOS 12.
+dnl Whereas, when compiling with "clang mmacosx-version-min=12", there is a
+dnl   warning: 'func' is only available on macOS 13.0 or newer
+dnl   -Wunguarded-availability-new,
+dnl and the resulting binary
+dnl   - runs fine on macOS 13,
+dnl   - crashes with a SIGSEGV (signal 11) on macOS 12.
+dnl
+dnl This macro sets two variables:
+dnl   - gl_cv_onwards_func_<func>   to yes / no / "future OS version"
+dnl   - ac_cv_func_<func>           to yes / no / no
+dnl The first variable allows to distinguish all three cases.
+dnl The second variable is set, so that an invocation
+dnl   gl_CHECK_FUNCS_MACOS(func, #include <foo.h>)
+dnl can be used as a drop-in replacement for
+dnl   AC_CHECK_FUNCS(func).
+AC_DEFUN(gl_CHECK_FUNCS_MACOS,
+
+  AC_REQUIRE(AC_CANONICAL_HOST)
+  AC_REQUIRE(gl_PREPARE_CHECK_FUNCS_MACOS)
+  AC_CACHE_CHECK(for $1,
+    gl_cv_onwards_func_$1,
+    gl_SILENT(
+       case "$host_os" in
+         gl_CHECK_FUNCS_CASE_FOR_MACOS($1, $2)
+         gl_CHECK_FUNCS_DEFAULT_CASE($1)
+       esac
+      )
+    )
+  gl_CHECK_FUNCS_SET_RESULTS($1)
+)
+
+dnl gl_CHECK_FUNCS_ANDROID_MACOS(func, #include <foo.h>)
+dnl is like AC_CHECK_FUNCS(func), taking into account a portability problem
+dnl on Android and on macOS.
+dnl It is the combination of gl_CHECK_FUNCS_ANDROID and gl_CHECK_FUNCS_MACOS.
+AC_DEFUN(gl_CHECK_FUNCS_ANDROID_MACOS,
+
+  AC_REQUIRE(AC_CANONICAL_HOST)
+  AC_REQUIRE(gl_PREPARE_CHECK_FUNCS_MACOS)
+  AC_CACHE_CHECK(for $1,
+    gl_cv_onwards_func_$1,
+    gl_SILENT(
+       case "$host_os" in
+         gl_CHECK_FUNCS_CASE_FOR_ANDROID($1, $2)
+         gl_CHECK_FUNCS_CASE_FOR_MACOS($1, $2)
+         gl_CHECK_FUNCS_DEFAULT_CASE($1)
+       esac
+      )
+    )
+  gl_CHECK_FUNCS_SET_RESULTS($1)
+)
+
 dnl Expands to some code for use in .c programs that, on native Windows, defines
 dnl the Microsoft deprecated alias function names to the underscore-prefixed
 dnl actual function names. With this macro, these function names are available

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/gnulib-comp.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/gnulib-comp.m4 Changed

@@ -1,5 +1,5 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2022 Free Software Foundation, Inc.
+# Copyright (C) 2002-2024 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
@@ -55,6 +55,7 @@
   # Code from module dup2:
   # Code from module errno:
   # Code from module error:
+  # Code from module error-h:
   # Code from module extensions:
   # Code from module extern-inline:
   # Code from module fcntl:
@@ -81,7 +82,6 @@
   # Code from module inline:
   # Code from module intprops:
   # Code from module largefile:
-  AC_REQUIRE(gl_YEAR2038_EARLY)
   AC_REQUIRE(AC_SYS_LARGEFILE)
   # Code from module lib-msvc-compat:
   # Code from module lib-symbol-versions:
@@ -108,7 +108,6 @@
   # Code from module stat:
   # Code from module stat-time:
   # Code from module std-gnu11:
-  # Code from module stdalign:
   # Code from module stdarg:
   dnl Some compilers (e.g., AIX 5.3 cc) need to be in c99 mode
   dnl for the builtin va_copy to work.  gl_PROG_CC_C99 arranges for this.
@@ -118,6 +117,7 @@
   # Code from module stddef:
   # Code from module stdint:
   # Code from module stdio:
+  gl_STDIO_H_EARLY
   # Code from module stdlib:
   # Code from module strchrnul:
   # Code from module strerror:
@@ -126,7 +126,7 @@
   # Code from module strverscmp:
   # Code from module sys_stat:
   # Code from module sys_types:
-  # Code from module time:
+  # Code from module time-h:
   # Code from module unistd:
   # Code from module update-copyright:
   # Code from module useless-if-before-free:
@@ -175,14 +175,17 @@
   gl_HEADER_ERRNO_H
   gl_CONDITIONAL_HEADER(errno.h)
   AC_PROG_MKDIR_P
+  AC_REQUIRE(gl_ERROR_H)
   gl_ERROR
-  gl_CONDITIONAL(GL_COND_OBJ_ERROR, test "$ac_cv_lib_error_at_line" = no)
+  gl_CONDITIONAL(GL_COND_OBJ_ERROR, test $COMPILE_ERROR_C = 1)
   AM_COND_IF(GL_COND_OBJ_ERROR, 
     gl_PREREQ_ERROR
   )
   m4_ifdef(AM_XGETTEXT_OPTION,
     AM_XGETTEXT_OPTION(--flag=error:3:c-format)
      AM_XGETTEXT_OPTION(--flag=error_at_line:5:c-format))
+  gl_ERROR_H
+  AC_PROG_MKDIR_P
   AC_REQUIRE(gl_EXTERN_INLINE)
   gl_FUNC_FCNTL
   gl_CONDITIONAL(GL_COND_OBJ_FCNTL,
@@ -195,7 +198,7 @@
   gl_CONDITIONAL(GL_COND_OBJ_FSTAT, test $REPLACE_FSTAT = 1)
   AM_COND_IF(GL_COND_OBJ_FSTAT, 
     case "$host_os" in
-      mingw*)
+      mingw* | windows*)
         AC_LIBOBJ(stat-w32)
         ;;
     esac
@@ -238,6 +241,12 @@
   )
   gl_UNISTD_MODULE_INDICATOR(getopt-posix)
   gl_FUNC_GETPROGNAME
+  gl_CONDITIONAL(GL_COND_OBJ_GETPROGNAME,
+                 test $HAVE_GETPROGNAME = 0 || test $REPLACE_GETPROGNAME = 1)
+  AM_COND_IF(GL_COND_OBJ_GETPROGNAME, 
+    gl_PREREQ_GETPROGNAME
+  )
+  gl_STDLIB_MODULE_INDICATOR(getprogname)
   AC_SUBST(LIBINTL)
   AC_SUBST(LTLIBINTL)
   # Autoconf 2.61a.99 and earlier don't support linking a file only
@@ -292,7 +301,7 @@
   gl_CONDITIONAL(GL_COND_OBJ_STAT, test $REPLACE_STAT = 1)
   AM_COND_IF(GL_COND_OBJ_STAT, 
     case "$host_os" in
-      mingw*)
+      mingw* | windows*)
         AC_LIBOBJ(stat-w32)
         ;;
     esac
@@ -301,9 +310,6 @@
   gl_SYS_STAT_MODULE_INDICATOR(stat)
   gl_STAT_TIME
   gl_STAT_BIRTHTIME
-  gl_STDALIGN_H
-  gl_CONDITIONAL_HEADER(stdalign.h)
-  AC_PROG_MKDIR_P
   gl_STDARG_H
   gl_CONDITIONAL_HEADER(stdarg.h)
   AC_PROG_MKDIR_P
@@ -378,7 +384,8 @@
   gl_STRING_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
   gl_FUNC_STRVERSCMP
-  gl_CONDITIONAL(GL_COND_OBJ_STRVERSCMP, test $HAVE_STRVERSCMP = 0)
+  gl_CONDITIONAL(GL_COND_OBJ_STRVERSCMP,
+                 test $HAVE_STRVERSCMP = 0 || test $REPLACE_STRVERSCMP = 1)
   AM_COND_IF(GL_COND_OBJ_STRVERSCMP, 
     gl_PREREQ_STRVERSCMP
   )
@@ -597,7 +604,7 @@
   lib/dup2.c
   lib/errno.in.h
   lib/error.c
-  lib/error.h
+  lib/error.in.h
   lib/fcntl.c
   lib/fcntl.in.h
   lib/fd-hook.c
@@ -641,7 +648,6 @@
   lib/stat-w32.c
   lib/stat-w32.h
   lib/stat.c
-  lib/stdalign.in.h
   lib/stdarg.in.h
   lib/stdckdint.in.h
   lib/stddef.in.h
@@ -674,11 +680,13 @@
   m4/assert_h.m4
   m4/c-bool.m4
   m4/close.m4
+  m4/codeset.m4
   m4/double-slash-root.m4
   m4/dup2.m4
   m4/eealloc.m4
   m4/errno_h.m4
   m4/error.m4
+  m4/error_h.m4
   m4/extensions.m4
   m4/extern-inline.m4
   m4/fcntl-o.m4
@@ -697,6 +705,7 @@
   m4/ld-output-def.m4
   m4/ld-version-script.m4
   m4/limits-h.m4
+  m4/locale-fr.m4
   m4/malloca.m4
   m4/manywarnings-c++.m4
   m4/manywarnings.m4
@@ -704,6 +713,7 @@
   m4/msvc-inval.m4
   m4/msvc-nothrow.m4
   m4/multiarch.m4
+  m4/musl.m4
   m4/nocrash.m4
   m4/off_t.m4
   m4/open-cloexec.m4
@@ -716,7 +726,6 @@
   m4/stat-time.m4
   m4/stat.m4
   m4/std-gnu11.m4
-  m4/stdalign.m4
   m4/stdarg.m4
   m4/stddef_h.m4
   m4/stdint.m4
@@ -739,7 +748,6 @@
   m4/warnings.m4
   m4/wchar_t.m4
   m4/wint_t.m4
-  m4/year2038.m4
   m4/zzgnulib.m4
   tests=lib/_Noreturn.h
   tests=lib/arg-nonnull.h

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/include_next.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/include_next.m4 Changed

@@ -1,5 +1,5 @@
-# include_next.m4 serial 26
-dnl Copyright (C) 2006-2022 Free Software Foundation, Inc.
+# include_next.m4 serial 27
+dnl Copyright (C) 2006-2024 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.
@@ -74,17 +74,17 @@
 #endif
 #define DEFINED_IN_CONFTESTD2
 EOF
-     gl_save_CPPFLAGS="$CPPFLAGS"
-     CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2"
+     gl_saved_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$gl_saved_CPPFLAGS -Iconftestd1b -Iconftestd2"
 dnl We intentionally avoid using AC_LANG_SOURCE here.
      AC_COMPILE_IFELSE(AC_LANG_DEFINES_PROVIDED#include <conftest.h>,
        gl_cv_have_include_next=yes,
-       CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
+       CPPFLAGS="$gl_saved_CPPFLAGS -Iconftestd1a -Iconftestd2"
         AC_COMPILE_IFELSE(AC_LANG_DEFINES_PROVIDED#include <conftest.h>,
           gl_cv_have_include_next=buggy,
           gl_cv_have_include_next=no)
        )
-     CPPFLAGS="$gl_save_CPPFLAGS"
+     CPPFLAGS="$gl_saved_CPPFLAGS"
      rm -rf conftestd1a conftestd1b conftestd2
     )
   PRAGMA_SYSTEM_HEADER=

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/inline.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/inline.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/largefile.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/largefile.m4 Changed

@@ -1,7 +1,7 @@
 # Enable large files on systems where this is not the default.
 # Enable support for files on Linux file systems with 64-bit inode numbers.
 
-# Copyright 1992-1996, 1998-2022 Free Software Foundation, Inc.
+# Copyright 1992-1996, 1998-2024 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.
@@ -10,10 +10,9 @@
 # It does not set _LARGEFILE_SOURCE=1 on HP-UX/ia64 32-bit, although this
 # setting of _LARGEFILE_SOURCE is needed so that <stdio.h> declares fseeko
 # and ftello in C++ mode as well.
-# Fixed in Autoconf 2.72, which has AC_SYS_YEAR2038.
+# This problem occurs in Autoconf 2.71 and earlier, which lack AC_SYS_YEAR2038.
 AC_DEFUN(gl_SET_LARGEFILE_SOURCE,
-
- m4_ifndef(AC_SYS_YEAR2038, 
+ m4_ifndef(AC_SYS_YEAR2038, 
   AC_REQUIRE(AC_CANONICAL_HOST)
   AC_FUNC_FSEEKO
   case "$host_os" in
@@ -22,58 +21,264 @@
         Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).)
       ;;
   esac
- )
+ )
+)
+
+m4_ifndef(AC_SYS_YEAR2038_RECOMMENDED, 
+# Support AC_SYS_YEAR2038_RECOMMENDED and related macros, even if
+# Autoconf 2.71 or earlier.  This code is taken from Autoconf master.
+
+# _AC_SYS_YEAR2038_TEST_CODE
+# --------------------------
+# C code used to probe for time_t that can represent time points more
+# than 2**31 - 1 seconds after the epoch.  With the usual Unix epoch,
+# these correspond to dates after 2038-01-18 22:14:07 +0000 (Gregorian),
+# hence the name.
+AC_DEFUN(_AC_SYS_YEAR2038_TEST_CODE,
+
+  #include <time.h>
+  /* Check that time_t can represent 2**32 - 1 correctly.  */
+  #define LARGE_TIME_T \\
+    ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30)))
+  int verify_time_t_range(LARGE_TIME_T / 65537 == 65535
+                           && LARGE_TIME_T % 65537 == 0)
+                          ? 1 : -1;
+)
+
+# _AC_SYS_YEAR2038_OPTIONS
+# ------------------------
+# List of known ways to enable support for large time_t.  If you change
+# this list you probably also need to change the AS_CASE at the end of
+# _AC_SYS_YEAR2038_PROBE.
+m4_define(_AC_SYS_YEAR2038_OPTIONS, m4_normalize(
+    "none needed"                   dnl 64-bit and newer 32-bit Unix
+    "-D_TIME_BITS=64"               dnl glibc 2.34 with some 32-bit ABIs
+    "-D__MINGW_USE_VC2005_COMPAT"   dnl 32-bit MinGW
+    "-U_USE_32_BIT_TIME_T -D__MINGW_USE_VC2005_COMPAT"
+                                      dnl 32-bit MinGW (misconfiguration)
+))
+
+# _AC_SYS_YEAR2038_PROBE
+# ----------------------
+# Subroutine of AC_SYS_YEAR2038.  Probe for time_t that can represent
+# time points more than 2**31 - 1 seconds after the epoch (dates after
+# 2038-01-18, see above) and set the cache variable ac_cv_sys_year2038_opts
+# to one of the values in the _AC_SYS_YEAR2038_OPTIONS list, or to
+# "support not detected" if none of them worked.  Then, set compilation
+# options and #defines as necessary to enable large time_t support.
+#
+# Note that we do not test whether mktime, localtime, etc. handle
+# large values of time_t correctly, as that would require use of
+# AC_TRY_RUN.  Note also that some systems only support large time_t
+# together with large off_t.
+#
+# If you change this macro you may also need to change
+# _AC_SYS_YEAR2038_OPTIONS.
+AC_DEFUN(_AC_SYS_YEAR2038_PROBE,
+AC_CACHE_CHECK(for $CC option for timestamps after 2038,
+  ac_cv_sys_year2038_opts,
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  ac_opt_found=no
+  for ac_opt in _AC_SYS_YEAR2038_OPTIONS; do
+    AS_IF(test x"$ac_opt" != x"none needed",
+      CPPFLAGS="$ac_save_CPPFLAGS $ac_opt")
+    AC_COMPILE_IFELSE(AC_LANG_PROGRAM(_AC_SYS_YEAR2038_TEST_CODE),
+      ac_cv_sys_year2038_opts="$ac_opt"
+      ac_opt_found=yes)
+    test $ac_opt_found = no || break
+  done
+  CPPFLAGS="$ac_save_CPPFLAGS"
+  test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected")
+
+ac_have_year2038=yes
+AS_CASE($ac_cv_sys_year2038_opts,
+  "none needed", ,
+  "support not detected",
+    ac_have_year2038=no,
+
+  "-D_TIME_BITS=64",
+    AC_DEFINE(_TIME_BITS, 64,
+      Number of bits in time_t, on hosts where this is settable.),
+
+  "-D__MINGW_USE_VC2005_COMPAT",
+    AC_DEFINE(__MINGW_USE_VC2005_COMPAT, 1,
+      Define to 1 on platforms where this makes time_t a 64-bit type.),
+
+  "-U_USE_32_BIT_TIME_T"*,
+    AC_MSG_FAILURE(m4_text_wrap(
+      the 'time_t' type is currently forced to be 32-bit.
+       It will stop working after mid-January 2038.
+       Remove _USE_32BIT_TIME_T from the compiler flags.,
+      , , 55)),
+
+  AC_MSG_ERROR(
+    internal error: bad value for \$ac_cv_sys_year2038_opts))
 )
 
-# Work around a problem in Autoconf through 2.71 on glibc 2.34+
-# with _TIME_BITS.  Also, work around a problem in autoconf <= 2.69:
-# AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
-# or configures them incorrectly in some cases.
-m4_version_prereq(2.70, , 
-
-# _AC_SYS_LARGEFILE_TEST_INCLUDES
-# -------------------------------
-m4_define(_AC_SYS_LARGEFILE_TEST_INCLUDES,
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+# _AC_SYS_YEAR2038_ENABLE
+# -----------------------
+# Depending on which of the YEAR2038 macros was used, add either an
+# --enable-year2038 or a --disable-year2038 to
+# the configure script.  This is expanded very late and
+# therefore there cannot be any code in the AC_ARG_ENABLE.  The
+# default value for 'enable_year2038' is emitted unconditionally
+# because the generated code always looks at this variable.
+m4_define(_AC_SYS_YEAR2038_ENABLE,
+m4_divert_text(DEFAULTS,
+  m4_provide_if(AC_SYS_YEAR2038,
+    enable_year2038=yes,
+    enable_year2038=no))dnl
+AC_ARG_ENABLE(year2038,
+  m4_provide_if(AC_SYS_YEAR2038,
+    AS_HELP_STRING(--disable-year2038,
+      don't support timestamps after 2038),
+    AS_HELP_STRING(--enable-year2038,
+      support timestamps after 2038))))
+
+# AC_SYS_YEAR2038
+# ---------------
+# Attempt to detect and activate support for large time_t.
+# On systems where time_t is not always 64 bits, this probe can be
+# skipped by passing the --disable-year2038 option to configure.
+AC_DEFUN(AC_SYS_YEAR2038,
+AC_REQUIRE(AC_SYS_LARGEFILE)dnl
+AS_IF(test "$enable_year2038,$ac_have_year2038,$cross_compiling" = yes,no,no,
+ # If we're not cross compiling and 'touch' works with a large
+  # timestamp, then we can presume the system supports wider time_t
+  # *somehow* and we just weren't able to detect it.  One common
+  # case that we deliberately *don't* probe for is a system that
+  # supports both 32- and 64-bit ABIs but only the 64-bit ABI offers
+  # wide time_t.  (It would be inappropriate for us to override an
+  # intentional use of -m32.)  Error out, demanding use of
+  # --disable-year2038 if this is intentional.
+  AS_IF(TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null,
+    AS_CASE(`TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null`,
+       *'Feb  7  2106'* | *'Feb  7 17:10'*,
+       AC_MSG_FAILURE(m4_text_wrap(
+	  this system appears to support timestamps after mid-January 2038,
+	   but no mechanism for enabling wide 'time_t' was detected.
+	   Did you mean to build a 64-bit binary? (E.g., 'CC="${CC} -m64"'.)
+	   To proceed with 32-bit time_t, configure with '--disable-year2038'.,
+	  , , 55))))))
+
+# AC_SYS_YEAR2038_RECOMMENDED
+# ---------------------------
+# Same as AC_SYS_YEAR2038, but recommend support for large time_t.
+# If we cannot find any way to make time_t capable of representing
+# values larger than 2**31 - 1, error out unless --disable-year2038 is given.
+AC_DEFUN(AC_SYS_YEAR2038_RECOMMENDED,
+AC_REQUIRE(AC_SYS_YEAR2038)dnl
+AS_IF(test "$enable_year2038,$ac_have_year2038" = yes,no,
+   AC_MSG_FAILURE(m4_text_wrap(
+      could not enable timestamps after mid-January 2038.
+       This package recommends support for these later timestamps.
+       However, to proceed with signed 32-bit time_t even though it
+       will fail then, configure with '--disable-year2038'.,
+      , , 55))))
+
+# _AC_SYS_LARGEFILE_TEST_CODE
+# ---------------------------
+# C code used to probe for large file support.
+m4_define(_AC_SYS_LARGEFILE_TEST_CODE,
+@%:@include <sys/types.h>
+@%:@ifndef FTYPE
+@%:@ define FTYPE off_t
+@%:@endif
+ /* Check that FTYPE can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_FTYPE to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
-  int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
-                       && LARGE_OFF_T % 2147483647 == 1)
-                      ? 1 : -1;dnl
+@%:@define LARGE_FTYPE (((FTYPE) 1 << 31 << 31) - 1 + ((FTYPE) 1 << 31 << 31))
+  int FTYPE_is_large(LARGE_FTYPE % 2147483629 == 721
+		       && LARGE_FTYPE % 2147483647 == 1)
+		      ? 1 : -1;dnl
 )
-)# m4_version_prereq 2.70
-
-m4_ifndef(AC_SYS_YEAR2038, 
-
-# _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE,
-#                               CACHE-VAR,
-#                               DESCRIPTION,
-#                               PROLOGUE, FUNCTION-BODY)
-# --------------------------------------------------------
-m4_define(_AC_SYS_LARGEFILE_MACRO_VALUE,
-AC_CACHE_CHECK(for $1 value needed for large files, $3,
-while :; do
-  m4_ifval($6, AC_LINK_IFELSE, AC_COMPILE_IFELSE)(
-    AC_LANG_PROGRAM($5, $6),
-    $3=no; break)
-  m4_ifval($6, AC_LINK_IFELSE, AC_COMPILE_IFELSE)(
-    AC_LANG_PROGRAM(#undef $1
-#define $1 $2
-$5, $6),
-    $3=$2; break)
-  $3=unknown
-  break
-done)
-case $$3 in #(
-  no | unknown) ;;
-  *) AC_DEFINE_UNQUOTED($1, $$3, $4);;
-esac
-rm -rf conftest*dnl
-)# _AC_SYS_LARGEFILE_MACRO_VALUE
+# Defined by Autoconf 2.71 and circa 2022 Gnulib unwisely depended on it.
+m4_define(_AC_SYS_LARGEFILE_TEST_INCLUDES, _AC_SYS_LARGEFILE_TEST_CODE)
+
+# _AC_SYS_LARGEFILE_OPTIONS
+# -------------------------
+# List of known ways to enable support for large files.  If you change
+# this list you probably also need to change the AS_CASE at the end of
+# _AC_SYS_LARGEFILE_PROBE.
+m4_define(_AC_SYS_LARGEFILE_OPTIONS, m4_normalize(
+    "none needed"                   dnl Most current systems
+    "-D_FILE_OFFSET_BITS=64"        dnl X/Open LFS spec
+    "-D_LARGE_FILES=1"              dnl 32-bit AIX 4.2.1+, 32-bit z/OS
+    "-n32"                          dnl 32-bit IRIX 6, SGI cc (obsolete)
+))
+
+# _AC_SYS_LARGEFILE_PROBE
+# -----------------------
+# Subroutine of AC_SYS_LARGEFILE. Probe for large file support and set
+# the cache variable ac_cv_sys_largefile_opts to one of the values in
+# the _AC_SYS_LARGEFILE_OPTIONS list, or to "support not detected" if
+# none of the options in that list worked.  Then, set compilation
+# options and #defines as necessary to enable large file support.
+#
+# If large file support is not detected, the behavior depends on which of
+# the top-level AC_SYS_LARGEFILE macros was used (see below).
+#
+# If you change this macro you may also need to change
+# _AC_SYS_LARGEFILE_OPTIONS.
+AC_DEFUN(_AC_SYS_LARGEFILE_PROBE,
+AC_CACHE_CHECK(for $CC option to enable large file support,
+  ac_cv_sys_largefile_opts,
+  ac_save_CC="$CC"
+  ac_opt_found=no
+  for ac_opt in _AC_SYS_LARGEFILE_OPTIONS; do
+    AS_IF(test x"$ac_opt" != x"none needed",
+      CC="$ac_save_CC $ac_opt")
+    AC_COMPILE_IFELSE(AC_LANG_PROGRAM(_AC_SYS_LARGEFILE_TEST_CODE),
+     AS_IF(test x"$ac_opt" = x"none needed",
+	# GNU/Linux s390x and alpha need _FILE_OFFSET_BITS=64 for wide ino_t.
+	 CC="$CC -DFTYPE=ino_t"
+	 AC_COMPILE_IFELSE(, ,
+	   CC="$CC -D_FILE_OFFSET_BITS=64"
+	    AC_COMPILE_IFELSE(, ac_opt='-D_FILE_OFFSET_BITS=64')))
+      ac_cv_sys_largefile_opts=$ac_opt
+      ac_opt_found=yes)
+    test $ac_opt_found = no || break
+  done
+  CC="$ac_save_CC"
+  dnl Gnulib implements large file support for native Windows, based on the
+  dnl variables WINDOWS_64_BIT_OFF_T, WINDOWS_64_BIT_ST_SIZE.
+  m4_ifdef(gl_LARGEFILE, 
+    AC_REQUIRE(AC_CANONICAL_HOST)
+    if test $ac_opt_found != yes; then
+      AS_CASE($host_os,
+        mingw* | windows*,
+          ac_cv_sys_largefile_opts="supported through gnulib"
+           ac_opt_found=yes
+      )
+    fi
+  )
+  test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected")
+
+ac_have_largefile=yes
+AS_CASE($ac_cv_sys_largefile_opts,
+  "none needed", ,
+  "supported through gnulib", ,
+  "support not detected",
+    ac_have_largefile=no,
+
+  "-D_FILE_OFFSET_BITS=64",
+    AC_DEFINE(_FILE_OFFSET_BITS, 64,
+      Number of bits in a file offset, on hosts where this is settable.),
+
+  "-D_LARGE_FILES=1",
+    AC_DEFINE(_LARGE_FILES, 1,
+      Define to 1 on platforms where this makes off_t a 64-bit type.),
+
+  "-n32",
+    CC="$CC -n32",
+
+  AC_MSG_ERROR(
+    internal error: bad value for \$ac_cv_sys_largefile_opts))
 
+AS_IF(test "$enable_year2038" != no,
+  _AC_SYS_YEAR2038_PROBE)
+AC_CONFIG_COMMANDS_PRE(_AC_SYS_YEAR2038_ENABLE))
 
 # AC_SYS_LARGEFILE
 # ----------------
@@ -85,44 +290,12 @@
 # to have a 64-bit inode number cannot be accessed by 32-bit applications on
 # Linux x86/x86_64.  This can occur with file systems such as XFS and NFS.
 AC_DEFUN(AC_SYS_LARGEFILE,
-AC_ARG_ENABLE(largefile,
-                 --disable-largefile     omit support for large files)
-AS_IF(test "$enable_largefile" != no,
- AC_CACHE_CHECK(for special C compiler options needed for large files,
-    ac_cv_sys_largefile_CC,
-    ac_cv_sys_largefile_CC=no
-     if test "$GCC" != yes; then
-       ac_save_CC=$CC
-       while :; do
-         # IRIX 6.2 and later do not support large files by default,
-         # so use the C compiler's -n32 option if that helps.
-         AC_LANG_CONFTEST(AC_LANG_PROGRAM(_AC_SYS_LARGEFILE_TEST_INCLUDES))
-         AC_COMPILE_IFELSE(, break)
-         CC="$CC -n32"
-         AC_COMPILE_IFELSE(, ac_cv_sys_largefile_CC=' -n32'; break)
-         break
-       done
-       CC=$ac_save_CC
-       rm -f conftest.$ac_ext
-    fi)
-  if test "$ac_cv_sys_largefile_CC" != no; then
-    CC=$CC$ac_cv_sys_largefile_CC
-  fi
-
-  _AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
-    ac_cv_sys_file_offset_bits,
-    Number of bits in a file offset, on hosts where this is settable.,
-    _AC_SYS_LARGEFILE_TEST_INCLUDES)
-  AS_CASE($ac_cv_sys_file_offset_bits,
-    unknown,
-      _AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1,
-         ac_cv_sys_large_files,
-         Define for large files, on AIX-style hosts.,
-         _AC_SYS_LARGEFILE_TEST_INCLUDES),
-    64,
-      gl_YEAR2038_BODY()))
-)# AC_SYS_LARGEFILE
-)# m4_ifndef AC_SYS_YEAR2038
+AC_ARG_ENABLE(largefile,
+   AS_HELP_STRING(--disable-largefile,
+      omit support for large files))dnl
+AS_IF(test "$enable_largefile,$enable_year2038" != no,no,
+  _AC_SYS_LARGEFILE_PROBE))
+)# m4_ifndef AC_SYS_YEAR2038_RECOMMENDED
 
 # Enable large files on systems where this is implemented by Gnulib, not by the
 # system headers.
@@ -132,7 +305,7 @@
 
   AC_REQUIRE(AC_CANONICAL_HOST)
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
       dnl Native Windows.
       dnl mingw64 defines off_t to a 64-bit type already, if
       dnl _FILE_OFFSET_BITS=64, which is ensured by AC_SYS_LARGEFILE.

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/ld-output-def.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/ld-output-def.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/ld-version-script.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/ld-version-script.m4 Changed

@@ -1,5 +1,5 @@
-# ld-version-script.m4 serial 5
-dnl Copyright (C) 2008-2022 Free Software Foundation, Inc.
+# ld-version-script.m4 serial 7
+dnl Copyright (C) 2008-2024 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.
@@ -18,13 +18,13 @@
 AC_DEFUN(gl_LD_VERSION_SCRIPT,
 
   AC_ARG_ENABLE(ld-version-script,
-    AS_HELP_STRING(--enable-ld-version-script,
+    AS_HELP_STRING(--enable-ld-version-script,
        enable linker version script (default is enabled when possible)),
     have_ld_version_script=$enableval,
     AC_CACHE_CHECK(if LD -Wl,--version-script works,
        gl_cv_sys_ld_version_script,
        gl_cv_sys_ld_version_script=no
-        save_LDFLAGS=$LDFLAGS
+        saved_LDFLAGS=$LDFLAGS
         LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
         echo foo >conftest.map
         AC_LINK_IFELSE(AC_LANG_PROGRAM(, ),
@@ -41,7 +41,7 @@
            AC_LINK_IFELSE(AC_LANG_PROGRAM(, ),
              gl_cv_sys_ld_version_script=yes))
         rm -f conftest.map
-        LDFLAGS=$save_LDFLAGS)
+        LDFLAGS=$saved_LDFLAGS)
      have_ld_version_script=$gl_cv_sys_ld_version_script)
   AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT,
     test "$have_ld_version_script" = yes)

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/limits-h.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/limits-h.m4 Changed

@@ -1,6 +1,6 @@
 dnl Check whether limits.h has needed features.
 
-dnl Copyright 2016-2022 Free Software Foundation, Inc.
+dnl Copyright 2016-2024 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,14 +23,27 @@
             int wb = WORD_BIT;
             int ullw = ULLONG_WIDTH;
             int bw = BOOL_WIDTH;
+            int bm = BOOL_MAX;
+            int mblm = MB_LEN_MAX;
           ),
        gl_cv_header_limits_width=yes,
        gl_cv_header_limits_width=no))
-  if test "$gl_cv_header_limits_width" = yes; then
-    GL_GENERATE_LIMITS_H=false
-  else
-    GL_GENERATE_LIMITS_H=true
-  fi
+  GL_GENERATE_LIMITS_H=true
+  AS_IF(test "$gl_cv_header_limits_width" = yes,
+    AC_CACHE_CHECK(whether limits.h has SSIZE_MAX,
+       gl_cv_header_limits_ssize_max,
+       AC_COMPILE_IFELSE(
+          AC_LANG_SOURCE(
+             #include <limits.h>
+               #ifndef SSIZE_MAX
+                 #error "SSIZE_MAX is not defined"
+               #endif
+             ),
+          gl_cv_header_limits_ssize_max=yes,
+          gl_cv_header_limits_ssize_max=no))
+     if test "$gl_cv_header_limits_ssize_max" = yes; then
+       GL_GENERATE_LIMITS_H=false
+     fi)
 )
 
 dnl Unconditionally enables the replacement of <limits.h>.

_service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/locale-fr.m4 Added

@@ -0,0 +1,300 @@
+# locale-fr.m4 serial 23
+dnl Copyright (C) 2003, 2005-2024 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 Bruno Haible.
+
+dnl Determine the name of a french locale with traditional encoding.
+AC_DEFUN_ONCE(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_LANG_CONFTEST(AC_LANG_SOURCE(
+#include <locale.h>
+#include <time.h>
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+struct tm t;
+char buf16;
+int main () {
+  /* On BeOS and Haiku, locales are not implemented in libc.  Rather, libintl
+     imitates locale dependent behaviour by looking at the environment
+     variables, and all locales use the UTF-8 encoding.  */
+#if defined __BEOS__ || defined __HAIKU__
+  return 1;
+#else
+  /* Check whether the given locale name is recognized by the system.  */
+# if defined _WIN32 && !defined __CYGWIN__
+  /* On native Windows, setlocale(category, "") looks at the system settings,
+     not at the environment variables.  Also, when an encoding suffix such
+     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
+     category of the locale to "C".  */
+  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
+      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
+    return 1;
+# else
+  if (setlocale (LC_ALL, "") == NULL) return 1;
+# endif
+  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
+     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
+     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
+     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
+     some unit tests fail.
+     On MirBSD 10, when an unsupported locale is specified, setlocale()
+     succeeds but then nl_langinfo(CODESET) is "UTF-8".  */
+# if HAVE_LANGINFO_CODESET
+  {
+    const char *cs = nl_langinfo (CODESET);
+    if (cs0 == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
+        || strcmp (cs, "UTF-8") == 0)
+      return 1;
+  }
+# endif
+# ifdef __CYGWIN__
+  /* On Cygwin, avoid locale names without encoding suffix, because the
+     locale_charset() function relies on the encoding suffix.  Note that
+     LC_ALL is set on the command line.  */
+  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
+# endif
+  /* Check whether in the abbreviation of the second month, the second
+     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is only
+     one byte long. This excludes the UTF-8 encoding.  */
+  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
+  if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf2 != 'v') return 1;
+# if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
+  /* Check whether the decimal separator is a comma.
+     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
+     are nl_langinfo(RADIXCHAR) are both ".".  */
+  if (localeconv () ->decimal_point0 != ',') return 1;
+# endif
+  return 0;
+#endif
+}
+      ))
+    if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
+      case "$host_os" in
+        # Handle native Windows specially, because there setlocale() interprets
+        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
+        # "fr" or "fra" as "French" or "French_France.1252",
+        # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
+        # "ja" as "Japanese" or "Japanese_Japan.932",
+        # and similar.
+        mingw* | windows*)
+          # Test for the native Windows locale name.
+          if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            gt_cv_locale_fr=French_France.1252
+          else
+            # None found.
+            gt_cv_locale_fr=none
+          fi
+          ;;
+        *)
+          # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+          # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
+          # configure script would override the LC_ALL setting. Likewise for
+          # LC_CTYPE, which is also set at the beginning of the configure script.
+          # Test for the usual locale name.
+          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+            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 AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
+              if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_fr=fr_FR.ISO8859-1
+              else
+                # Test for the HP-UX locale name.
+                if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                  gt_cv_locale_fr=fr_FR.iso88591
+                else
+                  # Test for the Solaris 7 locale name.
+                  if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                    gt_cv_locale_fr=fr
+                  else
+                    # None found.
+                    gt_cv_locale_fr=none
+                  fi
+                fi
+              fi
+            fi
+          fi
+          ;;
+      esac
+    fi
+    rm -fr conftest*
+  )
+  LOCALE_FR=$gt_cv_locale_fr
+  case $LOCALE_FR in #(
+    '' | *:space:\"\$\'*@<:@*)
+      dnl This locale name might cause trouble with sh or make.
+      AC_MSG_WARN(invalid locale "$LOCALE_FR"; assuming "none")
+      LOCALE_FR=none;;
+  esac
+  AC_SUBST(LOCALE_FR)
+)
+
+dnl Determine the name of a french locale with UTF-8 encoding.
+AC_DEFUN_ONCE(gt_LOCALE_FR_UTF8,
+
+  AC_REQUIRE(AC_CANONICAL_HOST)
+  AC_REQUIRE(AM_LANGINFO_CODESET)
+  AC_CACHE_CHECK(for a french Unicode locale, gt_cv_locale_fr_utf8, 
+    case "$host_os" in
+      *-musl* | midipix*)
+        dnl On musl libc, all kinds of ll_CC.UTF-8 locales exist, even without
+        dnl any locale file on disk. But they are effectively equivalent to the
+        dnl C.UTF-8 locale, except for locale categories (such as LC_MESSSAGES)
+        dnl for which localizations (.mo files) have been installed.
+        gt_cv_locale_fr_utf8=fr_FR.UTF-8
+        ;;
+      *)
+        AC_LANG_CONFTEST(AC_LANG_SOURCE(
+#include <locale.h>
+#include <time.h>
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+struct tm t;
+char buf16;
+int main () {
+  /* On BeOS and Haiku, locales are not implemented in libc.  Rather, libintl
+     imitates locale dependent behaviour by looking at the environment
+     variables, and all locales use the UTF-8 encoding.  */
+#if !(defined __BEOS__ || defined __HAIKU__)
+  /* Check whether the given locale name is recognized by the system.  */
+# if defined _WIN32 && !defined __CYGWIN__
+  /* On native Windows, setlocale(category, "") looks at the system settings,
+     not at the environment variables.  Also, when an encoding suffix such
+     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
+     category of the locale to "C".  */
+  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
+      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
+    return 1;
+# else
+  if (setlocale (LC_ALL, "") == NULL) return 1;
+# endif
+  /* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
+     On Mac OS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
+     is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
+     On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
+     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
+     some unit tests fail.  */
+# if HAVE_LANGINFO_CODESET
+  {
+    const char *cs = nl_langinfo (CODESET);
+    if (cs0 == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
+      return 1;
+  }
+# endif
+# ifdef __CYGWIN__
+  /* On Cygwin, avoid locale names without encoding suffix, because the
+     locale_charset() function relies on the encoding suffix.  Note that
+     LC_ALL is set on the command line.  */
+  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
+# endif
+  /* Check whether in the abbreviation of the second month, the second
+     character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is
+     two bytes long, with UTF-8 encoding.  */
+  t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
+  if (strftime (buf, sizeof (buf), "%b", &t) < 4
+      || buf1 != (char) 0xc3 || buf2 != (char) 0xa9 || buf3 != 'v')
+    return 1;
+#endif
+#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
+  /* Check whether the decimal separator is a comma.
+     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
+     are nl_langinfo(RADIXCHAR) are both ".".  */
+  if (localeconv () ->decimal_point0 != ',') return 1;
+#endif
+  return 0;
+}
+          ))
+        if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
+          case "$host_os" in
+            # Handle native Windows specially, because there setlocale() interprets
+            # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
+            # "fr" or "fra" as "French" or "French_France.1252",
+            # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
+            # "ja" as "Japanese" or "Japanese_Japan.932",
+            # and similar.
+            mingw* | windows*)
+              # Test for the hypothetical native Windows locale name.
+              if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_fr_utf8=French_France.65001
+              else
+                # None found.
+                gt_cv_locale_fr_utf8=none
+              fi
+              ;;
+            *)
+              # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+              # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
+              # configure script would override the LC_ALL setting. Likewise for
+              # LC_CTYPE, which is also set at the beginning of the configure script.
+              # Test for the usual locale name.
+              if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_fr_utf8=fr_FR
+              else
+                # Test for the locale name with explicit encoding suffix.
+                if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                  gt_cv_locale_fr_utf8=fr_FR.UTF-8
+                else
+                  # Test for the Solaris 7 locale name.
+                  if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                    gt_cv_locale_fr_utf8=fr.UTF-8
+                  else
+                    # None found.
+                    gt_cv_locale_fr_utf8=none
+                  fi
+                fi
+              fi
+              ;;
+          esac
+        fi
+        rm -fr conftest*
+        ;;
+    esac
+  )
+  LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
+  case $LOCALE_FR_UTF8 in #(
+    '' | *:space:\"\$\'*@<:@*)
+      dnl This locale name might cause trouble with sh or make.
+      AC_MSG_WARN(invalid locale "$LOCALE_FR_UTF8"; assuming "none")
+      LOCALE_FR_UTF8=none;;
+  esac
+  AC_SUBST(LOCALE_FR_UTF8)
+
+  dnl Users of $LOCALE_FR_UTF8 need to know which of the locale categories they
+  dnl can rely on.
+  case "$host_os" in
+    *-musl* | midipix*)
+      dnl On musl libc, locale categories other than LC_CTYPE and LC_MESSAGES
+      dnl are effectively unimplemented.
+      LC_COLLATE_IMPLEMENTED=false
+      LC_NUMERIC_IMPLEMENTED=false
+      LC_TIME_IMPLEMENTED=false
+      LC_MONETARY_IMPLEMENTED=false
+      ;;
+    *)
+      LC_COLLATE_IMPLEMENTED=true
+      LC_NUMERIC_IMPLEMENTED=true
+      LC_TIME_IMPLEMENTED=true
+      LC_MONETARY_IMPLEMENTED=true
+      ;;
+  esac
+  AC_SUBST(LC_COLLATE_IMPLEMENTED)
+  AC_SUBST(LC_NUMERIC_IMPLEMENTED)
+  AC_SUBST(LC_TIME_IMPLEMENTED)
+  AC_SUBST(LC_MONETARY_IMPLEMENTED)
+)

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/malloca.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/malloca.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/manywarnings.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/manywarnings.m4 Changed

@@ -1,11 +1,13 @@
-# manywarnings.m4 serial 23
-dnl Copyright (C) 2008-2022 Free Software Foundation, Inc.
+# manywarnings.m4 serial 25
+dnl Copyright (C) 2008-2024 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 Simon Josefsson
 
+AC_PREREQ(2.64)
+
 # gl_MANYWARN_COMPLEMENT(OUTVAR, LISTVAR, REMOVEVAR)
 # --------------------------------------------------
 # Copy LISTVAR to OUTVAR except for the entries in REMOVEVAR.
@@ -21,7 +23,7 @@
       *" $gl_warn_item "*)
         ;;
       *)
-        gl_AS_VAR_APPEND(gl_warn_set, " $gl_warn_item")
+        AS_VAR_APPEND(gl_warn_set, " $gl_warn_item")
         ;;
     esac
   done
@@ -46,59 +48,46 @@
   dnl First, check for some issues that only occur when combining multiple
   dnl gcc warning categories.
   AC_REQUIRE(AC_PROG_CC)
-  if test -n "$GCC"; then
-
-    dnl Check if -Wextra -Werror -Wno-missing-field-initializers is supported
-    dnl with the current $CC $CFLAGS $CPPFLAGS.
-    AC_CACHE_CHECK(whether -Wno-missing-field-initializers is supported,
-      gl_cv_cc_nomfi_supported,
-      gl_save_CFLAGS="$CFLAGS"
-       CFLAGS="$CFLAGS -Wextra -Werror -Wno-missing-field-initializers"
+  AS_IF(test -n "$GCC", 
+    AC_CACHE_CHECK(whether -Wno-missing-field-initializers is needed,
+      gl_cv_cc_nomfi_needed,
+      gl_cv_cc_nomfi_needed=no
+       gl_saved_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS -Wextra -Werror"
        AC_COMPILE_IFELSE(
-         AC_LANG_PROGRAM(, ),
-         gl_cv_cc_nomfi_supported=yes,
-         gl_cv_cc_nomfi_supported=no)
-       CFLAGS="$gl_save_CFLAGS"
-      )
-
-    if test "$gl_cv_cc_nomfi_supported" = yes; then
-      dnl Now check whether -Wno-missing-field-initializers is needed
-      dnl for the { 0, } construct.
-      AC_CACHE_CHECK(whether -Wno-missing-field-initializers is needed,
-        gl_cv_cc_nomfi_needed,
-        gl_save_CFLAGS="$CFLAGS"
-         CFLAGS="$CFLAGS -Wextra -Werror"
-         AC_COMPILE_IFELSE(
-           AC_LANG_PROGRAM(
-              int f (void)
-                {
-                  typedef struct { int a; int b; } s_t;
-                  s_t s1 = { 0, };
-                  return s1.b;
-                }
-              ,
-              ),
-           gl_cv_cc_nomfi_needed=no,
-           gl_cv_cc_nomfi_needed=yes)
-         CFLAGS="$gl_save_CFLAGS"
-        )
-    fi
+         AC_LANG_PROGRAM(
+            struct file_data { int desc, name; };
+              struct cmp { struct file_data file1; };
+              void f (struct cmp *r)
+              {
+                typedef struct { int a; int b; } s_t;
+                s_t s1 = { 0, };
+                struct cmp cmp = { .file0.desc = r->file0.desc + s1.a };
+                *r = cmp;
+              }
+            ,
+            ),
+         ,
+         CFLAGS="$CFLAGS -Wno-missing-field-initializers"
+          AC_COMPILE_IFELSE(,
+            gl_cv_cc_nomfi_needed=yes))
+       CFLAGS="$gl_saved_CFLAGS"
+    )
 
     dnl Next, check if -Werror -Wuninitialized is useful with the
     dnl user's choice of $CFLAGS; some versions of gcc warn that it
     dnl has no effect if -O is not also used
     AC_CACHE_CHECK(whether -Wuninitialized is supported,
       gl_cv_cc_uninitialized_supported,
-      gl_save_CFLAGS="$CFLAGS"
+      gl_saved_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -Werror -Wuninitialized"
        AC_COMPILE_IFELSE(
          AC_LANG_PROGRAM(, ),
          gl_cv_cc_uninitialized_supported=yes,
          gl_cv_cc_uninitialized_supported=no)
-       CFLAGS="$gl_save_CFLAGS"
+       CFLAGS="$gl_saved_CFLAGS"
       )
-
-  fi
+  )
 
   # List all gcc warning categories.
   # To compare this list to your installed GCC's, run this Bash command:
@@ -109,7 +98,7 @@
   #  <(LC_ALL=C gcc --help=warnings | sed -n 's/^  $-^ *$ .*/\1/p' | sort)
 
   $1=
-  for gl_manywarn_item in -fanalyzer -fno-common \
+  for gl_manywarn_item in -fanalyzer -fstrict-flex-arrays \
     -Wall \
     -Warith-conversion \
     -Wbad-function-cast \
@@ -137,6 +126,7 @@
     -Wpointer-arith \
     -Wshadow \
     -Wstack-protector \
+    -Wstrict-flex-arrays \
     -Wstrict-overflow \
     -Wstrict-prototypes \
     -Wsuggest-attribute=cold \
@@ -160,46 +150,51 @@
     -Wwrite-strings \
     \
     ; do
-    gl_AS_VAR_APPEND($1, " $gl_manywarn_item")
+    AS_VAR_APPEND($1, " $gl_manywarn_item")
   done
 
   # gcc --help=warnings outputs an unusual form for these options; list
   # them here so that the above 'comm' command doesn't report a false match.
-  gl_AS_VAR_APPEND($1, ' -Warray-bounds=2')
-  gl_AS_VAR_APPEND($1, ' -Wattribute-alias=2')
-  gl_AS_VAR_APPEND($1, ' -Wbidi-chars=any,ucn')
-  gl_AS_VAR_APPEND($1, ' -Wformat-overflow=2')
-  gl_AS_VAR_APPEND($1, ' -Wformat=2')
-  gl_AS_VAR_APPEND($1, ' -Wformat-truncation=2')
-  gl_AS_VAR_APPEND($1, ' -Wimplicit-fallthrough=5')
-  gl_AS_VAR_APPEND($1, ' -Wshift-overflow=2')
-  gl_AS_VAR_APPEND($1, ' -Wuse-after-free=3')
-  gl_AS_VAR_APPEND($1, ' -Wunused-const-variable=2')
-  gl_AS_VAR_APPEND($1, ' -Wvla-larger-than=4031')
+  AS_VAR_APPEND($1, ' -Warray-bounds=2')
+  AS_VAR_APPEND($1, ' -Wattribute-alias=2')
+  AS_VAR_APPEND($1, ' -Wbidi-chars=any,ucn')
+  AS_VAR_APPEND($1, ' -Wformat-overflow=2')
+  AS_VAR_APPEND($1, ' -Wformat=2')
+  AS_VAR_APPEND($1, ' -Wformat-truncation=2')
+  AS_VAR_APPEND($1, ' -Wimplicit-fallthrough=5')
+  AS_VAR_APPEND($1, ' -Wshift-overflow=2')
+  AS_VAR_APPEND($1, ' -Wuse-after-free=3')
+  AS_VAR_APPEND($1, ' -Wunused-const-variable=2')
+  AS_VAR_APPEND($1, ' -Wvla-larger-than=4031')
 
   # These are needed for older GCC versions.
-  if test -n "$GCC"; then
-    case `($CC --version) 2>/dev/null` in
+  if test -n "$GCC" && gl_gcc_version=`($CC --version) 2>/dev/null`; then
+    case $gl_gcc_version in
       'gcc (GCC) '0-3.* | \
       'gcc (GCC) '4.0-7.*)
-        gl_AS_VAR_APPEND($1, ' -fdiagnostics-show-option')
-        gl_AS_VAR_APPEND($1, ' -funit-at-a-time')
+        AS_VAR_APPEND($1, ' -fdiagnostics-show-option')
+        AS_VAR_APPEND($1, ' -funit-at-a-time')
+          ;;
+    esac
+    case $gl_gcc_version in
+      'gcc (GCC) '0-9.*)
+        AS_VAR_APPEND($1, ' -fno-common')
           ;;
     esac
   fi
 
   # Disable specific options as needed.
   if test "$gl_cv_cc_nomfi_needed" = yes; then
-    gl_AS_VAR_APPEND($1, ' -Wno-missing-field-initializers')
+    AS_VAR_APPEND($1, ' -Wno-missing-field-initializers')
   fi
 
   if test "$gl_cv_cc_uninitialized_supported" = no; then
-    gl_AS_VAR_APPEND($1, ' -Wno-uninitialized')
+    AS_VAR_APPEND($1, ' -Wno-uninitialized')
   fi
 
   # This warning have too many false alarms in GCC 11.2.1.
   # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101713
-  gl_AS_VAR_APPEND($1, ' -Wno-analyzer-malloc-leak')
+  AS_VAR_APPEND($1, ' -Wno-analyzer-malloc-leak')
 
   AC_LANG_POP(C)
 )

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/mode_t.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/mode_t.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/msvc-inval.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/msvc-inval.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/msvc-nothrow.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/msvc-nothrow.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/multiarch.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/multiarch.m4 Changed

_service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/musl.m4 Added

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/nocrash.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/nocrash.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/off_t.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/off_t.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/open-cloexec.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/open-cloexec.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/open-slash.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/open-slash.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/open.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/open.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/pathmax.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/pathmax.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/rawmemchr.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/rawmemchr.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/ssize_t.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/ssize_t.m4 Changed

@@ -1,23 +1,37 @@
-# ssize_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2001-2003, 2006, 2010-2022 Free Software Foundation, Inc.
+# ssize_t.m4 serial 6
+dnl Copyright (C) 2001-2003, 2006, 2010-2024 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 Bruno Haible.
-dnl Test whether ssize_t is defined.
+dnl Define ssize_t if it does not already exist.
 
 AC_DEFUN(gt_TYPE_SSIZE_T,
 
-  AC_CACHE_CHECK(for ssize_t, gt_cv_ssize_t,
+  AC_CACHE_CHECK(for ssize_t, gl_cv_ssize_t,
     AC_COMPILE_IFELSE(
        AC_LANG_PROGRAM(
           #include <sys/types.h>,
           int x = sizeof (ssize_t *) + sizeof (ssize_t);
             return !x;),
-       gt_cv_ssize_t=yes, gt_cv_ssize_t=no))
-  if test $gt_cv_ssize_t = no; then
-    AC_DEFINE(ssize_t, int,
-              Define as a signed type of the same size as size_t.)
+       gl_cv_ssize_t=yes, gl_cv_ssize_t=no))
+  if test $gl_cv_ssize_t = no; then
+    dnl On 64-bit native Windows, ssize_t needs to be defined as 'long long',
+    dnl for consistency with the 64-bit size_t.
+    AC_CACHE_CHECK(whether size_t is wider than 'long', gl_cv_size_t_large,
+      AC_COMPILE_IFELSE(
+         AC_LANG_PROGRAM(
+            #include <sys/types.h>
+              typedef int array 2 * (sizeof (size_t) > sizeof (long)) - 1;
+            ),
+         gl_cv_size_t_large=yes, gl_cv_size_t_large=no))
+    if test $gl_cv_size_t_large = yes; then
+      gl_def_ssize_t='long long'
+    else
+      gl_def_ssize_t='long'
+    fi
+    AC_DEFINE_UNQUOTED(ssize_t, $gl_def_ssize_t,
+                       Define as a signed type of the same size as size_t.)
   fi
 )

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/stat-time.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/stat-time.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/stat.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/stat.m4 Changed

@@ -1,6 +1,6 @@
-# serial 18
+# serial 21
 
-# Copyright (C) 2009-2022 Free Software Foundation, Inc.
+# Copyright (C) 2009-2024 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -12,7 +12,7 @@
   AC_REQUIRE(gl_SYS_STAT_H_DEFAULTS)
   AC_CHECK_FUNCS_ONCE(lstat)
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
       dnl On this platform, the original stat() returns st_atime, st_mtime,
       dnl st_ctime values that are affected by the time zone.
       REPLACE_STAT=1
@@ -45,6 +45,8 @@
            case "$host_os" in
                                # Guess yes on Linux systems.
               linux-* | linux) gl_cv_func_stat_file_slash="guessing yes" ;;
+                               # Guess yes on systems that emulate the Linux system calls.
+              midipix*)        gl_cv_func_stat_file_slash="guessing yes" ;;
                                # Guess yes on glibc systems.
               *-gnu* | gnu*)   gl_cv_func_stat_file_slash="guessing yes" ;;
                                # If we don't know, obey --enable-cross-guesses.
@@ -59,8 +61,8 @@
             help when passed a file name with a trailing slash);;
       esac
       case $host_os in
-        dnl Solaris stat can return a negative tv_nsec.
-        solaris*)
+        dnl macOS and Solaris stat can return a negative tv_nsec.
+        darwin* | solaris*)
           REPLACE_FSTAT=1 ;;
       esac
       ;;
@@ -78,7 +80,7 @@
 AC_DEFUN(gl_PREREQ_STAT_W32, 
   AC_REQUIRE(AC_CANONICAL_HOST)
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
       AC_CHECK_HEADERS(sdkddkver.h)
       ;;
   esac

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/stdarg.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/stdarg.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/stddef_h.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/stddef_h.m4 Changed

@@ -1,5 +1,5 @@
-# stddef_h.m4 serial 12
-dnl Copyright (C) 2009-2022 Free Software Foundation, Inc.
+# stddef_h.m4 serial 14
+dnl Copyright (C) 2009-2024 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.
@@ -22,7 +22,14 @@
     gl_cv_type_max_align_t,
     AC_COMPILE_IFELSE(
        AC_LANG_PROGRAM(
-          #include <stddef.h>
+          /* On FreeBSD 12.0/x86, max_align_t defined by <stddef.h> has
+               the correct alignment with the default (wrong) definition of
+               _Alignof, but a wrong alignment as soon as we activate an
+               ISO C compliant _Alignof definition.  */
+            #if ((defined __GNUC__ && 4 <= __GNUC__) || defined __clang__) && !defined __cplusplus
+             #define _Alignof(type) __builtin_offsetof (struct { char __a; type __b; }, __b)
+            #endif
+            #include <stddef.h>
             unsigned int s = sizeof (max_align_t);
             #if defined __GNUC__ || defined __clang__ || defined __IBM__ALIGNOF__
             int check12 * (__alignof__ (double) <= __alignof__ (max_align_t)) - 1;
@@ -61,6 +68,21 @@
     GL_GENERATE_STDDEF_H=true
   fi
 
+  AC_CACHE_CHECK(for unreachable,
+    gl_cv_func_unreachable,
+    AC_LINK_IFELSE(
+       AC_LANG_PROGRAM(
+          #include <stddef.h>
+          ,
+          unreachable ();
+          ),
+       gl_cv_func_unreachable=yes,
+       gl_cv_func_unreachable=no)
+    )
+  if test $gl_cv_func_unreachable = no; then
+    GL_GENERATE_STDDEF_H=true
+  fi
+
   if $GL_GENERATE_STDDEF_H; then
     gl_NEXT_HEADERS(stddef.h)
   fi

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/stdint.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/stdint.m4 Changed

@@ -1,5 +1,5 @@
-# stdint.m4 serial 61
-dnl Copyright (C) 2001-2022 Free Software Foundation, Inc.
+# stdint.m4 serial 63
+dnl Copyright (C) 2001-2024 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.
@@ -150,7 +150,10 @@
 uintmax_t j = UINTMAX_MAX;
 
 /* Check that SIZE_MAX has the correct type, if possible.  */
-#if 201112 <= __STDC_VERSION__
+/* ISO C 11 mandates _Generic, but GCC versions < 4.9 lack it.  */
+#if 201112 <= __STDC_VERSION__ \
+    && (!defined __GNUC__ || 4 < __GNUC__ + (9 <= __GNUC_MINOR__) \
+        || defined __clang__)
 int k = _Generic (SIZE_MAX, size_t: 0);
 #elif (2 <= __GNUC__ || 4 <= __clang_major__ || defined __IBM__TYPEOF__ \
        || (0x5110 <= __SUNPRO_C && !__STDC__))
@@ -283,10 +286,10 @@
               gl_cv_header_working_stdint_h=yes,
               ,
               case "$host_os" in
-                         # Guess yes on native Windows.
-                 mingw*) gl_cv_header_working_stdint_h="guessing yes" ;;
-                         # In general, assume it works.
-                 *)      gl_cv_header_working_stdint_h="guessing yes" ;;
+                                    # Guess yes on native Windows.
+                 mingw* | windows*) gl_cv_header_working_stdint_h="guessing yes" ;;
+                                    # In general, assume it works.
+                 *)                 gl_cv_header_working_stdint_h="guessing yes" ;;
                esac
               )
          )

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/stdio_h.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/stdio_h.m4 Changed

@@ -1,12 +1,22 @@
-# stdio_h.m4 serial 59
-dnl Copyright (C) 2007-2022 Free Software Foundation, Inc.
+# stdio_h.m4 serial 63
+dnl Copyright (C) 2007-2024 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_ONCE(gl_STDIO_H,
+AC_DEFUN(gl_STDIO_H_EARLY,
 
-  AC_REQUIRE(gl_STDIO_H_DEFAULTS)
+  dnl Defining __USE_MINGW_ANSI_STDIO to 1 must be done early, because
+  dnl the results of several configure tests depend on it: The tests
+  dnl   - checking whether snprintf returns a byte count as in C99...
+  dnl   - checking whether snprintf truncates the result as in C99...
+  dnl   - checking whether printf supports the 'F' directive...
+  dnl   - checking whether printf supports the grouping flag...
+  dnl   - checking whether printf supports the zero flag correctly...
+  dnl   - checking whether printf supports infinite 'double' arguments...
+  dnl   - checking whether printf supports large precisions...
+  dnl report 'yes' if __USE_MINGW_ANSI_STDIO is 1 but 'no' if
+  dnl __USE_MINGW_ANSI_STDIO is not set.
   AH_VERBATIM(MINGW_ANSI_STDIO,
 /* Use GNU style printf and scanf.  */
 #ifndef __USE_MINGW_ANSI_STDIO
@@ -14,6 +24,11 @@
 #endif
 )
   AC_DEFINE(__USE_MINGW_ANSI_STDIO)
+)
+
+AC_DEFUN_ONCE(gl_STDIO_H,
+
+  AC_REQUIRE(gl_STDIO_H_DEFAULTS)
   gl_NEXT_HEADERS(stdio.h)
 
   dnl Determine whether __USE_MINGW_ANSI_STDIO makes printf and
@@ -40,6 +55,9 @@
        attribute "__gnu_printf__" instead of "__printf__")
   fi
 
+  dnl For defining _PRINTF_NAN_LEN_MAX.
+  gl_MUSL_LIBC
+
   dnl This ifdef is an optimization, to avoid performing a configure check whose
   dnl result is not used. But it does not make the test of
   dnl GNULIB_STDIO_H_NONBLOCKING or GNULIB_NONBLOCKING redundant.
@@ -82,6 +100,16 @@
   if test $ac_cv_have_decl_fcloseall = no; then
     HAVE_DECL_FCLOSEALL=0
   fi
+
+  AC_CHECK_DECLS_ONCE(getw)
+  if test $ac_cv_have_decl_getw = no; then
+    HAVE_DECL_GETW=0
+  fi
+
+  AC_CHECK_DECLS_ONCE(putw)
+  if test $ac_cv_have_decl_putw = no; then
+    HAVE_DECL_PUTW=0
+  fi
 )
 
 # gl_STDIO_MODULE_INDICATOR(modulename)
@@ -178,7 +206,9 @@
   HAVE_DECL_FTELLO=1;            AC_SUBST(HAVE_DECL_FTELLO)
   HAVE_DECL_GETDELIM=1;          AC_SUBST(HAVE_DECL_GETDELIM)
   HAVE_DECL_GETLINE=1;           AC_SUBST(HAVE_DECL_GETLINE)
+  HAVE_DECL_GETW=1;              AC_SUBST(HAVE_DECL_GETW)
   HAVE_DECL_OBSTACK_PRINTF=1;    AC_SUBST(HAVE_DECL_OBSTACK_PRINTF)
+  HAVE_DECL_PUTW=1;              AC_SUBST(HAVE_DECL_PUTW)
   HAVE_DECL_SNPRINTF=1;          AC_SUBST(HAVE_DECL_SNPRINTF)
   HAVE_DECL_VSNPRINTF=1;         AC_SUBST(HAVE_DECL_VSNPRINTF)
   HAVE_DPRINTF=1;                AC_SUBST(HAVE_DPRINTF)

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/stdlib_h.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/stdlib_h.m4 Changed

@@ -1,5 +1,5 @@
-# stdlib_h.m4 serial 66
-dnl Copyright (C) 2007-2022 Free Software Foundation, Inc.
+# stdlib_h.m4 serial 76
+dnl Copyright (C) 2007-2024 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,15 +23,58 @@
 # include <random.h>
 #endif
     , _Exit aligned_alloc atoll canonicalize_file_name free
-    getloadavg getsubopt grantpt
-    initstate initstate_r mbtowc mkdtemp mkostemp mkostemps mkstemp mkstemps
-    posix_memalign posix_openpt ptsname ptsname_r qsort_r
+    getloadavg getprogname getsubopt grantpt
+    initstate initstate_r mbstowcs mbtowc mkdtemp mkostemp mkostemps mkstemp
+    mkstemps posix_memalign posix_openpt ptsname ptsname_r qsort_r
     random random_r reallocarray realpath rpmatch secure_getenv setenv
     setstate setstate_r srandom srandom_r
     strtod strtol strtold strtoll strtoul strtoull unlockpt unsetenv)
 
   AC_REQUIRE(AC_C_RESTRICT)
 
+  dnl Test whether MB_CUR_MAX needs to be overridden.
+  dnl On Solaris 10, in UTF-8 locales, its value is 3 but needs to be 4.
+  dnl Fortunately, we can do this because on this platform MB_LEN_MAX is 5.
+  AC_REQUIRE(AC_CANONICAL_HOST)
+  AC_REQUIRE(gt_LOCALE_FR_UTF8)
+  AC_CACHE_CHECK(whether MB_CUR_MAX is correct,
+    gl_cv_macro_MB_CUR_MAX_good,
+    
+      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.
+        solaris*) gl_cv_macro_MB_CUR_MAX_good="guessing no" ;;
+                  # Guess yes otherwise.
+        *)        gl_cv_macro_MB_CUR_MAX_good="guessing yes" ;;
+      esac
+changequote(,)dnl
+      if test $LOCALE_FR_UTF8 != none; then
+        AC_RUN_IFELSE(
+          AC_LANG_SOURCE(
+#include <locale.h>
+#include <stdlib.h>
+int main ()
+{
+  int result = 0;
+  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+    {
+      if (MB_CUR_MAX < 4)
+        result |= 1;
+    }
+  return result;
+}),
+          gl_cv_macro_MB_CUR_MAX_good=yes,
+          gl_cv_macro_MB_CUR_MAX_good=no,
+          :)
+      fi
+    )
+  case "$gl_cv_macro_MB_CUR_MAX_good" in
+    *yes) ;;
+    *) REPLACE_MB_CUR_MAX=1 ;;
+  esac
+
   AC_CHECK_DECLS_ONCE(ecvt)
   if test $ac_cv_have_decl_ecvt = no; then
     HAVE_DECL_ECVT=0
@@ -73,10 +116,12 @@
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_CANONICALIZE_FILE_NAME)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_FREE_POSIX)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_GETLOADAVG)
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_GETPROGNAME)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_GETSUBOPT)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_GRANTPT)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_MALLOC_GNU)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_MALLOC_POSIX)
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_MBSTOWCS)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_MBTOWC)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_MKDTEMP)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_MKOSTEMP)
@@ -89,6 +134,7 @@
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_PTSNAME_R)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_PUTENV)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_QSORT_R)
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_RAND)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_RANDOM)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_RANDOM_R)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_REALLOCARRAY)
@@ -130,6 +176,8 @@
   HAVE_DECL_FCVT=1;          AC_SUBST(HAVE_DECL_FCVT)
   HAVE_DECL_GCVT=1;          AC_SUBST(HAVE_DECL_GCVT)
   HAVE_DECL_GETLOADAVG=1;    AC_SUBST(HAVE_DECL_GETLOADAVG)
+  HAVE_DECL_PROGRAM_INVOCATION_NAME=1; AC_SUBST(HAVE_DECL_PROGRAM_INVOCATION_NAME)
+  HAVE_GETPROGNAME=1;        AC_SUBST(HAVE_GETPROGNAME)
   HAVE_GETSUBOPT=1;          AC_SUBST(HAVE_GETSUBOPT)
   HAVE_GRANTPT=1;            AC_SUBST(HAVE_GRANTPT)
   HAVE_INITSTATE=1;          AC_SUBST(HAVE_INITSTATE)
@@ -166,21 +214,31 @@
   HAVE_SYS_LOADAVG_H=0;      AC_SUBST(HAVE_SYS_LOADAVG_H)
   HAVE_UNLOCKPT=1;           AC_SUBST(HAVE_UNLOCKPT)
   HAVE_DECL_UNSETENV=1;      AC_SUBST(HAVE_DECL_UNSETENV)
+  REPLACE__EXIT=0;           AC_SUBST(REPLACE__EXIT)
   REPLACE_ALIGNED_ALLOC=0;   AC_SUBST(REPLACE_ALIGNED_ALLOC)
   REPLACE_CALLOC_FOR_CALLOC_GNU=0;    AC_SUBST(REPLACE_CALLOC_FOR_CALLOC_GNU)
   REPLACE_CALLOC_FOR_CALLOC_POSIX=0;  AC_SUBST(REPLACE_CALLOC_FOR_CALLOC_POSIX)
   REPLACE_CANONICALIZE_FILE_NAME=0;  AC_SUBST(REPLACE_CANONICALIZE_FILE_NAME)
   REPLACE_FREE=0;            AC_SUBST(REPLACE_FREE)
+  REPLACE_GETLOADAVG=0;      AC_SUBST(REPLACE_GETLOADAVG)
+  REPLACE_GETPROGNAME=0;     AC_SUBST(REPLACE_GETPROGNAME)
+  REPLACE_GETSUBOPT=0;       AC_SUBST(REPLACE_GETSUBOPT)
   REPLACE_INITSTATE=0;       AC_SUBST(REPLACE_INITSTATE)
   REPLACE_MALLOC_FOR_MALLOC_GNU=0;    AC_SUBST(REPLACE_MALLOC_FOR_MALLOC_GNU)
   REPLACE_MALLOC_FOR_MALLOC_POSIX=0;  AC_SUBST(REPLACE_MALLOC_FOR_MALLOC_POSIX)
+  REPLACE_MB_CUR_MAX=0;      AC_SUBST(REPLACE_MB_CUR_MAX)
+  REPLACE_MBSTOWCS=0;        AC_SUBST(REPLACE_MBSTOWCS)
   REPLACE_MBTOWC=0;          AC_SUBST(REPLACE_MBTOWC)
+  REPLACE_MKOSTEMP=0;        AC_SUBST(REPLACE_MKOSTEMP)
+  REPLACE_MKOSTEMPS=0;       AC_SUBST(REPLACE_MKOSTEMPS)
   REPLACE_MKSTEMP=0;         AC_SUBST(REPLACE_MKSTEMP)
   REPLACE_POSIX_MEMALIGN=0;  AC_SUBST(REPLACE_POSIX_MEMALIGN)
+  REPLACE_POSIX_OPENPT=0;    AC_SUBST(REPLACE_POSIX_OPENPT)
   REPLACE_PTSNAME=0;         AC_SUBST(REPLACE_PTSNAME)
   REPLACE_PTSNAME_R=0;       AC_SUBST(REPLACE_PTSNAME_R)
   REPLACE_PUTENV=0;          AC_SUBST(REPLACE_PUTENV)
   REPLACE_QSORT_R=0;         AC_SUBST(REPLACE_QSORT_R)
+  REPLACE_RAND=0;            AC_SUBST(REPLACE_RAND)
   REPLACE_RANDOM=0;          AC_SUBST(REPLACE_RANDOM)
   REPLACE_RANDOM_R=0;        AC_SUBST(REPLACE_RANDOM_R)
   REPLACE_REALLOC_FOR_REALLOC_GNU=0;    AC_SUBST(REPLACE_REALLOC_FOR_REALLOC_GNU)

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/strchrnul.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/strchrnul.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/strerror.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/strerror.m4 Changed

@@ -1,5 +1,5 @@
-# strerror.m4 serial 23
-dnl Copyright (C) 2002, 2007-2022 Free Software Foundation, Inc.
+# strerror.m4 serial 25
+dnl Copyright (C) 2002, 2007-2024 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.
@@ -24,12 +24,12 @@
         gl_cv_func_working_strerror=yes,
         gl_cv_func_working_strerror=no,
         case "$host_os" in
-                          # Guess yes on glibc systems.
-           *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;;
-                          # Guess yes on musl systems.
-           *-musl*)       gl_cv_func_working_strerror="guessing yes" ;;
-                          # If we don't know, obey --enable-cross-guesses.
-           *)             gl_cv_func_working_strerror="$gl_cross_guess_normal" ;;
+                               # Guess yes on glibc systems.
+           *-gnu* | gnu*)      gl_cv_func_working_strerror="guessing yes" ;;
+                               # Guess yes on musl systems.
+           *-musl* | midipix*) gl_cv_func_working_strerror="guessing yes" ;;
+                               # If we don't know, obey --enable-cross-guesses.
+           *)                  gl_cv_func_working_strerror="$gl_cross_guess_normal" ;;
          esac
         )
     )
@@ -80,14 +80,14 @@
       gl_cv_func_strerror_0_works=yes,
       gl_cv_func_strerror_0_works=no,
       case "$host_os" in
-                        # Guess yes on glibc systems.
-         *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;;
-                        # Guess yes on musl systems.
-         *-musl*)       gl_cv_func_strerror_0_works="guessing yes" ;;
-                        # Guess yes on native Windows.
-         mingw*)        gl_cv_func_strerror_0_works="guessing yes" ;;
-                        # If we don't know, obey --enable-cross-guesses.
-         *)             gl_cv_func_strerror_0_works="$gl_cross_guess_normal" ;;
+                             # Guess yes on glibc systems.
+         *-gnu* | gnu*)      gl_cv_func_strerror_0_works="guessing yes" ;;
+                             # Guess yes on musl systems.
+         *-musl* | midipix*) gl_cv_func_strerror_0_works="guessing yes" ;;
+                             # Guess yes on native Windows.
+         mingw* | windows*)  gl_cv_func_strerror_0_works="guessing yes" ;;
+                             # If we don't know, obey --enable-cross-guesses.
+         *)                  gl_cv_func_strerror_0_works="$gl_cross_guess_normal" ;;
        esac
       )
   )

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/string_h.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/string_h.m4 Changed

@@ -1,11 +1,11 @@
 # Configure a GNU-like replacement for <string.h>.
 
-# Copyright (C) 2007-2022 Free Software Foundation, Inc.
+# Copyright (C) 2007-2024 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.
 
-# serial 34
+# serial 39
 
 # Written by Paul Eggert.
 
@@ -21,7 +21,8 @@
   dnl guaranteed by C89.
   gl_WARN_ON_USE_PREPARE(#include <string.h>
     ,
-    ffsl ffsll memmem mempcpy memrchr rawmemchr stpcpy stpncpy strchrnul
+    explicit_bzero ffsl ffsll memmem mempcpy memrchr memset_explicit
+     rawmemchr stpcpy stpncpy strchrnul
      strdup strncat strndup strnlen strpbrk strsep strcasestr strtok_r
      strerror_r strerrorname_np sigabbrev_np sigdescr_np strsignal strverscmp)
 
@@ -54,6 +55,7 @@
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_MEMMEM)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_MEMPCPY)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_MEMRCHR)
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_MEMSET_EXPLICIT)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_RAWMEMCHR)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_STPCPY)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_STPNCPY)
@@ -107,6 +109,7 @@
   HAVE_FFSLL=1;                 AC_SUBST(HAVE_FFSLL)
   HAVE_DECL_MEMMEM=1;           AC_SUBST(HAVE_DECL_MEMMEM)
   HAVE_MEMPCPY=1;               AC_SUBST(HAVE_MEMPCPY)
+  HAVE_MEMSET_EXPLICIT=1;       AC_SUBST(HAVE_MEMSET_EXPLICIT)
   HAVE_DECL_MEMRCHR=1;          AC_SUBST(HAVE_DECL_MEMRCHR)
   HAVE_RAWMEMCHR=1;             AC_SUBST(HAVE_RAWMEMCHR)
   HAVE_STPCPY=1;                AC_SUBST(HAVE_STPCPY)
@@ -128,6 +131,9 @@
   REPLACE_FFSLL=0;              AC_SUBST(REPLACE_FFSLL)
   REPLACE_MEMCHR=0;             AC_SUBST(REPLACE_MEMCHR)
   REPLACE_MEMMEM=0;             AC_SUBST(REPLACE_MEMMEM)
+  REPLACE_MEMPCPY=0;            AC_SUBST(REPLACE_MEMPCPY)
+  REPLACE_MEMSET_EXPLICIT=0;    AC_SUBST(REPLACE_MEMSET_EXPLICIT)
+  REPLACE_STPCPY=0;             AC_SUBST(REPLACE_STPCPY)
   REPLACE_STPNCPY=0;            AC_SUBST(REPLACE_STPNCPY)
   REPLACE_STRCHRNUL=0;          AC_SUBST(REPLACE_STRCHRNUL)
   REPLACE_STRDUP=0;             AC_SUBST(REPLACE_STRDUP)
@@ -141,5 +147,6 @@
   REPLACE_STRERROR_R=0;         AC_SUBST(REPLACE_STRERROR_R)
   REPLACE_STRERRORNAME_NP=0;    AC_SUBST(REPLACE_STRERRORNAME_NP)
   REPLACE_STRSIGNAL=0;          AC_SUBST(REPLACE_STRSIGNAL)
+  REPLACE_STRVERSCMP=0;         AC_SUBST(REPLACE_STRVERSCMP)
   UNDEFINE_STRTOK_R=0;          AC_SUBST(UNDEFINE_STRTOK_R)
 )

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/strverscmp.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/strverscmp.m4 Changed

@@ -1,5 +1,5 @@
-# strverscmp.m4 serial 9
-dnl Copyright (C) 2002, 2005-2022 Free Software Foundation, Inc.
+# strverscmp.m4 serial 10
+dnl Copyright (C) 2002, 2005-2024 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,6 +13,37 @@
   AC_CHECK_FUNCS(strverscmp)
   if test $ac_cv_func_strverscmp = no; then
     HAVE_STRVERSCMP=0
+  else
+    AC_REQUIRE(AC_CANONICAL_HOST) dnl for cross-compiles
+    AC_CACHE_CHECK(whether strverscmp works,
+      gl_cv_func_strverscmp_works,
+      dnl Detect musl-1.2.3 and Cygwin 3.4.6 bug.
+       AC_RUN_IFELSE(
+         AC_LANG_SOURCE(
+#include <string.h>
+int main ()
+{
+  return strverscmp ("UNKNOWN", "2.2.0") <= 0;
+}
+         ),
+         gl_cv_func_strverscmp_works=yes,
+         gl_cv_func_strverscmp_works=no,
+         case "$host_os" in
+                                # Guess yes on glibc systems.
+            *-gnu* | gnu*)      gl_cv_func_strverscmp_works="guessing yes" ;;
+                                # Guess no on musl systems.
+            *-musl* | midipix*) gl_cv_func_strverscmp_works="guessing no" ;;
+                                # Guess no on Cygwin.
+            cygwin*)            gl_cv_func_strverscmp_works="guessing no" ;;
+                                # If we don't know, obey --enable-cross-guesses.
+            *)                  gl_cv_func_strverscmp_works="$gl_cross_guess_normal" ;;
+          esac
+         )
+      )
+    case "$gl_cv_func_strverscmp_works" in
+      *yes) ;;
+      *) REPLACE_STRVERSCMP=1 ;;
+    esac
   fi
 )

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/sys_socket_h.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/sys_socket_h.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/sys_stat_h.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/sys_stat_h.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/sys_types_h.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/sys_types_h.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/time_h.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/time_h.m4 Changed

@@ -1,8 +1,8 @@
 # Configure a more-standard replacement for <time.h>.
 
-# Copyright (C) 2000-2001, 2003-2007, 2009-2022 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2003-2007, 2009-2024 Free Software Foundation, Inc.
 
-# serial 20
+# serial 25
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -23,7 +23,10 @@
   dnl corresponding gnulib module is not in use.
   gl_WARN_ON_USE_PREPARE(
 #include <time.h>
-    , asctime_r ctime_r)
+    , 
+      asctime asctime_r ctime ctime_r gmtime_r localtime localtime_r mktime
+      nanosleep strftime strptime time timegm timespec_get timespec_getres tzset
+    )
 
   AC_REQUIRE(AC_C_RESTRICT)
 
@@ -137,6 +140,7 @@
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_NANOSLEEP)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_STRFTIME)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_STRPTIME)
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_TIME)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_TIMEGM)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_TIMESPEC_GET)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_TIMESPEC_GETRES)
@@ -161,23 +165,16 @@
   HAVE_TIMESPEC_GETRES=1;                AC_SUBST(HAVE_TIMESPEC_GETRES)
   dnl Even GNU libc does not have timezone_t yet.
   HAVE_TIMEZONE_T=0;                     AC_SUBST(HAVE_TIMEZONE_T)
-  dnl If another module says to replace or to not replace, do that.
-  dnl Otherwise, replace only if someone compiles with -DGNULIB_PORTCHECK;
-  dnl this lets maintainers check for portability.
-  REPLACE_CTIME=GNULIB_PORTCHECK;        AC_SUBST(REPLACE_CTIME)
-  REPLACE_LOCALTIME_R=GNULIB_PORTCHECK;  AC_SUBST(REPLACE_LOCALTIME_R)
-  REPLACE_MKTIME=GNULIB_PORTCHECK;       AC_SUBST(REPLACE_MKTIME)
-  REPLACE_NANOSLEEP=GNULIB_PORTCHECK;    AC_SUBST(REPLACE_NANOSLEEP)
-  REPLACE_STRFTIME=GNULIB_PORTCHECK;     AC_SUBST(REPLACE_STRFTIME)
-  REPLACE_TIMEGM=GNULIB_PORTCHECK;       AC_SUBST(REPLACE_TIMEGM)
-  REPLACE_TZSET=GNULIB_PORTCHECK;        AC_SUBST(REPLACE_TZSET)
-
-  dnl Hack so that the time module doesn't depend on the sys_time module.
-  dnl First, default GNULIB_GETTIMEOFDAY to 0 if sys_time is absent.
-  : ${GNULIB_GETTIMEOFDAY=0};            AC_SUBST(GNULIB_GETTIMEOFDAY)
-  dnl Second, it's OK to not use GNULIB_PORTCHECK for REPLACE_GMTIME
-  dnl and REPLACE_LOCALTIME, as portability to Solaris 2.6 and earlier
-  dnl is no longer a big deal.
+  REPLACE_CTIME=0;                       AC_SUBST(REPLACE_CTIME)
   REPLACE_GMTIME=0;                      AC_SUBST(REPLACE_GMTIME)
   REPLACE_LOCALTIME=0;                   AC_SUBST(REPLACE_LOCALTIME)
+  REPLACE_LOCALTIME_R=0;                 AC_SUBST(REPLACE_LOCALTIME_R)
+  REPLACE_MKTIME=0;                      AC_SUBST(REPLACE_MKTIME)
+  REPLACE_NANOSLEEP=0;                   AC_SUBST(REPLACE_NANOSLEEP)
+  REPLACE_STRFTIME=0;                    AC_SUBST(REPLACE_STRFTIME)
+  REPLACE_TIME=0;                        AC_SUBST(REPLACE_TIME)
+  REPLACE_TIMEGM=0;                      AC_SUBST(REPLACE_TIMEGM)
+  REPLACE_TIMESPEC_GET=0;                AC_SUBST(REPLACE_TIMESPEC_GET)
+  REPLACE_TIMESPEC_GETRES=0;             AC_SUBST(REPLACE_TIMESPEC_GETRES)
+  REPLACE_TZSET=0;                       AC_SUBST(REPLACE_TZSET)
 )

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/unistd_h.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/unistd_h.m4 Changed

@@ -1,5 +1,5 @@
-# unistd_h.m4 serial 90
-dnl Copyright (C) 2006-2022 Free Software Foundation, Inc.
+# unistd_h.m4 serial 95
+dnl Copyright (C) 2006-2024 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.
@@ -225,6 +225,7 @@
   REPLACE_COPY_FILE_RANGE=0;         AC_SUBST(REPLACE_COPY_FILE_RANGE)
   REPLACE_DUP=0;                     AC_SUBST(REPLACE_DUP)
   REPLACE_DUP2=0;                    AC_SUBST(REPLACE_DUP2)
+  REPLACE_DUP3=0;                    AC_SUBST(REPLACE_DUP3)
   REPLACE_EXECL=0;                   AC_SUBST(REPLACE_EXECL)
   REPLACE_EXECLE=0;                  AC_SUBST(REPLACE_EXECLE)
   REPLACE_EXECLP=0;                  AC_SUBST(REPLACE_EXECLP)
@@ -233,11 +234,14 @@
   REPLACE_EXECVP=0;                  AC_SUBST(REPLACE_EXECVP)
   REPLACE_EXECVPE=0;                 AC_SUBST(REPLACE_EXECVPE)
   REPLACE_FACCESSAT=0;               AC_SUBST(REPLACE_FACCESSAT)
+  REPLACE_FCHDIR=0;                  AC_SUBST(REPLACE_FCHDIR)
   REPLACE_FCHOWNAT=0;                AC_SUBST(REPLACE_FCHOWNAT)
+  REPLACE_FDATASYNC=0;               AC_SUBST(REPLACE_FDATASYNC)
   REPLACE_FTRUNCATE=0;               AC_SUBST(REPLACE_FTRUNCATE)
   REPLACE_GETCWD=0;                  AC_SUBST(REPLACE_GETCWD)
   REPLACE_GETDOMAINNAME=0;           AC_SUBST(REPLACE_GETDOMAINNAME)
   REPLACE_GETDTABLESIZE=0;           AC_SUBST(REPLACE_GETDTABLESIZE)
+  REPLACE_GETENTROPY=0;              AC_SUBST(REPLACE_GETENTROPY)
   REPLACE_GETLOGIN_R=0;              AC_SUBST(REPLACE_GETLOGIN_R)
   REPLACE_GETGROUPS=0;               AC_SUBST(REPLACE_GETGROUPS)
   REPLACE_GETPAGESIZE=0;             AC_SUBST(REPLACE_GETPAGESIZE)
@@ -248,12 +252,14 @@
   REPLACE_LINK=0;                    AC_SUBST(REPLACE_LINK)
   REPLACE_LINKAT=0;                  AC_SUBST(REPLACE_LINKAT)
   REPLACE_LSEEK=0;                   AC_SUBST(REPLACE_LSEEK)
+  REPLACE_PIPE2=0;                   AC_SUBST(REPLACE_PIPE2)
   REPLACE_PREAD=0;                   AC_SUBST(REPLACE_PREAD)
   REPLACE_PWRITE=0;                  AC_SUBST(REPLACE_PWRITE)
   REPLACE_READ=0;                    AC_SUBST(REPLACE_READ)
   REPLACE_READLINK=0;                AC_SUBST(REPLACE_READLINK)
   REPLACE_READLINKAT=0;              AC_SUBST(REPLACE_READLINKAT)
   REPLACE_RMDIR=0;                   AC_SUBST(REPLACE_RMDIR)
+  REPLACE_SETHOSTNAME=0;             AC_SUBST(REPLACE_SETHOSTNAME)
   REPLACE_SLEEP=0;                   AC_SUBST(REPLACE_SLEEP)
   REPLACE_SYMLINK=0;                 AC_SUBST(REPLACE_SYMLINK)
   REPLACE_SYMLINKAT=0;               AC_SUBST(REPLACE_SYMLINKAT)

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/valgrind-tests.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/valgrind-tests.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/version-etc.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/version-etc.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/visibility.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/visibility.m4 Changed

@@ -1,5 +1,5 @@
-# visibility.m4 serial 8
-dnl Copyright (C) 2005, 2008, 2010-2022 Free Software Foundation, Inc.
+# visibility.m4 serial 9
+dnl Copyright (C) 2005, 2008, 2010-2024 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.
@@ -31,18 +31,18 @@
     dnl user has put into $CC $CFLAGS $CPPFLAGS.
     AC_CACHE_CHECK(whether the -Werror option is usable,
       gl_cv_cc_vis_werror,
-      gl_save_CFLAGS="$CFLAGS"
+      gl_saved_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -Werror"
        AC_COMPILE_IFELSE(
          AC_LANG_PROGRAM(, ),
          gl_cv_cc_vis_werror=yes,
          gl_cv_cc_vis_werror=no)
-       CFLAGS="$gl_save_CFLAGS"
+       CFLAGS="$gl_saved_CFLAGS"
       )
     dnl Now check whether visibility declarations are supported.
     AC_CACHE_CHECK(for simple visibility declarations,
       gl_cv_cc_visibility,
-      gl_save_CFLAGS="$CFLAGS"
+      gl_saved_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -fvisibility=hidden"
        dnl We use the option -Werror and a function dummyfunc, because on some
        dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning
@@ -68,7 +68,7 @@
             ),
          gl_cv_cc_visibility=yes,
          gl_cv_cc_visibility=no)
-       CFLAGS="$gl_save_CFLAGS"
+       CFLAGS="$gl_saved_CFLAGS"
       )
     if test $gl_cv_cc_visibility = yes; then
       CFLAG_VISIBILITY="-fvisibility=hidden"

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/warn-on-use.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/warn-on-use.m4 Changed

@@ -1,5 +1,5 @@
-# warn-on-use.m4 serial 10
-dnl Copyright (C) 2010-2022 Free Software Foundation, Inc.
+# warn-on-use.m4 serial 11
+dnl Copyright (C) 2010-2024 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.
@@ -36,7 +36,7 @@
        dnl clang (e.g. strndup), reference ac_compile_for_check_decl instead
        dnl of ac_compile.  If, for whatever reason, the override of AC_PROG_CC
        dnl in zzgnulib.m4 is inactive, use the original ac_compile.
-       ac_save_ac_compile="$ac_compile"
+       ac_saved_ac_compile="$ac_compile"
        if test -n "$ac_compile_for_check_decl"; then
          ac_compile="$ac_compile_for_check_decl"
        fi
@@ -46,7 +46,7 @@
 #undef $gl_func
   (void) $gl_func;),
            AS_VAR_SET(gl_Symbol, yes), AS_VAR_SET(gl_Symbol, no)))
-       ac_compile="$ac_save_ac_compile"
+       ac_compile="$ac_saved_ac_compile"
        AS_VAR_IF(gl_Symbol, yes,
          AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_RAW_DECL_$gl_func), 1)
           dnl Shortcut for an AC_CHECK_DECL invocation that may come later:

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/warnings.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/warnings.m4 Changed

@@ -1,19 +1,12 @@
-# warnings.m4 serial 16
-dnl Copyright (C) 2008-2022 Free Software Foundation, Inc.
+# warnings.m4 serial 20
+dnl Copyright (C) 2008-2024 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 Simon Josefsson
 
-# gl_AS_VAR_APPEND(VAR, VALUE)
-# ----------------------------
-# Provide the functionality of AS_VAR_APPEND if Autoconf does not have it.
-m4_ifdef(AS_VAR_APPEND,
-m4_copy(AS_VAR_APPEND, gl_AS_VAR_APPEND),
-m4_define(gl_AS_VAR_APPEND,
-AS_VAR_SET($1, AS_VAR_GET($1)$2)))
-
+AC_PREREQ(2.64)
 
 # gl_COMPILER_OPTION_IF(OPTION, IF-SUPPORTED, IF-NOT-SUPPORTED,
 #                       PROGRAM = AC_LANG_PROGRAM())
@@ -33,13 +26,13 @@
 esac
 m4_pushdef(gl_Positive, $gl_positive))dnl
 AC_CACHE_CHECK(whether _AC_LANG compiler handles $1, gl_Warn, 
-  gl_save_compiler_FLAGS="$gl_Flags"
-  gl_AS_VAR_APPEND(m4_defn(gl_Flags),
+  gl_saved_compiler_FLAGS="$gl_Flags"
+  AS_VAR_APPEND(m4_defn(gl_Flags),
     " $gl_unknown_warnings_are_errors m4_defn(gl_Positive)")
   AC_LINK_IFELSE(m4_default($4, AC_LANG_PROGRAM()),
                  AS_VAR_SET(gl_Warn, yes),
                  AS_VAR_SET(gl_Warn, no))
-  gl_Flags="$gl_save_compiler_FLAGS"
+  gl_Flags="$gl_saved_compiler_FLAGS"
 )
 AS_VAR_IF(gl_Warn, yes, $2, $3)
 m4_popdef(gl_Positive)dnl
@@ -88,16 +81,18 @@
 # gl_WARN_ADD(OPTION, VARIABLE = WARN_CFLAGS/WARN_CXXFLAGS,
 #             PROGRAM = AC_LANG_PROGRAM())
 # -----------------------------------------------------------
-# Adds parameter to WARN_CFLAGS/WARN_CXXFLAGS if the compiler supports it
-# when compiling PROGRAM.  For example, gl_WARN_ADD(-Wparentheses).
+# Adds OPTION to VARIABLE (which defaults to WARN_CFLAGS or WARN_CXXFLAGS)
+# if the compiler supports it when compiling PROGRAM.
 #
 # If VARIABLE is a variable name, AC_SUBST it.
 #
 # The effects of this macro depend on the current language (_AC_LANG).
+#
+# Example: gl_WARN_ADD(-Wparentheses).
 AC_DEFUN(gl_WARN_ADD,
 AC_REQUIRE(gl_UNKNOWN_WARNINGS_ARE_ERRORS(_AC_LANG))
 gl_COMPILER_OPTION_IF($1,
-  gl_AS_VAR_APPEND(m4_if($2, , WARN__AC_LANG_PREFIXFLAGS, $2), " $1"),
+  AS_VAR_APPEND(m4_if($2, , WARN__AC_LANG_PREFIXFLAGS, $2), " $1"),
   ,
   $3)
 m4_ifval($2,
@@ -105,6 +100,77 @@
          AC_SUBST(WARN__AC_LANG_PREFIXFLAGS))dnl
 )
 
+
+# gl_CC_INHIBIT_WARNINGS
+# sets and substitutes a variable GL_CFLAG_INHIBIT_WARNINGS, to a $(CC) option
+# that reverts all preceding -W* options, if available.
+# This is expected to be '-w' at least on gcc, clang, AIX xlc, xlclang, Sun cc,
+# "compile cl" (MSVC), "compile clang-cl" (MSVC-compatible clang). Or it can be
+# empty.
+AC_DEFUN(gl_CC_INHIBIT_WARNINGS,
+
+  AC_REQUIRE(AC_PROG_CC)
+  AC_CACHE_CHECK(for C compiler option to inhibit all warnings,
+    gl_cv_cc_winhibit,
+    rm -f conftest*
+     echo 'int dummy;' > conftest.c
+     AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c 2>conftest1.err) >/dev/null
+     AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS -w -c conftest.c 2>conftest2.err) >/dev/null
+     if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then
+       gl_cv_cc_winhibit='-w'
+     else
+       gl_cv_cc_winhibit=none
+     fi
+     rm -f conftest*
+    )
+  case "$gl_cv_cc_winhibit" in
+    none) GL_CFLAG_INHIBIT_WARNINGS='' ;;
+    *)
+      GL_CFLAG_INHIBIT_WARNINGS="$gl_cv_cc_winhibit"
+      dnl If all warnings are inhibited, there's no point in having the GCC
+      dnl analyzer enabled. This saves RAM requirements and CPU consumption.
+      gl_WARN_ADD(-fno-analyzer, GL_CFLAG_INHIBIT_WARNINGS)
+      ;;
+  esac
+  AC_SUBST(GL_CFLAG_INHIBIT_WARNINGS)
+)
+
+# gl_CXX_INHIBIT_WARNINGS
+# sets and substitutes a variable GL_CXXFLAG_INHIBIT_WARNINGS, to a $(CC) option
+# that reverts all preceding -W* options, if available.
+AC_DEFUN(gl_CXX_INHIBIT_WARNINGS,
+
+  dnl Requires AC_PROG_CXX or gl_PROG_ANSI_CXX.
+  if test -n "$CXX" && test "$CXX" != no; then
+    AC_CACHE_CHECK(for C++ compiler option to inhibit all warnings,
+      gl_cv_cxx_winhibit,
+      rm -f conftest*
+       echo 'int dummy;' > conftest.cc
+       AC_TRY_COMMAND(${CXX-c++} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>conftest1.err) >/dev/null
+       AC_TRY_COMMAND(${CXX-c++} $CXXFLAGS $CPPFLAGS -w -c conftest.cc 2>conftest2.err) >/dev/null
+       if test $? = 0 && test `wc -l < conftest1.err` = `wc -l < conftest2.err`; then
+         gl_cv_cxx_winhibit='-w'
+       else
+         gl_cv_cxx_winhibit=none
+       fi
+       rm -f conftest*
+      )
+    case "$gl_cv_cxx_winhibit" in
+      none) GL_CXXFLAG_INHIBIT_WARNINGS='' ;;
+      *)
+        GL_CXXFLAG_INHIBIT_WARNINGS="$gl_cv_cxx_winhibit"
+        dnl If all warnings are inhibited, there's no point in having the GCC
+        dnl analyzer enabled. This saves RAM requirements and CPU consumption.
+        gl_WARN_ADD(-fno-analyzer, GL_CXXFLAG_INHIBIT_WARNINGS)
+        ;;
+    esac
+  else
+    GL_CXXFLAG_INHIBIT_WARNINGS=''
+  fi
+  AC_SUBST(GL_CXXFLAG_INHIBIT_WARNINGS)
+)
+
+
 # Local Variables:
 # mode: autoconf
 # End:

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/wchar_t.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/wchar_t.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/wint_t.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/wint_t.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/m4/zzgnulib.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/m4/zzgnulib.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/malloca.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/malloca.c Changed

@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003, 2006-2007, 2009-2022 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2009-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003, 2018.
 
    This file is free software: you can redistribute it and/or modify
@@ -22,6 +22,9 @@
 #include "malloca.h"
 
 #include <stdckdint.h>
+#if defined __CHERI_PURE_CAPABILITY__
+# include <cheri.h>
+#endif
 
 #include "idx.h"
 
@@ -36,10 +39,15 @@
        allocation.
      - NULL comes from a failed heap allocation.  */
 
+#if defined __CHERI_PURE_CAPABILITY__
+/* Type for holding the original malloc() result.  */
+typedef uintptr_t small_t;
+#else
 /* Type for holding very small pointer differences.  */
 typedef unsigned char small_t;
 /* Verify that it is wide enough.  */
 static_assert (2 * sa_alignment_max - 1 <= (small_t) -1);
+#endif
 
 void *
 mmalloca (size_t n)
@@ -56,20 +64,28 @@
 
       if (mem != NULL)
         {
-          uintptr_t umem = (uintptr_t)mem, umemplus;
+          uintptr_t umem = (uintptr_t) mem;
           /* The ckd_add avoids signed integer overflow on
              theoretical platforms where UINTPTR_MAX <= INT_MAX.  */
+          uintptr_t umemplus;
           ckd_add (&umemplus, umem, sizeof (small_t) + sa_alignment_max - 1);
-          idx_t offset = ((umemplus & ~alignment2_mask)
+          idx_t offset = (umemplus - umemplus % (2 * sa_alignment_max)
                           + sa_alignment_max - umem);
-          void *vp = mem + offset;
-          small_t *p = vp;
+          void *p = mem + offset;
           /* Here p >= mem + sizeof (small_t),
              and p <= mem + sizeof (small_t) + 2 * sa_alignment_max - 1
              hence p + n <= mem + nplus.
              So, the memory range p, p+n) lies in the allocated memory range
              mem, mem + nplus).  */
-          p-1 = offset;
+          small_t *sp = p;
+# if defined __CHERI_PURE_CAPABILITY__
+          sp-1 = umem;
+          p = (char *) cheri_bounds_set ((char *) p - sizeof (small_t),
+                                         sizeof (small_t) + n)
+              + sizeof (small_t);
+# else
+          sp-1 = offset;
+# endif
           /* p ≡ sa_alignment_max mod 2*sa_alignment_max.  */
           return p;
         }
@@ -90,15 +106,22 @@
 freea (void *p)
 {
   /* Check argument.  */
-  if ((uintptr_t) p & (sa_alignment_max - 1))
+  uintptr_t u = (uintptr_t) p;
+  if (u & (sa_alignment_max - 1))
     {
       /* p was not the result of a malloca() call.  Invalid argument.  */
       abort ();
     }
   /* Determine whether p was a non-NULL pointer returned by mmalloca().  */
-  if ((uintptr_t) p & sa_alignment_max)
+  if (u & sa_alignment_max)
     {
-      void *mem = (char *) p - ((small_t *) p)-1;
+      char *cp = p;
+      small_t *sp = p;
+# if defined __CHERI_PURE_CAPABILITY__
+      void *mem = sp-1;
+# else
+      void *mem = cp - sp-1;
+# endif
       free (mem);
     }
 }

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/malloca.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/malloca.h Changed

@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003-2007, 2009-2022 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007, 2009-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This file is free software: you can redistribute it and/or modify
@@ -18,10 +18,19 @@
 #ifndef _MALLOCA_H
 #define _MALLOCA_H
 
+/* This file uses _GL_ATTRIBUTE_ALLOC_SIZE, _GL_ATTRIBUTE_DEALLOC,
+   _GL_ATTRIBUTE_MALLOC, HAVE_ALLOCA.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 #include <alloca.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdint.h>
+#if defined __CHERI_PURE_CAPABILITY__
+# include <cheri.h>
+#endif
 
 #include "xalloc-oversized.h"
 
@@ -62,12 +71,24 @@
    memory allocated on the stack, that must be freed using freea() before
    the function returns.  Upon failure, it returns NULL.  */
 #if HAVE_ALLOCA
-# define malloca(N) \
-  ((N) < 4032 - (2 * sa_alignment_max - 1)                                   \
-   ? (void *) (((uintptr_t) (char *) alloca ((N) + 2 * sa_alignment_max - 1) \
-                + (2 * sa_alignment_max - 1))                                \
-               & ~(uintptr_t)(2 * sa_alignment_max - 1))                     \
-   : mmalloca (N))
+# if defined __CHERI_PURE_CAPABILITY__
+#  define malloca(N) \
+    ((N) < 4032 - (2 * sa_alignment_max - 1)                                  \
+     ? cheri_bounds_set ((void *) (((uintptr_t)                               \
+                                     (char *)                                 \
+                                      alloca ((N) + 2 * sa_alignment_max - 1) \
+                                    + (2 * sa_alignment_max - 1))             \
+                                   & ~(uintptr_t)(2 * sa_alignment_max - 1)), \
+                         (N))                                                 \
+     : mmalloca (N))
+# else
+#  define malloca(N) \
+    ((N) < 4032 - (2 * sa_alignment_max - 1)                                   \
+     ? (void *) (((uintptr_t) (char *) alloca ((N) + 2 * sa_alignment_max - 1) \
+                  + (2 * sa_alignment_max - 1))                                \
+                 & ~(uintptr_t)(2 * sa_alignment_max - 1))                     \
+     : mmalloca (N))
+# endif
 #else
 # define malloca(N) \
   mmalloca (N)

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/msvc-inval.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/msvc-inval.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/msvc-inval.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/msvc-inval.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/msvc-nothrow.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/msvc-nothrow.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/msvc-nothrow.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/msvc-nothrow.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/open.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/open.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/pathmax.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/pathmax.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/progname.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/progname.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/progname.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/progname.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/rawmemchr.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/rawmemchr.c Changed

@@ -1,5 +1,5 @@
 /* Searching in a string.
-   Copyright (C) 2008-2022 Free Software Foundation, Inc.
+   Copyright (C) 2008-2024 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -19,7 +19,7 @@
 /* Specification.  */
 #include <string.h>
 
-/* A function definition is only needed if HAVE_RAWMEMCHR is not defined.  */
+/* A function definition is needed only if HAVE_RAWMEMCHR is not defined.  */
 #if !HAVE_RAWMEMCHR
 
 # include <limits.h>
@@ -30,19 +30,30 @@
 void *
 rawmemchr (const void *s, int c_in)
 {
-  /* Change this typedef to experiment with performance.  */
+# ifdef __CHERI_PURE_CAPABILITY__
+  /* Most architectures let you read an aligned word,
+     even if the unsigned char array at S ends in the middle of the word.
+     However CHERI does not, so call memchr
+     with the underlying object's remaining length.
+     This cannot return NULL if S points to a C_IN-terminated array.
+     Use builtins rather than including <cheri.h> which is less stable.  */
+  return memchr (s, c_in, (__builtin_cheri_length_get (s)
+                           - __builtin_cheri_offset_get (s)));
+# else
+
+  /* You can change this typedef to experiment with performance.  */
   typedef uintptr_t longword;
-  /* If you change the "uintptr_t", you should change UINTPTR_WIDTH to match.
-     This verifies that the type does not have padding bits.  */
-  static_assert (UINTPTR_WIDTH == UCHAR_WIDTH * sizeof (longword));
+  /* Verify that the longword type lacks padding bits.  */
+  static_assert (UINTPTR_WIDTH == UCHAR_WIDTH * sizeof (uintptr_t));
 
   const unsigned char *char_ptr;
   unsigned char c = c_in;
 
   /* Handle the first few bytes by reading one byte at a time.
-     Do this until CHAR_PTR is aligned on a longword boundary.  */
+     Do this until CHAR_PTR is aligned on a natural longword boundary,
+     as using alignof (longword) might be slower.  */
   for (char_ptr = (const unsigned char *) s;
-       (uintptr_t) char_ptr % alignof (longword) != 0;
+       (uintptr_t) char_ptr % sizeof (longword) != 0;
        ++char_ptr)
     if (*char_ptr == c)
       return (void *) char_ptr;
@@ -118,6 +129,7 @@
   while (*char_ptr != c)
     char_ptr++;
   return (void *) char_ptr;
+# endif
 }
 
 #endif

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/rawmemchr.valgrind -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/rawmemchr.valgrind Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/stat-time.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/stat-time.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/stat-time.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/stat-time.h Changed

@@ -1,6 +1,6 @@
 /* stat-related time functions.
 
-   Copyright (C) 2005, 2007, 2009-2022 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009-2024 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -20,15 +20,18 @@
 #ifndef STAT_TIME_H
 #define STAT_TIME_H 1
 
+/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, _GL_UNUSED,
+   _GL_ATTRIBUTE_PURE, HAVE_STRUCT_STAT_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 #include <errno.h>
 #include <stdckdint.h>
 #include <stddef.h>
 #include <sys/stat.h>
 #include <time.h>
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef _GL_STAT_TIME_INLINE
 # define _GL_STAT_TIME_INLINE _GL_INLINE
@@ -49,11 +52,13 @@
 #if _GL_WINDOWS_STAT_TIMESPEC || defined HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC
 # if _GL_WINDOWS_STAT_TIMESPEC || defined TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC
 #  define STAT_TIMESPEC(st, st_xtim) ((st)->st_xtim)
+#  define STAT_TIMESPEC_OFFSETOF(st_xtim) offsetof (struct stat, st_xtim)
 # else
 #  define STAT_TIMESPEC_NS(st, st_xtim) ((st)->st_xtim.tv_nsec)
 # endif
 #elif defined HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC
 # define STAT_TIMESPEC(st, st_xtim) ((st)->st_xtim##espec)
+# define STAT_TIMESPEC_OFFSETOF(st_xtim) offsetof (struct stat, st_xtim##espec)
 #elif defined HAVE_STRUCT_STAT_ST_ATIMENSEC
 # define STAT_TIMESPEC_NS(st, st_xtim) ((st)->st_xtim##ensec)
 #elif defined HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC
@@ -119,10 +124,8 @@
 #ifdef STAT_TIMESPEC
   return STAT_TIMESPEC (st, st_atim);
 #else
-  struct timespec t;
-  t.tv_sec = st->st_atime;
-  t.tv_nsec = get_stat_atime_ns (st);
-  return t;
+  return (struct timespec) { .tv_sec = st->st_atime,
+                             .tv_nsec = get_stat_atime_ns (st) };
 #endif
 }
 
@@ -133,10 +136,8 @@
 #ifdef STAT_TIMESPEC
   return STAT_TIMESPEC (st, st_ctim);
 #else
-  struct timespec t;
-  t.tv_sec = st->st_ctime;
-  t.tv_nsec = get_stat_ctime_ns (st);
-  return t;
+  return (struct timespec) { .tv_sec = st->st_ctime,
+                             .tv_nsec = get_stat_ctime_ns (st) };
 #endif
 }
 
@@ -147,10 +148,8 @@
 #ifdef STAT_TIMESPEC
   return STAT_TIMESPEC (st, st_mtim);
 #else
-  struct timespec t;
-  t.tv_sec = st->st_mtime;
-  t.tv_nsec = get_stat_mtime_ns (st);
-  return t;
+  return (struct timespec) { .tv_sec = st->st_mtime,
+                             .tv_nsec = get_stat_mtime_ns (st) };
 #endif
 }
 
@@ -165,8 +164,8 @@
      || defined HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC)
   t = STAT_TIMESPEC (st, st_birthtim);
 #elif defined HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC
-  t.tv_sec = st->st_birthtime;
-  t.tv_nsec = st->st_birthtimensec;
+  t = (struct timespec) { .tv_sec = st->st_birthtime,
+                          .tv_nsec = st->st_birthtimensec };
 #elif defined _WIN32 && ! defined __CYGWIN__
   /* Native Windows platforms (but not Cygwin) put the "file creation
      time" in st_ctime (!).  See
@@ -174,13 +173,11 @@
 # if _GL_WINDOWS_STAT_TIMESPEC
   t = st->st_ctim;
 # else
-  t.tv_sec = st->st_ctime;
-  t.tv_nsec = 0;
+  t = (struct timespec) { .tv_sec = st->st_ctime };
 # endif
 #else
   /* Birth time is not supported.  */
-  t.tv_sec = -1;
-  t.tv_nsec = -1;
+  t = (struct timespec) { .tv_sec = -1, .tv_nsec = -1 };
 #endif
 
 #if (defined HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC \
@@ -192,30 +189,28 @@
      sometimes returns junk in the birth time fields; work around this
      bug if it is detected.  */
   if (! (t.tv_sec && 0 <= t.tv_nsec && t.tv_nsec < 1000000000))
-    {
-      t.tv_sec = -1;
-      t.tv_nsec = -1;
-    }
+    t = (struct timespec) { .tv_sec = -1, .tv_nsec = -1 };
 #endif
 
   return t;
 }
 
 /* If a stat-like function returned RESULT, normalize the timestamps
-   in *ST, in case this platform suffers from the Solaris 11 bug where
+   in *ST, if this platform suffers from a macOS and Solaris bug where
    tv_nsec might be negative.  Return the adjusted RESULT, setting
    errno to EOVERFLOW if normalization overflowed.  This function
    is intended to be private to this .h file.  */
 _GL_STAT_TIME_INLINE int
 stat_time_normalize (int result, _GL_UNUSED struct stat *st)
 {
-#if defined __sun && defined STAT_TIMESPEC
+#if (((defined __APPLE__ && defined __MACH__) || defined __sun) \
+     && defined STAT_TIMESPEC_OFFSETOF)
   if (result == 0)
     {
       long int timespec_hz = 1000000000;
-      short int const ts_off = { offsetof (struct stat, st_atim),
-                                   offsetof (struct stat, st_mtim),
-                                   offsetof (struct stat, st_ctim) };
+      short int const ts_off = { STAT_TIMESPEC_OFFSETOF (st_atim),
+                                   STAT_TIMESPEC_OFFSETOF (st_mtim),
+                                   STAT_TIMESPEC_OFFSETOF (st_ctim) };
       int i;
       for (i = 0; i < sizeof ts_off / sizeof *ts_off; i++)
         {
@@ -229,8 +224,7 @@
             }
           ts->tv_nsec = r;
           /* Overflow is possible, as Solaris 11 stat can yield
-             tv_sec == TYPE_MINIMUM (time_t) && tv_nsec == -1000000000.
-             INT_ADD_WRAPV is OK, since time_t is signed on Solaris.  */
+             tv_sec == TYPE_MINIMUM (time_t) && tv_nsec == -1000000000.  */
           if (ckd_add (&ts->tv_sec, q, ts->tv_sec))
             {
               errno = EOVERFLOW;

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/stat-w32.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/stat-w32.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/stat-w32.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/stat-w32.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/stat.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/stat.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/stdarg.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/stdarg.in.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/stdckdint.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/stdckdint.in.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/stddef.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/stddef.in.h Changed

@@ -1,6 +1,6 @@
 /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
 
-   Copyright (C) 2009-2022 Free Software Foundation, Inc.
+   Copyright (C) 2009-2024 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -18,7 +18,7 @@
 /* Written by Eric Blake.  */
 
 /*
- * POSIX 2008 <stddef.h> for platforms that have issues.
+ * POSIX 2008 and ISO C 23 <stddef.h> for platforms that have issues.
  * <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/stddef.h.html>
  */
 
@@ -37,9 +37,9 @@
    remember if special invocation has ever been used to obtain wint_t,
    in which case we need to clean up NULL yet again.  */
 
-# if !(defined _@GUARD_PREFIX@_STDDEF_H && defined _GL_STDDEF_WINT_T)
+# if !(defined _@GUARD_PREFIX@_STDDEF_H && defined _@GUARD_PREFIX@_STDDEF_WINT_T)
 #  ifdef __need_wint_t
-#   define _GL_STDDEF_WINT_T
+#   define _@GUARD_PREFIX@_STDDEF_WINT_T
 #  endif
 #  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
    /* On TinyCC, make sure that the macros that indicate the special invocation
@@ -58,7 +58,7 @@
 
 /* On AIX 7.2, with xlc in 64-bit mode, <stddef.h> defines max_align_t to a
    type with alignment 4, but 'long' has alignment 8.  */
-#  if defined _AIX && defined __LP64__
+#  if defined _AIX && defined __LP64__ && !@HAVE_MAX_ALIGN_T@
 #   if !GNULIB_defined_max_align_t
 #    ifdef _MAX_ALIGN_T
 /* /usr/include/stddef.h has already defined max_align_t.  Override it.  */
@@ -69,6 +69,7 @@
 typedef long max_align_t;
 #     define _MAX_ALIGN_T
 #    endif
+#    define __CLANG_MAX_ALIGN_T_DEFINED
 #    define GNULIB_defined_max_align_t 1
 #   endif
 #  endif
@@ -79,7 +80,7 @@
 
 /* On NetBSD 5.0, the definition of NULL lacks proper parentheses.  */
 #  if (@REPLACE_NULL@ \
-       && (!defined _@GUARD_PREFIX@_STDDEF_H || defined _GL_STDDEF_WINT_T))
+       && (!defined _@GUARD_PREFIX@_STDDEF_H || defined _@GUARD_PREFIX@_STDDEF_WINT_T))
 #   undef NULL
 #   ifdef __cplusplus
    /* ISO C++ says that the macro NULL must expand to an integer constant
@@ -100,6 +101,33 @@
 #  ifndef _@GUARD_PREFIX@_STDDEF_H
 #   define _@GUARD_PREFIX@_STDDEF_H
 
+/* This file uses _Noreturn, _GL_ATTRIBUTE_NOTHROW.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
+/* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions.
+ */
+#ifndef _GL_ATTRIBUTE_NOTHROW
+# if defined __cplusplus
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major >= 4
+#   if __cplusplus >= 201103L
+#    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
+#   else
+#    define _GL_ATTRIBUTE_NOTHROW throw ()
+#   endif
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# else
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__
+#   define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__))
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# endif
+#endif
+
 /* Some platforms lack wchar_t.  */
 #if !@HAVE_WCHAR_T@
 # define wchar_t int
@@ -137,11 +165,49 @@
   long int __i _GL_STDDEF_ALIGNAS (long int);
 } rpl_max_align_t;
 #   define max_align_t rpl_max_align_t
+#   define __CLANG_MAX_ALIGN_T_DEFINED
 #   define GNULIB_defined_max_align_t 1
 #  endif
 # endif
 #endif
 
+/* ISO C 23 § 7.21.1 The unreachable macro  */
+#ifndef unreachable
+
+/* Code borrowed from verify.h.  */
+# ifndef _GL_HAS_BUILTIN_UNREACHABLE
+#  if defined __clang_major__ && __clang_major__ < 5
+#   define _GL_HAS_BUILTIN_UNREACHABLE 0
+#  elif 4 < __GNUC__ + (5 <= __GNUC_MINOR__)
+#   define _GL_HAS_BUILTIN_UNREACHABLE 1
+#  elif defined __has_builtin
+#   define _GL_HAS_BUILTIN_UNREACHABLE __has_builtin (__builtin_unreachable)
+#  else
+#   define _GL_HAS_BUILTIN_UNREACHABLE 0
+#  endif
+# endif
+
+# if _GL_HAS_BUILTIN_UNREACHABLE
+#  define unreachable() __builtin_unreachable ()
+# elif 1200 <= _MSC_VER
+#  define unreachable() __assume (0)
+# else
+/* Declare abort(), without including <stdlib.h>.  */
+extern
+#  if defined __cplusplus
+"C"
+#  endif
+_Noreturn
+void abort (void)
+#  if defined __cplusplus && (__GLIBC__ >= 2)
+_GL_ATTRIBUTE_NOTHROW
+#  endif
+;
+#  define unreachable() abort ()
+# endif
+
+#endif
+
 #  endif /* _@GUARD_PREFIX@_STDDEF_H */
 # endif /* _@GUARD_PREFIX@_STDDEF_H */
 #endif /* __need_XXX */

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/stdint.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/stdint.in.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/stdio-read.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/stdio-read.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/stdio-write.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/stdio-write.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/stdio.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/stdio.in.h Changed

@@ -1,6 +1,6 @@
 /* A GNU-like <stdio.h>.
 
-   Copyright (C) 2004, 2007-2022 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007-2024 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -36,6 +36,18 @@
 
 #ifndef _@GUARD_PREFIX@_STDIO_H
 
+/* Suppress macOS deprecation warnings for sprintf and vsprintf.  */
+#if (defined __APPLE__ && defined __MACH__) && !defined _POSIX_C_SOURCE
+# ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
+#  include <AvailabilityMacros.h>
+# endif
+# if (defined MAC_OS_X_VERSION_MIN_REQUIRED \
+      && 130000 <= MAC_OS_X_VERSION_MIN_REQUIRED)
+#  define _POSIX_C_SOURCE 200809L
+#  define _GL_DEFINED__POSIX_C_SOURCE
+# endif
+#endif
+
 #define _GL_ALREADY_INCLUDING_STDIO_H
 
 /* The include_next requires a split double-inclusion guard.  */
@@ -43,9 +55,21 @@
 
 #undef _GL_ALREADY_INCLUDING_STDIO_H
 
+#ifdef _GL_DEFINED__POSIX_C_SOURCE
+# undef _GL_DEFINED__POSIX_C_SOURCE
+# undef _POSIX_C_SOURCE
+#endif
+
 #ifndef _@GUARD_PREFIX@_STDIO_H
 #define _@GUARD_PREFIX@_STDIO_H
 
+/* This file uses _GL_ATTRIBUTE_DEALLOC, _GL_ATTRIBUTE_FORMAT,
+   _GL_ATTRIBUTE_MALLOC, _GL_ATTRIBUTE_NOTHROW, GNULIB_POSIXCHECK,
+   HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* Get va_list.  Needed on many systems, including glibc 2.8.  */
 #include <stdarg.h>
 
@@ -116,6 +140,38 @@
 # endif
 #endif
 
+/* _GL_ATTRIBUTE_MALLOC declares that the function returns a pointer to freshly
+   allocated memory.  */
+#ifndef _GL_ATTRIBUTE_MALLOC
+# if __GNUC__ >= 3 || defined __clang__
+#  define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
+# else
+#  define _GL_ATTRIBUTE_MALLOC
+# endif
+#endif
+
+/* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions.
+ */
+#ifndef _GL_ATTRIBUTE_NOTHROW
+# if defined __cplusplus
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major >= 4
+#   if __cplusplus >= 201103L
+#    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
+#   else
+#    define _GL_ATTRIBUTE_NOTHROW throw ()
+#   endif
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# else
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__
+#   define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__))
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# endif
+#endif
+
 /* An __attribute__ __format__ specifier for a function that takes a format
    string and arguments, where the format string directives are the ones
    standardized by ISO C99 and POSIX.
@@ -193,6 +249,36 @@
 # undef putc_unlocked
 #endif
 
+
+/* Maximum number of characters produced by printing a NaN value.  */
+#ifndef _PRINTF_NAN_LEN_MAX
+# if defined __FreeBSD__ || defined __DragonFly__ \
+     || defined __NetBSD__ \
+     || (defined __APPLE__ && defined __MACH__)
+/* On BSD systems, a NaN value prints as just "nan", without a sign.  */
+#  define _PRINTF_NAN_LEN_MAX 3
+# elif (__GLIBC__ >= 2) || MUSL_LIBC || defined __OpenBSD__ || defined __sun || defined __CYGWIN__
+/* glibc, musl libc, OpenBSD, Solaris libc, and Cygwin produce "-nan".  */
+#  define _PRINTF_NAN_LEN_MAX 4
+# elif defined _AIX
+/* AIX produces "-NaNQ".  */
+#  define _PRINTF_NAN_LEN_MAX 5
+# elif defined _WIN32 && !defined __CYGWIN__
+/* On native Windows, the output can be:
+   - with MSVC ucrt: "-nan" or "-nan(ind)" or "-nan(snan)",
+   - with mingw: "-1.#IND" or "-1.#QNAN".  */
+#  define _PRINTF_NAN_LEN_MAX 10
+# elif defined __sgi
+/* On IRIX, the output typically is "-nan0xNNNNNNNN" with 8 hexadecimal
+   digits.  */
+#  define _PRINTF_NAN_LEN_MAX 14
+# else
+/* We don't know, but 32 should be a safe maximum.  */
+#  define _PRINTF_NAN_LEN_MAX 32
+# endif
+#endif
+
+
 #if @GNULIB_DPRINTF@
 # if @REPLACE_DPRINTF@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -210,7 +296,9 @@
 #  endif
 _GL_CXXALIAS_SYS (dprintf, int, (int fd, const char *restrict format, ...));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (dprintf);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef dprintf
 # if HAVE_RAW_DECL_DPRINTF
@@ -273,7 +361,8 @@
 #  endif
 _GL_FUNCDECL_RPL (fdopen, FILE *,
                   (int fd, const char *mode)
-                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1));
+                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)
+                  _GL_ATTRIBUTE_MALLOC);
 _GL_CXXALIAS_RPL (fdopen, FILE *, (int fd, const char *mode));
 # elif defined _WIN32 && !defined __CYGWIN__
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -284,9 +373,18 @@
 # else
 #  if __GNUC__ >= 11
 /* For -Wmismatched-dealloc: Associate fdopen with fclose or rpl_fclose.  */
+#   if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
 _GL_FUNCDECL_SYS (fdopen, FILE *,
                   (int fd, const char *mode)
-                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1));
+                  _GL_ATTRIBUTE_NOTHROW
+                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)
+                  _GL_ATTRIBUTE_MALLOC);
+#   else
+_GL_FUNCDECL_SYS (fdopen, FILE *,
+                  (int fd, const char *mode)
+                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)
+                  _GL_ATTRIBUTE_MALLOC);
+#   endif
 #  endif
 _GL_CXXALIAS_SYS (fdopen, FILE *, (int fd, const char *mode));
 # endif
@@ -294,9 +392,18 @@
 #else
 # if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined fdopen
 /* For -Wmismatched-dealloc: Associate fdopen with fclose or rpl_fclose.  */
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+_GL_FUNCDECL_SYS (fdopen, FILE *,
+                  (int fd, const char *mode)
+                  _GL_ATTRIBUTE_NOTHROW
+                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)
+                  _GL_ATTRIBUTE_MALLOC);
+#  else
 _GL_FUNCDECL_SYS (fdopen, FILE *,
                   (int fd, const char *mode)
-                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1));
+                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)
+                  _GL_ATTRIBUTE_MALLOC);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef fdopen
@@ -407,7 +514,8 @@
 #  endif
 _GL_FUNCDECL_RPL (fopen, FILE *,
                   (const char *restrict filename, const char *restrict mode)
-                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1));
+                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)
+                  _GL_ATTRIBUTE_MALLOC);
 _GL_CXXALIAS_RPL (fopen, FILE *,
                   (const char *restrict filename, const char *restrict mode));
 # else
@@ -882,7 +990,9 @@
                    int delimiter,
                    FILE *restrict stream));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (getdelim);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef getdelim
 # if HAVE_RAW_DECL_GETDELIM
@@ -921,7 +1031,7 @@
                   (char **restrict lineptr, size_t *restrict linesize,
                    FILE *restrict stream));
 # endif
-# if @HAVE_DECL_GETLINE@
+# if __GLIBC__ >= 2 && @HAVE_DECL_GETLINE@
 _GL_CXXALIASWARN (getline);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -951,9 +1061,17 @@
 #  endif
 _GL_CXXALIAS_MDA (getw, int, (FILE *restrict stream));
 # else
+#  if @HAVE_DECL_GETW@
+#   if defined __APPLE__ && defined __MACH__
+/* The presence of the declaration depends on _POSIX_C_SOURCE.  */
+_GL_FUNCDECL_SYS (getw, int, (FILE *restrict stream));
+#   endif
 _GL_CXXALIAS_SYS (getw, int, (FILE *restrict stream));
+#  endif
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (getw);
+# endif
 #endif
 
 #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
@@ -1052,13 +1170,15 @@
 #  endif
 _GL_FUNCDECL_RPL (popen, FILE *,
                   (const char *cmd, const char *mode)
-                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1));
+                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)
+                  _GL_ATTRIBUTE_MALLOC);
 _GL_CXXALIAS_RPL (popen, FILE *, (const char *cmd, const char *mode));
 # else
 #  if !@HAVE_POPEN@ || __GNUC__ >= 11
 _GL_FUNCDECL_SYS (popen, FILE *,
                   (const char *cmd, const char *mode)
-                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1));
+                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)
+                  _GL_ATTRIBUTE_MALLOC);
 #  endif
 _GL_CXXALIAS_SYS (popen, FILE *, (const char *cmd, const char *mode));
 # endif
@@ -1068,7 +1188,8 @@
 /* For -Wmismatched-dealloc: Associate popen with pclose or rpl_pclose.  */
 _GL_FUNCDECL_SYS (popen, FILE *,
                   (const char *cmd, const char *mode)
-                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1));
+                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)
+                  _GL_ATTRIBUTE_MALLOC);
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef popen
@@ -1190,9 +1311,17 @@
 #  endif
 _GL_CXXALIAS_MDA (putw, int, (int w, FILE *restrict stream));
 # else
+#  if @HAVE_DECL_PUTW@
+#   if defined __APPLE__ && defined __MACH__
+/* The presence of the declaration depends on _POSIX_C_SOURCE.  */
+_GL_FUNCDECL_SYS (putw, int, (int w, FILE *restrict stream));
+#   endif
 _GL_CXXALIAS_SYS (putw, int, (int w, FILE *restrict stream));
+#  endif
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (putw);
+# endif
 #endif
 
 #if @GNULIB_REMOVE@
@@ -1398,13 +1527,15 @@
 #   define tmpfile rpl_tmpfile
 #  endif
 _GL_FUNCDECL_RPL (tmpfile, FILE *, (void)
-                                   _GL_ATTRIBUTE_DEALLOC (fclose, 1));
+                                   _GL_ATTRIBUTE_DEALLOC (fclose, 1)
+                                   _GL_ATTRIBUTE_MALLOC);
 _GL_CXXALIAS_RPL (tmpfile, FILE *, (void));
 # else
 #  if __GNUC__ >= 11
 /* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose.  */
 _GL_FUNCDECL_SYS (tmpfile, FILE *, (void)
-                                   _GL_ATTRIBUTE_DEALLOC (fclose, 1));
+                                   _GL_ATTRIBUTE_DEALLOC (fclose, 1)
+                                   _GL_ATTRIBUTE_MALLOC);
 #  endif
 _GL_CXXALIAS_SYS (tmpfile, FILE *, (void));
 # endif
@@ -1415,7 +1546,8 @@
 # if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined tmpfile
 /* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose.  */
 _GL_FUNCDECL_SYS (tmpfile, FILE *, (void)
-                                   _GL_ATTRIBUTE_DEALLOC (fclose, 1));
+                                   _GL_ATTRIBUTE_DEALLOC (fclose, 1)
+                                   _GL_ATTRIBUTE_MALLOC);
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef tmpfile

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/stdlib.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/stdlib.in.h Changed

@@ -1,6 +1,6 @@
 /* A GNU-like <stdlib.h>.
 
-   Copyright (C) 1995, 2001-2004, 2006-2022 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2004, 2006-2024 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -37,6 +37,13 @@
 #ifndef _@GUARD_PREFIX@_STDLIB_H
 #define _@GUARD_PREFIX@_STDLIB_H
 
+/* This file uses _Noreturn, _GL_ATTRIBUTE_DEALLOC, _GL_ATTRIBUTE_MALLOC,
+   _GL_ATTRIBUTE_NOTHROW, _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK,
+   HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* NetBSD 5.0 mis-defines NULL.  */
 #include <stddef.h>
 
@@ -67,9 +74,7 @@
 #  include <random.h>
 # endif
 
-# if !@HAVE_STRUCT_RANDOM_DATA@ || @REPLACE_RANDOM_R@ || !@HAVE_RANDOM_R@
-#  include <stdint.h>
-# endif
+# include <stdint.h>
 
 # if !@HAVE_STRUCT_RANDOM_DATA@
 /* Define 'struct random_data'.
@@ -128,6 +133,28 @@
 # endif
 #endif
 
+/* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions.
+ */
+#ifndef _GL_ATTRIBUTE_NOTHROW
+# if defined __cplusplus
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major >= 4
+#   if __cplusplus >= 201103L
+#    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
+#   else
+#    define _GL_ATTRIBUTE_NOTHROW throw ()
+#   endif
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# else
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__
+#   define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__))
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# endif
+#endif
+
 /* The __attribute__ feature is available in gcc versions 2.5 and later.
    The attribute __pure__ was added in gcc 2.96.  */
 #ifndef _GL_ATTRIBUTE_PURE
@@ -164,11 +191,22 @@
 #if @GNULIB__EXIT@
 /* Terminate the current process with the given return code, without running
    the 'atexit' handlers.  */
-# if !@HAVE__EXIT@
+# if @REPLACE__EXIT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef _Exit
+#   define _Exit rpl__Exit
+#  endif
+_GL_FUNCDECL_RPL (_Exit, _Noreturn void, (int status));
+_GL_CXXALIAS_RPL (_Exit, void, (int status));
+# else
+#  if !@HAVE__EXIT@
 _GL_FUNCDECL_SYS (_Exit, _Noreturn void, (int status));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (_Exit, void, (int status));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (_Exit);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef _Exit
 # if HAVE_RAW_DECL__EXIT
@@ -185,7 +223,7 @@
 #   define free rpl_free
 #  endif
 #  if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
-_GL_FUNCDECL_RPL (free, void, (void *ptr) throw ());
+_GL_FUNCDECL_RPL (free, void, (void *ptr) _GL_ATTRIBUTE_NOTHROW);
 #  else
 _GL_FUNCDECL_RPL (free, void, (void *ptr));
 #  endif
@@ -219,9 +257,16 @@
 #  if @HAVE_ALIGNED_ALLOC@
 #   if __GNUC__ >= 11
 /* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free.  */
+#    if __GLIBC__ + (__GLIBC_MINOR__ >= 16) > 2
 _GL_FUNCDECL_SYS (aligned_alloc, void *,
                   (size_t alignment, size_t size)
+                  _GL_ATTRIBUTE_NOTHROW
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#    else
+_GL_FUNCDECL_SYS (aligned_alloc, void *,
+                  (size_t alignment, size_t size)
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#    endif
 #   endif
 _GL_CXXALIAS_SYS (aligned_alloc, void *, (size_t alignment, size_t size));
 #  endif
@@ -232,9 +277,16 @@
 #else
 # if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined aligned_alloc
 /* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free.  */
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 16) > 2
+_GL_FUNCDECL_SYS (aligned_alloc, void *,
+                  (size_t alignment, size_t size)
+                  _GL_ATTRIBUTE_NOTHROW
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  else
 _GL_FUNCDECL_SYS (aligned_alloc, void *,
                   (size_t alignment, size_t size)
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef aligned_alloc
@@ -277,9 +329,16 @@
 # else
 #  if __GNUC__ >= 11
 /* For -Wmismatched-dealloc: Associate calloc with free or rpl_free.  */
+#   if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2
+_GL_FUNCDECL_SYS (calloc, void *,
+                  (size_t nmemb, size_t size)
+                  _GL_ATTRIBUTE_NOTHROW
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   else
 _GL_FUNCDECL_SYS (calloc, void *,
                   (size_t nmemb, size_t size)
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   endif
 #  endif
 _GL_CXXALIAS_SYS (calloc, void *, (size_t nmemb, size_t size));
 # endif
@@ -289,9 +348,16 @@
 #else
 # if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined calloc
 /* For -Wmismatched-dealloc: Associate calloc with free or rpl_free.  */
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2
+_GL_FUNCDECL_SYS (calloc, void *,
+                  (size_t nmemb, size_t size)
+                  _GL_ATTRIBUTE_NOTHROW
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  else
 _GL_FUNCDECL_SYS (calloc, void *,
                   (size_t nmemb, size_t size)
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef calloc
@@ -313,10 +379,18 @@
 _GL_CXXALIAS_RPL (canonicalize_file_name, char *, (const char *name));
 # else
 #  if !@HAVE_CANONICALIZE_FILE_NAME@ || __GNUC__ >= 11
+#   if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+_GL_FUNCDECL_SYS (canonicalize_file_name, char *,
+                  (const char *name)
+                  _GL_ATTRIBUTE_NOTHROW
+                  _GL_ARG_NONNULL ((1))
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   else
 _GL_FUNCDECL_SYS (canonicalize_file_name, char *,
                   (const char *name)
                   _GL_ARG_NONNULL ((1))
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   endif
 #  endif
 _GL_CXXALIAS_SYS (canonicalize_file_name, char *, (const char *name));
 # endif
@@ -329,10 +403,18 @@
 # if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined canonicalize_file_name
 /* For -Wmismatched-dealloc: Associate canonicalize_file_name with free or
    rpl_free.  */
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+_GL_FUNCDECL_SYS (canonicalize_file_name, char *,
+                  (const char *name)
+                  _GL_ATTRIBUTE_NOTHROW
+                  _GL_ARG_NONNULL ((1))
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  else
 _GL_FUNCDECL_SYS (canonicalize_file_name, char *,
                   (const char *name)
                   _GL_ARG_NONNULL ((1))
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef canonicalize_file_name
@@ -416,12 +498,24 @@
    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.  */
-# if !@HAVE_DECL_GETLOADAVG@
+# if @REPLACE_GETLOADAVG@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getloadavg
+#   define getloadavg rpl_getloadavg
+#  endif
+_GL_FUNCDECL_RPL (getloadavg, int, (double loadavg, int nelem)
+                                   _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (getloadavg, int, (double loadavg, int nelem));
+# else
+#  if !@HAVE_DECL_GETLOADAVG@
 _GL_FUNCDECL_SYS (getloadavg, int, (double loadavg, int nelem)
                                    _GL_ARG_NONNULL ((1)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (getloadavg, int, (double loadavg, int nelem));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (getloadavg);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef getloadavg
 # if HAVE_RAW_DECL_GETLOADAVG
@@ -430,6 +524,41 @@
 # endif
 #endif
 
+#if @GNULIB_GETPROGNAME@
+/* Return the base name of the executing program.
+   On native Windows this will usually end in ".exe" or ".EXE". */
+# if @REPLACE_GETPROGNAME@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getprogname
+#   define getprogname rpl_getprogname
+#  endif
+#  if @HAVE_DECL_PROGRAM_INVOCATION_NAME@
+_GL_FUNCDECL_RPL (getprogname, const char *, (void) _GL_ATTRIBUTE_PURE);
+#  else
+_GL_FUNCDECL_RPL (getprogname, const char *, (void));
+#  endif
+_GL_CXXALIAS_RPL (getprogname, const char *, (void));
+# else
+#  if !@HAVE_GETPROGNAME@
+#   if @HAVE_DECL_PROGRAM_INVOCATION_NAME@
+_GL_FUNCDECL_SYS (getprogname, const char *, (void) _GL_ATTRIBUTE_PURE);
+#   else
+_GL_FUNCDECL_SYS (getprogname, const char *, (void));
+#   endif
+#  endif
+_GL_CXXALIAS_SYS (getprogname, const char *, (void));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (getprogname);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef getprogname
+# if HAVE_RAW_DECL_GETPROGNAME
+_GL_WARN_ON_USE (getprogname, "getprogname is unportable - "
+                 "use gnulib module getprogname for portability");
+# endif
+#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.
@@ -442,14 +571,28 @@
    Otherwise it returns -1, and *OPTIONP and *VALUEP are undefined.
    For more details see the POSIX specification.
    https://pubs.opengroup.org/onlinepubs/9699919799/functions/getsubopt.html */
-# if !@HAVE_GETSUBOPT@
+# if @REPLACE_GETSUBOPT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getsubopt
+#   define getsubopt rpl_getsubopt
+#  endif
+_GL_FUNCDECL_RPL (getsubopt, int,
+                  (char **optionp, char *const *tokens, char **valuep)
+                  _GL_ARG_NONNULL ((1, 2, 3)));
+_GL_CXXALIAS_RPL (getsubopt, int,
+                  (char **optionp, char *const *tokens, char **valuep));
+# else
+#  if !@HAVE_GETSUBOPT@
 _GL_FUNCDECL_SYS (getsubopt, int,
                   (char **optionp, char *const *tokens, char **valuep)
                   _GL_ARG_NONNULL ((1, 2, 3)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (getsubopt, int,
                   (char **optionp, char *const *tokens, char **valuep));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (getsubopt);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef getsubopt
 # if HAVE_RAW_DECL_GETSUBOPT
@@ -493,9 +636,16 @@
 # else
 #  if __GNUC__ >= 11
 /* For -Wmismatched-dealloc: Associate malloc with free or rpl_free.  */
+#   if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2
 _GL_FUNCDECL_SYS (malloc, void *,
                   (size_t size)
+                  _GL_ATTRIBUTE_NOTHROW
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   else
+_GL_FUNCDECL_SYS (malloc, void *,
+                  (size_t size)
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   endif
 #  endif
 _GL_CXXALIAS_SYS (malloc, void *, (size_t size));
 # endif
@@ -505,9 +655,16 @@
 #else
 # if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined malloc
 /* For -Wmismatched-dealloc: Associate malloc with free or rpl_free.  */
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2
 _GL_FUNCDECL_SYS (malloc, void *,
                   (size_t size)
+                  _GL_ATTRIBUTE_NOTHROW
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  else
+_GL_FUNCDECL_SYS (malloc, void *,
+                  (size_t size)
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC
 #  undef malloc
@@ -517,6 +674,51 @@
 # endif
 #endif
 
+/* Return maximum number of bytes of a multibyte character.  */
+#if @REPLACE_MB_CUR_MAX@
+# if !GNULIB_defined_MB_CUR_MAX
+static inline
+int gl_MB_CUR_MAX (void)
+{
+  /* Turn the value 3 to the value 4, as needed for the UTF-8 encoding.  */
+  return MB_CUR_MAX + (MB_CUR_MAX == 3);
+}
+#  undef MB_CUR_MAX
+#  define MB_CUR_MAX gl_MB_CUR_MAX ()
+#  define GNULIB_defined_MB_CUR_MAX 1
+# endif
+#endif
+
+/* Convert a string to a wide string.  */
+#if @GNULIB_MBSTOWCS@
+# if @REPLACE_MBSTOWCS@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mbstowcs
+#   define mbstowcs rpl_mbstowcs
+#  endif
+_GL_FUNCDECL_RPL (mbstowcs, size_t,
+                  (wchar_t *restrict dest, const char *restrict src,
+                   size_t len)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (mbstowcs, size_t,
+                  (wchar_t *restrict dest, const char *restrict src,
+                   size_t len));
+# else
+_GL_CXXALIAS_SYS (mbstowcs, size_t,
+                  (wchar_t *restrict dest, const char *restrict src,
+                   size_t len));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (mbstowcs);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef mbstowcs
+# if HAVE_RAW_DECL_MBSTOWCS
+_GL_WARN_ON_USE (mbstowcs, "mbstowcs is unportable - "
+                 "use gnulib module mbstowcs for portability");
+# endif
+#endif
+
 /* Convert a multibyte character to a wide character.  */
 #if @GNULIB_MBTOWC@
 # if @REPLACE_MBTOWC@
@@ -579,12 +781,24 @@
    implementation.
    Returns the open file descriptor if successful, otherwise -1 and errno
    set.  */
-# if !@HAVE_MKOSTEMP@
+# if @REPLACE_MKOSTEMP@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mkostemp
+#   define mkostemp rpl_mkostemp
+#  endif
+_GL_FUNCDECL_RPL (mkostemp, int, (char * /*template*/, int /*flags*/)
+                                 _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (mkostemp, int, (char * /*template*/, int /*flags*/));
+# else
+#  if !@HAVE_MKOSTEMP@
 _GL_FUNCDECL_SYS (mkostemp, int, (char * /*template*/, int /*flags*/)
                                  _GL_ARG_NONNULL ((1)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (mkostemp, int, (char * /*template*/, int /*flags*/));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (mkostemp);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef mkostemp
 # if HAVE_RAW_DECL_MKOSTEMP
@@ -607,14 +821,28 @@
    implementation.
    Returns the open file descriptor if successful, otherwise -1 and errno
    set.  */
-# if !@HAVE_MKOSTEMPS@
+# if @REPLACE_MKOSTEMPS@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mkostemps
+#   define mkostemps rpl_mkostemps
+#  endif
+_GL_FUNCDECL_RPL (mkostemps, int,
+                  (char * /*template*/, int /*suffixlen*/, int /*flags*/)
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (mkostemps, int,
+                  (char * /*template*/, int /*suffixlen*/, int /*flags*/));
+# else
+#  if !@HAVE_MKOSTEMPS@
 _GL_FUNCDECL_SYS (mkostemps, int,
                   (char * /*template*/, int /*suffixlen*/, int /*flags*/)
                   _GL_ARG_NONNULL ((1)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (mkostemps, int,
                   (char * /*template*/, int /*suffixlen*/, int /*flags*/));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (mkostemps);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef mkostemps
 # if HAVE_RAW_DECL_MKOSTEMPS
@@ -713,7 +941,7 @@
                   (void **memptr, size_t alignment, size_t size));
 #  endif
 # endif
-# if @HAVE_POSIX_MEMALIGN@
+# if __GLIBC__ >= 2 && @HAVE_POSIX_MEMALIGN@
 _GL_CXXALIASWARN (posix_memalign);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -727,11 +955,22 @@
 #if @GNULIB_POSIX_OPENPT@
 /* Return an FD open to the master side of a pseudo-terminal.  Flags should
    include O_RDWR, and may also include O_NOCTTY.  */
-# if !@HAVE_POSIX_OPENPT@
+# if @REPLACE_POSIX_OPENPT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef posix_openpt
+#   define posix_openpt rpl_posix_openpt
+#  endif
+_GL_FUNCDECL_RPL (posix_openpt, int, (int flags));
+_GL_CXXALIAS_RPL (posix_openpt, int, (int flags));
+# else
+#  if !@HAVE_POSIX_OPENPT@
 _GL_FUNCDECL_SYS (posix_openpt, int, (int flags));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (posix_openpt, int, (int flags));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (posix_openpt);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef posix_openpt
 # if HAVE_RAW_DECL_POSIX_OPENPT
@@ -808,6 +1047,10 @@
 #   define putenv _putenv
 #  endif
 _GL_CXXALIAS_MDA (putenv, int, (char *string));
+# elif defined __KLIBC__
+/* Need to cast, because on OS/2 kLIBC, the first parameter is
+                                     const char *string.  */
+_GL_CXXALIAS_SYS_CAST (putenv, int, (char *string));
 # else
 _GL_CXXALIAS_SYS (putenv, int, (char *string));
 # endif
@@ -824,6 +1067,10 @@
 /* Need to cast, because on mingw, the parameter is either
    'const char *string' or 'char *string'.  */
 _GL_CXXALIAS_MDA_CAST (putenv, int, (char *string));
+# elif defined __KLIBC__
+/* Need to cast, because on OS/2 kLIBC, the first parameter is
+                                     const char *string.  */
+_GL_CXXALIAS_SYS_CAST (putenv, int, (char *string));
 # else
 _GL_CXXALIAS_SYS (putenv, int, (char *string));
 # endif
@@ -865,7 +1112,9 @@
                                   _gl_qsort_r_compar_fn compare,
                                   void *arg));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (qsort_r);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef qsort_r
 # if HAVE_RAW_DECL_QSORT_R
@@ -875,11 +1124,26 @@
 #endif
 
 
-#if @GNULIB_RANDOM_R@
-# if !@HAVE_RANDOM_R@
-#  ifndef RAND_MAX
-#   define RAND_MAX 2147483647
+#if @GNULIB_RAND@ || (@GNULIB_RANDOM_R@ && !@HAVE_RANDOM_R@)
+# ifndef RAND_MAX
+#  define RAND_MAX 2147483647
+# endif
+#endif
+
+
+#if @GNULIB_RAND@
+# if @REPLACE_RAND@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef rand
+#   define rand rpl_rand
 #  endif
+_GL_FUNCDECL_RPL (rand, int, (void));
+_GL_CXXALIAS_RPL (rand, int, (void));
+# else
+_GL_CXXALIAS_SYS (rand, int, (void));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (rand);
 # endif
 #endif
 
@@ -900,7 +1164,9 @@
                                int.  */
 _GL_CXXALIAS_SYS_CAST (random, long, (void));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (random);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef random
 # if HAVE_RAW_DECL_RANDOM
@@ -925,7 +1191,9 @@
                                        unsigned long seed.  */
 _GL_CXXALIAS_SYS_CAST (srandom, void, (unsigned int seed));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (srandom);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef srandom
 # if HAVE_RAW_DECL_SRANDOM
@@ -956,7 +1224,9 @@
 _GL_CXXALIAS_SYS_CAST (initstate, char *,
                        (unsigned int seed, char *buf, size_t buf_size));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (initstate);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef initstate
 # if HAVE_RAW_DECL_INITSTATE
@@ -981,7 +1251,9 @@
    is                                     const char *arg_state.  */
 _GL_CXXALIAS_SYS_CAST (setstate, char *, (char *arg_state));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (setstate);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef setstate
 # if HAVE_RAW_DECL_SETSTATE
@@ -1126,8 +1398,16 @@
 # else
 #  if __GNUC__ >= 11
 /* For -Wmismatched-dealloc: Associate realloc with free or rpl_free.  */
-_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size)
-                                   _GL_ATTRIBUTE_DEALLOC_FREE);
+#   if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2
+_GL_FUNCDECL_SYS (realloc, void *,
+                  (void *ptr, size_t size)
+                  _GL_ATTRIBUTE_NOTHROW
+                  _GL_ATTRIBUTE_DEALLOC_FREE);
+#   else
+_GL_FUNCDECL_SYS (realloc, void *,
+                  (void *ptr, size_t size)
+                  _GL_ATTRIBUTE_DEALLOC_FREE);
+#   endif
 #  endif
 _GL_CXXALIAS_SYS (realloc, void *, (void *ptr, size_t size));
 # endif
@@ -1137,8 +1417,16 @@
 #else
 # if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined realloc
 /* For -Wmismatched-dealloc: Associate realloc with free or rpl_free.  */
-_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size)
-                                   _GL_ATTRIBUTE_DEALLOC_FREE);
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2
+_GL_FUNCDECL_SYS (realloc, void *,
+                  (void *ptr, size_t size)
+                  _GL_ATTRIBUTE_NOTHROW
+                  _GL_ATTRIBUTE_DEALLOC_FREE);
+#  else
+_GL_FUNCDECL_SYS (realloc, void *,
+                  (void *ptr, size_t size)
+                  _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC
 #  undef realloc
@@ -1167,7 +1455,9 @@
 _GL_CXXALIAS_SYS (reallocarray, void *,
                   (void *ptr, size_t nmemb, size_t size));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (reallocarray);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef reallocarray
 # if HAVE_RAW_DECL_REALLOCARRAY

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/strchrnul.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/strchrnul.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/strchrnul.valgrind -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/strchrnul.valgrind Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/strerror-override.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/strerror-override.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/strerror-override.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/strerror-override.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/strerror.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/strerror.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/string.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/string.in.h Changed

@@ -1,6 +1,6 @@
 /* A GNU-like <string.h>.
 
-   Copyright (C) 1995-1996, 2001-2022 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 2001-2024 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -44,6 +44,13 @@
 #ifndef _@GUARD_PREFIX@_STRING_H
 #define _@GUARD_PREFIX@_STRING_H
 
+/* This file uses _GL_ATTRIBUTE_DEALLOC, _GL_ATTRIBUTE_MALLOC,
+   _GL_ATTRIBUTE_NOTHROW, _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK,
+   HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* NetBSD 5.0 mis-defines NULL.  */
 #include <stddef.h>
 
@@ -59,10 +66,11 @@
 # include <unistd.h>
 #endif
 
-/* AIX 7.2 declares ffsl and ffsll in <strings.h>, not in <string.h>.  */
+/* AIX 7.2 and Android 13 declare ffsl and ffsll in <strings.h>, not in
+   <string.h>.  */
 /* But in any case avoid namespace pollution on glibc systems.  */
 #if ((@GNULIB_FFSL@ || @GNULIB_FFSLL@ || defined GNULIB_POSIXCHECK) \
-     && defined _AIX) \
+     && (defined _AIX || defined __ANDROID__)) \
     && ! defined __GLIBC__
 # include <strings.h>
 #endif
@@ -82,7 +90,14 @@
    can be freed via 'free'; it can be used only after declaring 'free'.  */
 /* Applies to: functions.  Cannot be used on inline functions.  */
 #ifndef _GL_ATTRIBUTE_DEALLOC_FREE
-# define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (free, 1)
+# if defined __cplusplus && defined __GNUC__ && !defined __clang__
+/* Work around GCC bug <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108231> */
+#  define _GL_ATTRIBUTE_DEALLOC_FREE \
+     _GL_ATTRIBUTE_DEALLOC ((void (*) (void *)) free, 1)
+# else
+#  define _GL_ATTRIBUTE_DEALLOC_FREE \
+     _GL_ATTRIBUTE_DEALLOC (free, 1)
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_MALLOC declares that the function returns a pointer to freshly
@@ -96,6 +111,28 @@
 # endif
 #endif
 
+/* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions.
+ */
+#ifndef _GL_ATTRIBUTE_NOTHROW
+# if defined __cplusplus
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major >= 4
+#   if __cplusplus >= 201103L
+#    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
+#   else
+#    define _GL_ATTRIBUTE_NOTHROW throw ()
+#   endif
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# else
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__
+#   define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__))
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# endif
+#endif
+
 /* The __attribute__ feature is available in gcc versions 2.5 and later.
    The attribute __pure__ was added in gcc 2.96.  */
 #ifndef _GL_ATTRIBUTE_PURE
@@ -118,7 +155,11 @@
 # if (@REPLACE_FREE@ && !defined free \
       && !(defined __cplusplus && defined GNULIB_NAMESPACE))
 /* We can't do '#define free rpl_free' here.  */
+#  if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
+_GL_EXTERN_C void rpl_free (void *) _GL_ATTRIBUTE_NOTHROW;
+#  else
 _GL_EXTERN_C void rpl_free (void *);
+#  endif
 #  undef _GL_ATTRIBUTE_DEALLOC_FREE
 #  define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (rpl_free, 1)
 # else
@@ -130,7 +171,7 @@
      void __cdecl free (void *);
 #  else
 #   if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
-_GL_EXTERN_C void free (void *) throw ();
+_GL_EXTERN_C void free (void *) _GL_ATTRIBUTE_NOTHROW;
 #   else
 _GL_EXTERN_C void free (void *);
 #   endif
@@ -145,7 +186,7 @@
      void __cdecl free (void *);
 # else
 #  if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
-_GL_EXTERN_C void free (void *) throw ();
+_GL_EXTERN_C void free (void *) _GL_ATTRIBUTE_NOTHROW;
 #  else
 _GL_EXTERN_C void free (void *);
 #  endif
@@ -248,9 +289,12 @@
 # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
          || defined __clang__)
-_GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n) throw ());
+_GL_CXXALIASWARN1 (memchr, void *,
+                   (void *__s, int __c, size_t __n)
+                   _GL_ATTRIBUTE_NOTHROW);
 _GL_CXXALIASWARN1 (memchr, void const *,
-                   (void const *__s, int __c, size_t __n) throw ());
+                   (void const *__s, int __c, size_t __n)
+                   _GL_ATTRIBUTE_NOTHROW);
 # elif __GLIBC__ >= 2
 _GL_CXXALIASWARN (memchr);
 # endif
@@ -300,16 +344,32 @@
 /* Copy N bytes of SRC to DEST, return pointer to bytes after the
    last written byte.  */
 #if @GNULIB_MEMPCPY@
-# if ! @HAVE_MEMPCPY@
+# if @REPLACE_MEMPCPY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mempcpy
+#   define mempcpy rpl_mempcpy
+#  endif
+_GL_FUNCDECL_RPL (mempcpy, void *,
+                  (void *restrict __dest, void const *restrict __src,
+                   size_t __n)
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (mempcpy, void *,
+                  (void *restrict __dest, void const *restrict __src,
+                   size_t __n));
+# else
+#  if !@HAVE_MEMPCPY@
 _GL_FUNCDECL_SYS (mempcpy, void *,
                   (void *restrict __dest, void const *restrict __src,
                    size_t __n)
                   _GL_ARG_NONNULL ((1, 2)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (mempcpy, void *,
                   (void *restrict __dest, void const *restrict __src,
                    size_t __n));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (mempcpy);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef mempcpy
 # if HAVE_RAW_DECL_MEMPCPY
@@ -334,9 +394,13 @@
 # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
          || defined __clang__)
-_GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t) throw ());
-_GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t) throw ());
-# else
+_GL_CXXALIASWARN1 (memrchr, void *,
+                   (void *, int, size_t)
+                   _GL_ATTRIBUTE_NOTHROW);
+_GL_CXXALIASWARN1 (memrchr, void const *,
+                   (void const *, int, size_t)
+                   _GL_ATTRIBUTE_NOTHROW);
+# elif __GLIBC__ >= 2
 _GL_CXXALIASWARN (memrchr);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -347,6 +411,33 @@
 # endif
 #endif
 
+/* Overwrite a block of memory.  The compiler will not optimize
+   effects away, even if the block is dead after the call.  */
+#if @GNULIB_MEMSET_EXPLICIT@
+# if @REPLACE_MEMSET_EXPLICIT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef memset_explicit
+#   define memset_explicit rpl_memset_explicit
+#  endif
+_GL_FUNCDECL_RPL (memset_explicit, void *,
+                  (void *__dest, int __c, size_t __n) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (memset_explicit, void *, (void *__dest, int __c, size_t __n));
+# else
+#  if !@HAVE_MEMSET_EXPLICIT@
+_GL_FUNCDECL_SYS (memset_explicit, void *,
+                  (void *__dest, int __c, size_t __n) _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (memset_explicit, void *, (void *__dest, int __c, size_t __n));
+# endif
+_GL_CXXALIASWARN (memset_explicit);
+#elif defined GNULIB_POSIXCHECK
+# undef memset_explicit
+# if HAVE_RAW_DECL_MEMSET_EXPLICIT
+_GL_WARN_ON_USE (memset_explicit, "memset_explicit is unportable - "
+                 "use gnulib module memset_explicit for portability");
+# endif
+#endif
+
 /* Find the first occurrence of C in S.  More efficient than
    memchr(S,C,N), at the expense of undefined behavior if C does not
    occur within N bytes.  */
@@ -365,9 +456,12 @@
 # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
          || defined __clang__)
-_GL_CXXALIASWARN1 (rawmemchr, void *, (void *__s, int __c_in) throw ());
+_GL_CXXALIASWARN1 (rawmemchr, void *,
+                   (void *__s, int __c_in)
+                   _GL_ATTRIBUTE_NOTHROW);
 _GL_CXXALIASWARN1 (rawmemchr, void const *,
-                   (void const *__s, int __c_in) throw ());
+                   (void const *__s, int __c_in)
+                   _GL_ATTRIBUTE_NOTHROW);
 # else
 _GL_CXXALIASWARN (rawmemchr);
 # endif
@@ -381,14 +475,28 @@
 
 /* Copy SRC to DST, returning the address of the terminating '\0' in DST.  */
 #if @GNULIB_STPCPY@
-# if ! @HAVE_STPCPY@
+# if @REPLACE_STPCPY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef stpcpy
+#   define stpcpy rpl_stpcpy
+#  endif
+_GL_FUNCDECL_RPL (stpcpy, char *,
+                  (char *restrict __dst, char const *restrict __src)
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (stpcpy, char *,
+                  (char *restrict __dst, char const *restrict __src));
+# else
+#  if !@HAVE_STPCPY@
 _GL_FUNCDECL_SYS (stpcpy, char *,
                   (char *restrict __dst, char const *restrict __src)
                   _GL_ARG_NONNULL ((1, 2)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (stpcpy, char *,
                   (char *restrict __dst, char const *restrict __src));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (stpcpy);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef stpcpy
 # if HAVE_RAW_DECL_STPCPY
@@ -423,7 +531,9 @@
                   (char *restrict __dst, char const *restrict __src,
                    size_t __n));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (stpncpy);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef stpncpy
 # if HAVE_RAW_DECL_STPNCPY
@@ -471,10 +581,13 @@
 # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
          || defined __clang__)
-_GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in) throw ());
+_GL_CXXALIASWARN1 (strchrnul, char *,
+                   (char *__s, int __c_in)
+                   _GL_ATTRIBUTE_NOTHROW);
 _GL_CXXALIASWARN1 (strchrnul, char const *,
-                   (char const *__s, int __c_in) throw ());
-# else
+                   (char const *__s, int __c_in)
+                   _GL_ATTRIBUTE_NOTHROW);
+# elif __GLIBC__ >= 2
 _GL_CXXALIASWARN (strchrnul);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -509,10 +622,18 @@
 #   undef strdup
 #  endif
 #  if (!@HAVE_DECL_STRDUP@ || __GNUC__ >= 11) && !defined strdup
+#   if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
 _GL_FUNCDECL_SYS (strdup, char *,
                   (char const *__s)
+                  _GL_ATTRIBUTE_NOTHROW
                   _GL_ARG_NONNULL ((1))
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   else
+_GL_FUNCDECL_SYS (strdup, char *,
+                  (char const *__s)
+                  _GL_ARG_NONNULL ((1))
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   endif
 #  endif
 _GL_CXXALIAS_SYS (strdup, char *, (char const *__s));
 # endif
@@ -520,10 +641,18 @@
 #else
 # if __GNUC__ >= 11 && !defined strdup
 /* For -Wmismatched-dealloc: Associate strdup with free or rpl_free.  */
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
 _GL_FUNCDECL_SYS (strdup, char *,
                   (char const *__s)
+                  _GL_ATTRIBUTE_NOTHROW
                   _GL_ARG_NONNULL ((1))
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  else
+_GL_FUNCDECL_SYS (strdup, char *,
+                  (char const *__s)
+                  _GL_ARG_NONNULL ((1))
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef strdup
@@ -592,10 +721,18 @@
 _GL_CXXALIAS_RPL (strndup, char *, (char const *__s, size_t __n));
 # else
 #  if !@HAVE_DECL_STRNDUP@ || (__GNUC__ >= 11 && !defined strndup)
+#   if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
 _GL_FUNCDECL_SYS (strndup, char *,
                   (char const *__s, size_t __n)
+                  _GL_ATTRIBUTE_NOTHROW
                   _GL_ARG_NONNULL ((1))
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   else
+_GL_FUNCDECL_SYS (strndup, char *,
+                  (char const *__s, size_t __n)
+                  _GL_ARG_NONNULL ((1))
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   endif
 #  endif
 _GL_CXXALIAS_SYS (strndup, char *, (char const *__s, size_t __n));
 # endif
@@ -603,10 +740,18 @@
 #else
 # if __GNUC__ >= 11 && !defined strndup
 /* For -Wmismatched-dealloc: Associate strndup with free or rpl_free.  */
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+_GL_FUNCDECL_SYS (strndup, char *,
+                  (char const *__s, size_t __n)
+                  _GL_ATTRIBUTE_NOTHROW
+                  _GL_ARG_NONNULL ((1))
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  else
 _GL_FUNCDECL_SYS (strndup, char *,
                   (char const *__s, size_t __n)
                   _GL_ARG_NONNULL ((1))
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef strndup
@@ -675,9 +820,12 @@
 # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
          || defined __clang__)
-_GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept) throw ());
+_GL_CXXALIASWARN1 (strpbrk, char *,
+                   (char *__s, char const *__accept)
+                   _GL_ATTRIBUTE_NOTHROW);
 _GL_CXXALIASWARN1 (strpbrk, char const *,
-                   (char const *__s, char const *__accept) throw ());
+                   (char const *__s, char const *__accept)
+                   _GL_ATTRIBUTE_NOTHROW);
 # elif __GLIBC__ >= 2
 _GL_CXXALIASWARN (strpbrk);
 # endif
@@ -785,9 +933,11 @@
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
          || defined __clang__)
 _GL_CXXALIASWARN1 (strstr, char *,
-                   (char *haystack, const char *needle) throw ());
+                   (char *haystack, const char *needle)
+                   _GL_ATTRIBUTE_NOTHROW);
 _GL_CXXALIASWARN1 (strstr, const char *,
-                   (const char *haystack, const char *needle) throw ());
+                   (const char *haystack, const char *needle)
+                   _GL_ATTRIBUTE_NOTHROW);
 # elif __GLIBC__ >= 2
 _GL_CXXALIASWARN (strstr);
 # endif
@@ -836,10 +986,12 @@
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
          || defined __clang__)
 _GL_CXXALIASWARN1 (strcasestr, char *,
-                   (char *haystack, const char *needle) throw ());
+                   (char *haystack, const char *needle)
+                   _GL_ATTRIBUTE_NOTHROW);
 _GL_CXXALIASWARN1 (strcasestr, const char *,
-                   (const char *haystack, const char *needle) throw ());
-# else
+                   (const char *haystack, const char *needle)
+                   _GL_ATTRIBUTE_NOTHROW);
+# elif __GLIBC__ >= 2
 _GL_CXXALIASWARN (strcasestr);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -1187,7 +1339,7 @@
 #  endif
 _GL_CXXALIAS_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen));
 # endif
-# if @HAVE_DECL_STRERROR_R@
+# if __GLIBC__ >= 2 && @HAVE_DECL_STRERROR_R@
 _GL_CXXALIASWARN (strerror_r);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -1277,12 +1429,22 @@
 #endif
 
 #if @GNULIB_STRVERSCMP@
-# if !@HAVE_STRVERSCMP@
+# if @REPLACE_STRVERSCMP@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define strverscmp rpl_strverscmp
+#  endif
+_GL_FUNCDECL_RPL (strverscmp, int, (const char *, const char *)
+                                   _GL_ATTRIBUTE_PURE
+                                   _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (strverscmp, int, (const char *, const char *));
+# else
+#  if !@HAVE_STRVERSCMP@
 _GL_FUNCDECL_SYS (strverscmp, int, (const char *, const char *)
                                    _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1, 2)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (strverscmp, int, (const char *, const char *));
+# endif
 _GL_CXXALIASWARN (strverscmp);
 #elif defined GNULIB_POSIXCHECK
 # undef strverscmp

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/strverscmp.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/strverscmp.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/sys_stat.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/sys_stat.in.h Changed

@@ -1,5 +1,5 @@
 /* Provide a more complete sys/stat.h header file.
-   Copyright (C) 2005-2022 Free Software Foundation, Inc.
+   Copyright (C) 2005-2024 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -25,6 +25,13 @@
 #endif
 @PRAGMA_COLUMNS@
 
+/* This file uses #include_next of a system file that defines time_t.
+   For the 'year2038' module to work right, <config.h> needs to have been
+   included before.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 #if defined __need_system_sys_stat_h
 /* Special invocation convention.  */
 
@@ -48,12 +55,41 @@
 #ifndef _@GUARD_PREFIX@_SYS_STAT_H
 #define _@GUARD_PREFIX@_SYS_STAT_H
 
+/* This file uses _GL_ATTRIBUTE_NOTHROW, GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
+
+/* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions.
+ */
+#ifndef _GL_ATTRIBUTE_NOTHROW
+# if defined __cplusplus
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major >= 4
+#   if __cplusplus >= 201103L
+#    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
+#   else
+#    define _GL_ATTRIBUTE_NOTHROW throw ()
+#   endif
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# else
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__
+#   define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__))
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# endif
+#endif
+
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
 /* The definition of _GL_ARG_NONNULL is copied here.  */
 
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
+
 /* Before doing "#define mknod rpl_mknod" below, we need to include all
    headers that may declare mknod().  OS/2 kLIBC declares mknod() in
    <unistd.h>, not in <sys/stat.h>.  */
@@ -549,7 +585,7 @@
 #  endif
 _GL_CXXALIAS_SYS (futimens, int, (int fd, struct timespec const times2));
 # endif
-# if @HAVE_FUTIMENS@
+# if __GLIBC__ >= 2 && @HAVE_FUTIMENS@
 _GL_CXXALIASWARN (futimens);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -563,7 +599,11 @@
 
 #if @GNULIB_GETUMASK@
 # if !@HAVE_GETUMASK@
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+_GL_FUNCDECL_SYS (getumask, mode_t, (void) _GL_ATTRIBUTE_NOTHROW);
+#  else
 _GL_FUNCDECL_SYS (getumask, mode_t, (void));
+#  endif
 # endif
 _GL_CXXALIAS_SYS (getumask, mode_t, (void));
 # if @HAVE_GETUMASK@
@@ -716,7 +756,9 @@
 #  endif
 _GL_CXXALIAS_SYS (mkfifoat, int, (int fd, char const *file, mode_t mode));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (mkfifoat);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef mkfifoat
 # if HAVE_RAW_DECL_MKFIFOAT
@@ -773,7 +815,9 @@
 _GL_CXXALIAS_SYS (mknodat, int,
                   (int fd, char const *file, mode_t mode, dev_t dev));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (mknodat);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef mknodat
 # if HAVE_RAW_DECL_MKNODAT
@@ -937,7 +981,7 @@
 _GL_CXXALIAS_SYS (utimensat, int, (int fd, char const *name,
                                    struct timespec const times2, int flag));
 # endif
-# if @HAVE_UTIMENSAT@
+# if __GLIBC__ >= 2 && @HAVE_UTIMENSAT@
 _GL_CXXALIASWARN (utimensat);
 # endif
 #elif defined GNULIB_POSIXCHECK

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/sys_types.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/sys_types.in.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/time.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/time.in.h Changed

@@ -1,6 +1,6 @@
 /* A more-standard <time.h>.
 
-   Copyright (C) 2007-2022 Free Software Foundation, Inc.
+   Copyright (C) 2007-2024 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -20,6 +20,13 @@
 #endif
 @PRAGMA_COLUMNS@
 
+/* This file uses #include_next of a system file that defines time_t.
+   For the 'year2038' module to work right, <config.h> needs to have been
+   included before.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* Don't get in the way of glibc when it includes time.h merely to
    declare a few standard symbols, rather than to declare all the
    symbols.  (However, skip this for MinGW as it treats __need_time_t
@@ -45,6 +52,12 @@
 
 # @INCLUDE_NEXT@ @NEXT_TIME_H@
 
+/* This file uses _GL_ATTRIBUTE_DEPRECATED, GNULIB_POSIXCHECK,
+   HAVE_RAW_DECL_*.  */
+# if !_GL_CONFIG_H_INCLUDED
+#  error "Please include config.h first."
+# endif
+
 /* NetBSD 5.0 mis-defines NULL.  */
 # include <stddef.h>
 
@@ -112,23 +125,79 @@
 /* Set *TS to the current time, and return BASE.
    Upon failure, return 0.  */
 # if @GNULIB_TIMESPEC_GET@
-#  if ! @HAVE_TIMESPEC_GET@
+#  if @REPLACE_TIMESPEC_GET@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef timespec_get
+#    define timespec_get rpl_timespec_get
+#   endif
+_GL_FUNCDECL_RPL (timespec_get, int, (struct timespec *ts, int base)
+                                     _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (timespec_get, int, (struct timespec *ts, int base));
+#  else
+#   if !@HAVE_TIMESPEC_GET@
 _GL_FUNCDECL_SYS (timespec_get, int, (struct timespec *ts, int base)
                                      _GL_ARG_NONNULL ((1)));
-#  endif
+#   endif
 _GL_CXXALIAS_SYS (timespec_get, int, (struct timespec *ts, int base));
+#  endif
+#  if __GLIBC__ >= 2
 _GL_CXXALIASWARN (timespec_get);
+#  endif
+# elif defined GNULIB_POSIXCHECK
+#  undef timespec_get
+#  if HAVE_RAW_DECL_TIMESPEC_GET
+_GL_WARN_ON_USE (timespec_get, "timespec_get is unportable - "
+                 "use gnulib module timespec_get for portability");
+#  endif
 # endif
 
 /* Set *TS to the current time resolution, and return BASE.
    Upon failure, return 0.  */
 # if @GNULIB_TIMESPEC_GETRES@
-#  if ! @HAVE_TIMESPEC_GETRES@
+#  if @REPLACE_TIMESPEC_GETRES@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef timespec_getres
+#    define timespec_getres rpl_timespec_getres
+#   endif
+_GL_FUNCDECL_RPL (timespec_getres, int, (struct timespec *ts, int base)
+                                        _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (timespec_getres, int, (struct timespec *ts, int base));
+#  else
+#   if !@HAVE_TIMESPEC_GETRES@
 _GL_FUNCDECL_SYS (timespec_getres, int, (struct timespec *ts, int base)
                                         _GL_ARG_NONNULL ((1)));
-#  endif
+#   endif
 _GL_CXXALIAS_SYS (timespec_getres, int, (struct timespec *ts, int base));
+#  endif
 _GL_CXXALIASWARN (timespec_getres);
+# elif defined GNULIB_POSIXCHECK
+#  undef timespec_getres
+#  if HAVE_RAW_DECL_TIMESPEC_GETRES
+_GL_WARN_ON_USE (timespec_getres, "timespec_getres is unportable - "
+                 "use gnulib module timespec_getres for portability");
+#  endif
+# endif
+
+/* Return the number of seconds that have elapsed since the Epoch.  */
+# if @GNULIB_TIME@
+#  if @REPLACE_TIME@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    define time rpl_time
+#   endif
+_GL_FUNCDECL_RPL (time, time_t, (time_t *__tp));
+_GL_CXXALIAS_RPL (time, time_t, (time_t *__tp));
+#  else
+_GL_CXXALIAS_SYS (time, time_t, (time_t *__tp));
+#  endif
+#  if __GLIBC__ >= 2
+_GL_CXXALIASWARN (time);
+#  endif
+# elif defined GNULIB_POSIXCHECK
+#  undef time
+#  if HAVE_RAW_DECL_TIME
+_GL_WARN_ON_USE (time, "time has consistency problems - "
+                 "use gnulib module time for portability");
+#  endif
 # endif
 
 /* Sleep for at least RQTP seconds unless interrupted,  If interrupted,
@@ -154,6 +223,12 @@
                   (struct timespec const *__rqtp, struct timespec *__rmtp));
 #  endif
 _GL_CXXALIASWARN (nanosleep);
+# elif defined GNULIB_POSIXCHECK
+#  undef nanosleep
+#  if HAVE_RAW_DECL_NANOSLEEP
+_GL_WARN_ON_USE (nanosleep, "nanosleep is unportable - "
+                 "use gnulib module nanosleep for portability");
+#  endif
 # endif
 
 /* Initialize time conversion information.  */
@@ -189,6 +264,12 @@
 _GL_CXXALIAS_SYS (tzset, void, (void));
 #  endif
 _GL_CXXALIASWARN (tzset);
+# elif defined GNULIB_POSIXCHECK
+#  undef tzset
+#  if HAVE_RAW_DECL_TZSET
+_GL_WARN_ON_USE (tzset, "tzset has portability problems - "
+                 "use gnulib module tzset for portability");
+#  endif
 # endif
 
 /* Return the 'time_t' representation of TP and normalize TP.  */
@@ -205,6 +286,12 @@
 #  if __GLIBC__ >= 2
 _GL_CXXALIASWARN (mktime);
 #  endif
+# elif defined GNULIB_POSIXCHECK
+#  undef mktime
+#  if HAVE_RAW_DECL_MKTIME
+_GL_WARN_ON_USE (mktime, "mktime has portability problems - "
+                 "use gnulib module mktime for portability");
+#  endif
 # endif
 
 /* Convert TIMER to RESULT, assuming local time and UTC respectively.  See
@@ -255,6 +342,17 @@
 #  if @HAVE_DECL_LOCALTIME_R@
 _GL_CXXALIASWARN (gmtime_r);
 #  endif
+# elif defined GNULIB_POSIXCHECK
+#  undef localtime_r
+#  if HAVE_RAW_DECL_LOCALTIME_R
+_GL_WARN_ON_USE (localtime_r, "localtime_r is unportable - "
+                 "use gnulib module time_r for portability");
+#  endif
+#  undef gmtime_r
+#  if HAVE_RAW_DECL_GMTIME_R
+_GL_WARN_ON_USE (gmtime_r, "gmtime_r is unportable - "
+                 "use gnulib module time_r for portability");
+#  endif
 # endif
 
 /* Convert TIMER to RESULT, assuming local time and UTC respectively.  See
@@ -275,6 +373,12 @@
 #  if __GLIBC__ >= 2
 _GL_CXXALIASWARN (localtime);
 #  endif
+# elif defined GNULIB_POSIXCHECK
+#  undef localtime
+#  if HAVE_RAW_DECL_LOCALTIME
+_GL_WARN_ON_USE (localtime, "localtime has portability problems - "
+                 "use gnulib module localtime for portability");
+#  endif
 # endif
 
 # if 0 || @REPLACE_GMTIME@
@@ -306,6 +410,12 @@
                                      char const *restrict __format,
                                      struct tm *restrict __tm));
 _GL_CXXALIASWARN (strptime);
+# elif defined GNULIB_POSIXCHECK
+#  undef strptime
+#  if HAVE_RAW_DECL_STRPTIME
+_GL_WARN_ON_USE (strptime, "strptime is unportable - "
+                 "use gnulib module strptime for portability");
+#  endif
 # endif
 
 /* Convert *TP to a date and time string.  See
@@ -315,6 +425,9 @@
 #   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #    define ctime rpl_ctime
 #   endif
+#   ifndef __cplusplus
+_GL_ATTRIBUTE_DEPRECATED
+#   endif
 _GL_FUNCDECL_RPL (ctime, char *, (time_t const *__tp)
                                  _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (ctime, char *, (time_t const *__tp));
@@ -324,6 +437,12 @@
 #  if __GLIBC__ >= 2
 _GL_CXXALIASWARN (ctime);
 #  endif
+# elif defined GNULIB_POSIXCHECK
+#  undef ctime
+#  if HAVE_RAW_DECL_CTIME
+_GL_WARN_ON_USE (ctime, "ctime has portability problems - "
+                 "use gnulib module ctime for portability");
+#  endif
 # endif
 
 /* Convert *TP to a date and time string.  See
@@ -348,6 +467,12 @@
 #  if __GLIBC__ >= 2
 _GL_CXXALIASWARN (strftime);
 #  endif
+# elif defined GNULIB_POSIXCHECK
+#  undef strftime
+#  if HAVE_RAW_DECL_STRFTIME
+_GL_WARN_ON_USE (strftime, "strftime has portability problems - "
+                 "use gnulib module strftime-fixes for portability");
+#  endif
 # endif
 
 # if defined _GNU_SOURCE && @GNULIB_TIME_RZ@ && ! @HAVE_TIMEZONE_T@
@@ -422,7 +547,15 @@
 #   endif
 _GL_CXXALIAS_SYS (timegm, time_t, (struct tm *__tm));
 #  endif
+#  if __GLIBC__ >= 2
 _GL_CXXALIASWARN (timegm);
+#  endif
+# elif defined GNULIB_POSIXCHECK
+#  undef timegm
+#  if HAVE_RAW_DECL_TIMEGM
+_GL_WARN_ON_USE (timegm, "timegm is unportable - "
+                 "use gnulib module timegm for portability");
+#  endif
 # endif
 
 /* Encourage applications to avoid unsafe functions that can overrun
@@ -430,8 +563,10 @@
    applications should use strftime (or even sprintf) instead.  */
 # if defined GNULIB_POSIXCHECK
 #  undef asctime
+#  if HAVE_RAW_DECL_ASCTIME
 _GL_WARN_ON_USE (asctime, "asctime can overrun buffers in some cases - "
                  "better use strftime (or even sprintf) instead");
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef asctime_r
@@ -442,8 +577,10 @@
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef ctime
+#  if HAVE_RAW_DECL_CTIME
 _GL_WARN_ON_USE (ctime, "ctime can overrun buffers in some cases - "
                  "better use strftime (or even sprintf) instead");
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef ctime_r

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/unistd.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/unistd.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/unistd.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/unistd.in.h Changed

@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <unistd.h>.
-   Copyright (C) 2003-2022 Free Software Foundation, Inc.
+   Copyright (C) 2003-2024 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -40,6 +40,24 @@
 # undef _GL_INCLUDING_UNISTD_H
 #endif
 
+/* Avoid lseek bugs in FreeBSD, macOS <https://bugs.gnu.org/61386>.
+   This bug is fixed after FreeBSD 13; see <https://bugs.freebsd.org/256205>.
+   Use macOS "9999" to stand for a future fixed macOS version.  */
+#if defined __FreeBSD__ && __FreeBSD__ < 14
+# undef SEEK_DATA
+# undef SEEK_HOLE
+#elif defined __APPLE__ && defined __MACH__ && defined SEEK_DATA
+# ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
+#  include <AvailabilityMacros.h>
+# endif
+# if (!defined MAC_OS_X_VERSION_MIN_REQUIRED \
+      || MAC_OS_X_VERSION_MIN_REQUIRED < 99990000)
+#  include <sys/fcntl.h> /* It also defines the two macros.  */
+#  undef SEEK_DATA
+#  undef SEEK_HOLE
+# endif
+#endif
+
 /* Get all possible declarations of gethostname().  */
 #if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \
   && !defined _GL_INCLUDING_WINSOCK2_H
@@ -51,6 +69,12 @@
 #if !defined _@GUARD_PREFIX@_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H
 #define _@GUARD_PREFIX@_UNISTD_H
 
+/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, GNULIB_POSIXCHECK,
+   HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* NetBSD 5.0 mis-defines NULL.  Also get size_t.  */
 /* But avoid namespace pollution on glibc systems.  */
 #ifndef __GLIBC__
@@ -152,9 +176,6 @@
 # include <getopt-pfx-core.h>
 #endif
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef _GL_UNISTD_INLINE
 # define _GL_UNISTD_INLINE _GL_INLINE
@@ -541,17 +562,22 @@
    Return newfd if successful, otherwise -1 and errno set.
    See the Linux man page at
    <https://www.kernel.org/doc/man-pages/online/pages/man2/dup3.2.html>.  */
-# if @HAVE_DUP3@
+# if @REPLACE_DUP3@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef dup3
 #   define dup3 rpl_dup3
 #  endif
 _GL_FUNCDECL_RPL (dup3, int, (int oldfd, int newfd, int flags));
 _GL_CXXALIAS_RPL (dup3, int, (int oldfd, int newfd, int flags));
 # else
+#  if !@HAVE_DUP3@
 _GL_FUNCDECL_SYS (dup3, int, (int oldfd, int newfd, int flags));
+#  endif
 _GL_CXXALIAS_SYS (dup3, int, (int oldfd, int newfd, int flags));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (dup3);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef dup3
 # if HAVE_RAW_DECL_DUP3
@@ -870,7 +896,9 @@
 _GL_CXXALIAS_SYS (execvpe, int,
                   (const char *program, char * const *argv, char * const *env));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (execvpe);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef execvpe
 # if HAVE_RAW_DECL_EXECVPE
@@ -925,7 +953,9 @@
 _GL_CXXALIAS_SYS (faccessat, int,
                   (int fd, char const *file, int mode, int flag));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (faccessat);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef faccessat
 # if HAVE_RAW_DECL_FACCESSAT
@@ -941,23 +971,28 @@
    Return 0 if successful, otherwise -1 and errno set.
    See the POSIX:2008 specification
    <https://pubs.opengroup.org/onlinepubs/9699919799/functions/fchdir.html>.  */
-# if ! @HAVE_FCHDIR@
+# if @REPLACE_FCHDIR@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef fchdir
+#   define fchdir rpl_fchdir
+#  endif
+_GL_FUNCDECL_RPL (fchdir, int, (int /*fd*/));
+_GL_CXXALIAS_RPL (fchdir, int, (int /*fd*/));
+# else
+#  if !@HAVE_FCHDIR@ || !@HAVE_DECL_FCHDIR@
 _GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/));
-
+#  endif
+_GL_CXXALIAS_SYS (fchdir, int, (int /*fd*/));
+# endif
+_GL_CXXALIASWARN (fchdir);
+# if @REPLACE_FCHDIR@ || !@HAVE_FCHDIR@
 /* Gnulib internal hooks needed to maintain the fchdir metadata.  */
 _GL_EXTERN_C int _gl_register_fd (int fd, const char *filename)
      _GL_ARG_NONNULL ((2));
 _GL_EXTERN_C void _gl_unregister_fd (int fd);
 _GL_EXTERN_C int _gl_register_dup (int oldfd, int newfd);
 _GL_EXTERN_C const char *_gl_directory_name (int fd);
-
-# else
-#  if !@HAVE_DECL_FCHDIR@
-_GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/));
-#  endif
 # endif
-_GL_CXXALIAS_SYS (fchdir, int, (int /*fd*/));
-_GL_CXXALIASWARN (fchdir);
 #elif defined GNULIB_POSIXCHECK
 # undef fchdir
 # if HAVE_RAW_DECL_FCHDIR
@@ -1002,11 +1037,22 @@
    Return 0 if successful, otherwise -1 and errno set.
    See POSIX:2008 specification
    <https://pubs.opengroup.org/onlinepubs/9699919799/functions/fdatasync.html>.  */
-# if !@HAVE_FDATASYNC@ || !@HAVE_DECL_FDATASYNC@
+# if @REPLACE_FDATASYNC@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef fdatasync
+#   define fdatasync rpl_fdatasync
+#  endif
+_GL_FUNCDECL_RPL (fdatasync, int, (int fd));
+_GL_CXXALIAS_RPL (fdatasync, int, (int fd));
+# else
+#  if !@HAVE_FDATASYNC@|| !@HAVE_DECL_FDATASYNC@
 _GL_FUNCDECL_SYS (fdatasync, int, (int fd));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (fdatasync, int, (int fd));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (fdatasync);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef fdatasync
 # if HAVE_RAW_DECL_FDATASYNC
@@ -1053,7 +1099,9 @@
 #  endif
 _GL_CXXALIAS_SYS (ftruncate, int, (int fd, off_t length));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (ftruncate);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef ftruncate
 # if HAVE_RAW_DECL_FTRUNCATE
@@ -1070,10 +1118,10 @@
    or SIZE was too small.
    See the POSIX:2008 specification
    <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getcwd.html>.
-   Additionally, the gnulib module 'getcwd' guarantees the following GNU
-   extension: If BUF is NULL, an array is allocated with 'malloc'; the array
-   is SIZE bytes long, unless SIZE == 0, in which case it is as big as
-   necessary.  */
+   Additionally, the gnulib module 'getcwd' or 'getcwd-lgpl' guarantees the
+   following GNU extension: If BUF is NULL, an array is allocated with
+   'malloc'; the array is SIZE bytes long, unless SIZE == 0, in which case
+   it is as big as necessary.  */
 # if @REPLACE_GETCWD@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define getcwd rpl_getcwd
@@ -1185,11 +1233,22 @@
 
 #if @GNULIB_GETENTROPY@
 /* Fill a buffer with random bytes.  */
-# if !@HAVE_GETENTROPY@
+# if @REPLACE_GETENTROPY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getentropy
+#   define getentropy rpl_getentropy
+#  endif
+_GL_FUNCDECL_RPL (getentropy, int, (void *buffer, size_t length));
+_GL_CXXALIAS_RPL (getentropy, int, (void *buffer, size_t length));
+# else
+#  if !@HAVE_GETENTROPY@
 _GL_FUNCDECL_SYS (getentropy, int, (void *buffer, size_t length));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (getentropy, int, (void *buffer, size_t length));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (getentropy);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef getentropy
 # if HAVE_RAW_DECL_GETENTROPY
@@ -1323,7 +1382,9 @@
                                                      int size.  */
 _GL_CXXALIAS_SYS_CAST (getlogin_r, int, (char *name, size_t size));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (getlogin_r);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef getlogin_r
 # if HAVE_RAW_DECL_GETLOGIN_R
@@ -1661,7 +1722,9 @@
                   (int fd1, const char *path1, int fd2, const char *path2,
                    int flag));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (linkat);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef linkat
 # if HAVE_RAW_DECL_LINKAT
@@ -1742,8 +1805,9 @@
    Return 0 upon success, or -1 with errno set upon failure.
    See also the Linux man page at
    <https://www.kernel.org/doc/man-pages/online/pages/man2/pipe2.2.html>.  */
-# if @HAVE_PIPE2@
+# if @REPLACE_PIPE2@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pipe2
 #   define pipe2 rpl_pipe2
 #  endif
 _GL_FUNCDECL_RPL (pipe2, int, (int fd2, int flags) _GL_ARG_NONNULL ((1)));
@@ -1752,7 +1816,9 @@
 _GL_FUNCDECL_SYS (pipe2, int, (int fd2, int flags) _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_SYS (pipe2, int, (int fd2, int flags));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (pipe2);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef pipe2
 # if HAVE_RAW_DECL_PIPE2
@@ -1787,7 +1853,9 @@
 _GL_CXXALIAS_SYS (pread, ssize_t,
                   (int fd, void *buf, size_t bufsize, off_t offset));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (pread);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef pread
 # if HAVE_RAW_DECL_PREAD
@@ -1822,7 +1890,9 @@
 _GL_CXXALIAS_SYS (pwrite, ssize_t,
                   (int fd, const void *buf, size_t bufsize, off_t offset));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (pwrite);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef pwrite
 # if HAVE_RAW_DECL_PWRITE
@@ -1936,7 +2006,9 @@
                   (int fd, char const *restrict file,
                    char *restrict buf, size_t len));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (readlinkat);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef readlinkat
 # if HAVE_RAW_DECL_READLINKAT
@@ -1996,15 +2068,27 @@
 
    Platforms with no ability to set the hostname return -1 and set
    errno = ENOSYS.  */
-# if !@HAVE_SETHOSTNAME@ || !@HAVE_DECL_SETHOSTNAME@
+# if @REPLACE_SETHOSTNAME@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef sethostname
+#   define sethostname rpl_sethostname
+#  endif
+_GL_FUNCDECL_RPL (sethostname, int, (const char *name, size_t len)
+                                    _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (sethostname, int, (const char *name, size_t len));
+# else
+#  if !@HAVE_SETHOSTNAME@ || !@HAVE_DECL_SETHOSTNAME@
 _GL_FUNCDECL_SYS (sethostname, int, (const char *name, size_t len)
                                     _GL_ARG_NONNULL ((1)));
-# endif
+#  endif
 /* Need to cast, because on Solaris 11 2011-10, Mac OS X 10.5, IRIX 6.5
    and FreeBSD 6.4 the second parameter is int.  On Solaris 11
    2011-10, the first parameter is not const.  */
 _GL_CXXALIAS_SYS_CAST (sethostname, int, (const char *name, size_t len));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (sethostname);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef sethostname
 # if HAVE_RAW_DECL_SETHOSTNAME
@@ -2113,7 +2197,9 @@
 _GL_CXXALIAS_SYS (symlinkat, int,
                   (char const *contents, int fd, char const *file));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (symlinkat);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef symlinkat
 # if HAVE_RAW_DECL_SYMLINKAT
@@ -2143,7 +2229,9 @@
 #  endif
 _GL_CXXALIAS_SYS (truncate, int, (const char *filename, off_t length));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (truncate);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef truncate
 # if HAVE_RAW_DECL_TRUNCATE
@@ -2173,7 +2261,9 @@
 _GL_CXXALIAS_SYS (ttyname_r, int,
                   (int fd, char *buf, size_t buflen));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (ttyname_r);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef ttyname_r
 # if HAVE_RAW_DECL_TTYNAME_R

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/verify.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/verify.h Changed

@@ -1,6 +1,6 @@
 /* Compile-time assert-like macros.
 
-   Copyright (C) 2005-2006, 2009-2022 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2024 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -37,7 +37,7 @@
           && (4 < __GNUC__ + (6 <= __GNUC_MINOR__) || 5 <= __clang_major__)))
 #  define _GL_HAVE__STATIC_ASSERT 1
 # endif
-# if (202000 <= __STDC_VERSION__ \
+# if (202311 <= __STDC_VERSION__ \
       || (!defined __STRICT_ANSI__ && 9 <= __GNUC__))
 #  define _GL_HAVE__STATIC_ASSERT1 1
 # endif
@@ -188,9 +188,9 @@
     _gl_verify_type<(R) ? 1 : -1>
 #elif defined _GL_HAVE__STATIC_ASSERT
 # define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
-    struct {                                   \
-      _Static_assert (R, DIAGNOSTIC);          \
-      int _gl_dummy;                          \
+    struct { \
+      _Static_assert (R, DIAGNOSTIC); \
+      int _gl_dummy; \
     }
 #else
 # define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
@@ -212,8 +212,8 @@
 #elif defined _GL_HAVE__STATIC_ASSERT
 # define _GL_VERIFY(R, DIAGNOSTIC, ...) _Static_assert (R, DIAGNOSTIC)
 #else
-# define _GL_VERIFY(R, DIAGNOSTIC, ...)                                \
-    extern int (*_GL_GENSYM (_gl_verify_function) (void))	       \
+# define _GL_VERIFY(R, DIAGNOSTIC, ...) \
+    extern int (*_GL_GENSYM (_gl_verify_function) (void)) \
       _GL_VERIFY_TRUE (R, DIAGNOSTIC)
 # if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
 #  pragma GCC diagnostic ignored "-Wnested-externs"
@@ -222,28 +222,57 @@
 
 /* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h.  */
 #ifdef _GL_STATIC_ASSERT_H
-# if !defined _GL_HAVE__STATIC_ASSERT1 && !defined _Static_assert
-#  define _Static_assert(R, ...) \
-     _GL_VERIFY ((R), "static assertion failed", -)
+/* Define _Static_assert if needed.  */
+/* With clang ≥ 3.8.0 in C++ mode, _Static_assert already works and accepts
+   1 or 2 arguments.  We better don't override it, because clang's standard
+   C++ library uses static_assert inside classes in several places, and our
+   replacement via _GL_VERIFY does not work in these contexts.  */
+# if (defined __cplusplus && defined __clang__ \
+      && (4 <= __clang_major__ + (8 <= __clang_minor__)))
+#  if 5 <= __clang_major__
+/* Avoid "warning: 'static_assert' with no message is a C++17 extension".  */
+#   pragma clang diagnostic ignored "-Wc++17-extensions"
+#  else
+/* Avoid "warning: static_assert with no message is a C++1z extension".  */
+#   pragma clang diagnostic ignored "-Wc++1z-extensions"
+#  endif
+# elif !defined _GL_HAVE__STATIC_ASSERT1 && !defined _Static_assert
+#  if !defined _MSC_VER || defined __clang__
+#   define _Static_assert(...) \
+      _GL_VERIFY (__VA_ARGS__, "static assertion failed", -)
+#  else
+#   if defined __cplusplus && _MSC_VER >= 1910
+     /* In MSVC 14.1 or newer, static_assert accepts one or two arguments,
+        but _Static_assert is not defined.  */
+#    define _Static_assert static_assert
+#   else
+     /* Work around MSVC preprocessor incompatibility with ISO C; see
+        <https://stackoverflow.com/questions/5134523/>.  */
+#    define _Static_assert(R, ...) \
+       _GL_VERIFY ((R), "static assertion failed", -)
+#   endif
+#  endif
 # endif
+/* Define static_assert if needed.  */
 # if (!defined static_assert \
       && __STDC_VERSION__ < 202311 \
       && (!defined __cplusplus \
           || (__cpp_static_assert < 201411 \
-              && __GNUG__ < 6 && __clang_major__ < 6)))
+              && __GNUG__ < 6 && __clang_major__ < 6 && _MSC_VER < 1910)))
 #  if defined __cplusplus && _MSC_VER >= 1900 && !defined __clang__
 /* MSVC 14 in C++ mode supports the two-arguments static_assert but not
    the one-argument static_assert, and it does not support _Static_assert.
    We have to play preprocessor tricks to distinguish the two cases.
-   Since the MSVC preprocessor is not ISO C compliant (cf.
-   <https://stackoverflow.com/questions/5134523/>), the solution is specific
-   to MSVC.  */
+   Since the MSVC preprocessor is not ISO C compliant (see above),.
+   the solution is specific to MSVC.  */
 #   define _GL_EXPAND(x) x
 #   define _GL_SA1(a1) static_assert ((a1), "static assertion failed")
 #   define _GL_SA2 static_assert
 #   define _GL_SA3 static_assert
 #   define _GL_SA_PICK(x1,x2,x3,x4,...) x4
 #   define static_assert(...) _GL_EXPAND(_GL_SA_PICK(__VA_ARGS__,_GL_SA3,_GL_SA2,_GL_SA1)) (__VA_ARGS__)
+/* Avoid "fatal error C1189: #error:  The C++ Standard Library forbids macroizing keywords."  */
+#   define _ALLOW_KEYWORD_MACROS 1
 #  else
 #   define static_assert _Static_assert /* C11 requires this #define. */
 #  endif
@@ -252,7 +281,9 @@
 
 /* @assert.h omit start@  */
 
-#if 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__))
+#if defined __clang_major__ && __clang_major__ < 5
+# define _GL_HAS_BUILTIN_TRAP 0
+#elif 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__))
 # define _GL_HAS_BUILTIN_TRAP 1
 #elif defined __has_builtin
 # define _GL_HAS_BUILTIN_TRAP __has_builtin (__builtin_trap)
@@ -260,12 +291,16 @@
 # define _GL_HAS_BUILTIN_TRAP 0
 #endif
 
-#if 4 < __GNUC__ + (5 <= __GNUC_MINOR__)
-# define _GL_HAS_BUILTIN_UNREACHABLE 1
-#elif defined __has_builtin
-# define _GL_HAS_BUILTIN_UNREACHABLE __has_builtin (__builtin_unreachable)
-#else
-# define _GL_HAS_BUILTIN_UNREACHABLE 0
+#ifndef _GL_HAS_BUILTIN_UNREACHABLE
+# if defined __clang_major__ && __clang_major__ < 5
+#  define _GL_HAS_BUILTIN_UNREACHABLE 0
+# elif 4 < __GNUC__ + (5 <= __GNUC_MINOR__)
+#  define _GL_HAS_BUILTIN_UNREACHABLE 1
+# elif defined __has_builtin
+#  define _GL_HAS_BUILTIN_UNREACHABLE __has_builtin (__builtin_unreachable)
+# else
+#  define _GL_HAS_BUILTIN_UNREACHABLE 0
+# endif
 #endif
 
 /* Each of these macros verifies that its argument R is nonzero.  To

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/version-etc.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/version-etc.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/version-etc.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/version-etc.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/warn-on-use.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/warn-on-use.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/gl/xalloc-oversized.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/gl/xalloc-oversized.h Changed

@@ -1,6 +1,6 @@
 /* xalloc-oversized.h -- memory allocation size checking
 
-   Copyright (C) 1990-2000, 2003-2004, 2006-2022 Free Software Foundation, Inc.
+   Copyright (C) 1990-2000, 2003-2004, 2006-2024 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -48,13 +48,13 @@
 #if 7 <= __GNUC__ && !defined __clang__ && PTRDIFF_MAX < SIZE_MAX
 # define xalloc_oversized(n, s) \
    __builtin_mul_overflow_p (n, s, (ptrdiff_t) 1)
-#elif (5 <= __GNUC__ && !defined __ICC && !__STRICT_ANSI__ \
-       && PTRDIFF_MAX < SIZE_MAX)
+#elif 5 <= __GNUC__ && !defined __ICC && PTRDIFF_MAX < SIZE_MAX
 # define xalloc_oversized(n, s) \
    (__builtin_constant_p (n) && __builtin_constant_p (s) \
     ? __xalloc_oversized (n, s) \
-    : ({ ptrdiff_t __xalloc_count; \
-         __builtin_mul_overflow (n, s, &__xalloc_count); }))
+    : __extension__ \
+        ({ ptrdiff_t __xalloc_count; \
+           __builtin_mul_overflow (n, s, &__xalloc_count); }))
 
 /* Other compilers use integer division; this may be slower but is
    more portable.  */

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/Makefile.am -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/Makefile.am Changed

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2022 Simon Josefsson
+# Copyright (C) 2011-2024 Simon Josefsson
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -13,12 +13,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AM_CPPFLAGS =
-
-AM_CPPFLAGS += -DIDN2_BUILDING -DSRCDIR=\"$(srcdir)\"
+AM_CPPFLAGS = -DIDN2_BUILDING -DSRCDIR=\"$(srcdir)\"
 AM_CPPFLAGS += -I$(top_builddir)/gl -I$(top_srcdir)/gl
 AM_CPPFLAGS += -I$(top_srcdir)/unistring/ -I$(top_builddir)/unistring/
-AM_CFLAGS = $(WARN_CFLAGS)
+
+AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
 AM_CFLAGS += $(CFLAG_VISIBILITY) $(CODE_COVERAGE_CFLAGS)
 
 lib_LTLIBRARIES = libidn2.la
@@ -32,7 +31,7 @@
 libidn2_la_SOURCES += bidi.h bidi.c
 libidn2_la_SOURCES += version.c
 libidn2_la_SOURCES += error.c
-libidn2_la_SOURCES += punycode.h puny_encode.c puny_decode.c
+libidn2_la_SOURCES += punycode.c
 libidn2_la_SOURCES += free.c
 libidn2_la_SOURCES += data.h data.c
 libidn2_la_SOURCES += tr46map.h tr46map.c
@@ -103,7 +102,7 @@
 if HAVE_LD_VERSION_SCRIPT
 libidn2_la_LDFLAGS += -Wl,--version-script=$(srcdir)/idn2.map
 else
-libidn2_la_LDFLAGS += -export-symbols-regex '^idn2_.*'
+libidn2_la_LDFLAGS += -export-symbols-regex '^(idn2_.*|_idn2_punycode_encode|_idn2_punycode_decode)$$'
 endif
 
 if HAVE_LD_OUTPUT_DEF

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/Makefile.in -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/Makefile.in Changed

@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2011-2022 Simon Josefsson
+# Copyright (C) 2011-2024 Simon Josefsson
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -106,13 +106,12 @@
 build_triplet = @build@
 host_triplet = @host@
 @HAVE_LD_VERSION_SCRIPT_TRUE@am__append_1 = -Wl,--version-script=$(srcdir)/idn2.map
-@HAVE_LD_VERSION_SCRIPT_FALSE@am__append_2 = -export-symbols-regex '^idn2_.*'
+@HAVE_LD_VERSION_SCRIPT_FALSE@am__append_2 = -export-symbols-regex '^(idn2_.*|_idn2_punycode_encode|_idn2_punycode_decode)$$'
 @HAVE_LD_OUTPUT_DEF_TRUE@am__append_3 = -Wl,--output-def,libidn2-$(DLL_VERSION).def
 @HAVE_LD_OUTPUT_DEF_TRUE@am__append_4 = $(defexec_DATA)
 subdir = lib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/unistring/m4/codeset.m4 \
-	$(top_srcdir)/unistring/m4/free.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/unistring/m4/free.m4 \
 	$(top_srcdir)/unistring/m4/gnulib-comp.m4 \
 	$(top_srcdir)/unistring/m4/host-cpu-c-abi.m4 \
 	$(top_srcdir)/unistring/m4/iconv.m4 \
@@ -126,15 +125,19 @@
 	$(top_srcdir)/unistring/m4/libunistring-optional.m4 \
 	$(top_srcdir)/unistring/m4/libunistring.m4 \
 	$(top_srcdir)/unistring/m4/localcharset.m4 \
+	$(top_srcdir)/unistring/m4/unictype_h.m4 \
+	$(top_srcdir)/unistring/m4/uninorm_h.m4 \
 	$(top_srcdir)/unistring/m4/wchar_h.m4 \
 	$(top_srcdir)/gl/m4/00gnulib.m4 \
 	$(top_srcdir)/gl/m4/__inline.m4 \
 	$(top_srcdir)/gl/m4/absolute-header.m4 \
 	$(top_srcdir)/gl/m4/alloca.m4 $(top_srcdir)/gl/m4/assert_h.m4 \
 	$(top_srcdir)/gl/m4/c-bool.m4 $(top_srcdir)/gl/m4/close.m4 \
+	$(top_srcdir)/gl/m4/codeset.m4 \
 	$(top_srcdir)/gl/m4/double-slash-root.m4 \
 	$(top_srcdir)/gl/m4/dup2.m4 $(top_srcdir)/gl/m4/eealloc.m4 \
 	$(top_srcdir)/gl/m4/errno_h.m4 $(top_srcdir)/gl/m4/error.m4 \
+	$(top_srcdir)/gl/m4/error_h.m4 \
 	$(top_srcdir)/gl/m4/extensions.m4 \
 	$(top_srcdir)/gl/m4/extern-inline.m4 \
 	$(top_srcdir)/gl/m4/fcntl-o.m4 $(top_srcdir)/gl/m4/fcntl.m4 \
@@ -149,12 +152,14 @@
 	$(top_srcdir)/gl/m4/inline.m4 $(top_srcdir)/gl/m4/largefile.m4 \
 	$(top_srcdir)/gl/m4/ld-output-def.m4 \
 	$(top_srcdir)/gl/m4/ld-version-script.m4 \
-	$(top_srcdir)/gl/m4/limits-h.m4 $(top_srcdir)/gl/m4/malloca.m4 \
+	$(top_srcdir)/gl/m4/limits-h.m4 \
+	$(top_srcdir)/gl/m4/locale-fr.m4 \
+	$(top_srcdir)/gl/m4/malloca.m4 \
 	$(top_srcdir)/gl/m4/manywarnings.m4 \
 	$(top_srcdir)/gl/m4/mode_t.m4 \
 	$(top_srcdir)/gl/m4/msvc-inval.m4 \
 	$(top_srcdir)/gl/m4/msvc-nothrow.m4 \
-	$(top_srcdir)/gl/m4/multiarch.m4 \
+	$(top_srcdir)/gl/m4/multiarch.m4 $(top_srcdir)/gl/m4/musl.m4 \
 	$(top_srcdir)/gl/m4/nocrash.m4 $(top_srcdir)/gl/m4/off_t.m4 \
 	$(top_srcdir)/gl/m4/open-cloexec.m4 \
 	$(top_srcdir)/gl/m4/open-slash.m4 $(top_srcdir)/gl/m4/open.m4 \
@@ -162,9 +167,9 @@
 	$(top_srcdir)/gl/m4/rawmemchr.m4 \
 	$(top_srcdir)/gl/m4/ssize_t.m4 \
 	$(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \
-	$(top_srcdir)/gl/m4/stdalign.m4 $(top_srcdir)/gl/m4/stdarg.m4 \
-	$(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \
-	$(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \
+	$(top_srcdir)/gl/m4/stdarg.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \
+	$(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \
+	$(top_srcdir)/gl/m4/stdlib_h.m4 \
 	$(top_srcdir)/gl/m4/strchrnul.m4 \
 	$(top_srcdir)/gl/m4/strerror.m4 \
 	$(top_srcdir)/gl/m4/string_h.m4 \
@@ -178,8 +183,7 @@
 	$(top_srcdir)/gl/m4/visibility.m4 \
 	$(top_srcdir)/gl/m4/warn-on-use.m4 \
 	$(top_srcdir)/gl/m4/warnings.m4 $(top_srcdir)/gl/m4/wchar_t.m4 \
-	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/year2038.m4 \
-	$(top_srcdir)/gl/m4/zzgnulib.m4 \
+	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/zzgnulib.m4 \
 	$(top_srcdir)/m4/ax_ac_append_to_file.m4 \
 	$(top_srcdir)/m4/ax_ac_print_to_file.m4 \
 	$(top_srcdir)/m4/ax_add_am_macro_static.m4 \
@@ -237,8 +241,8 @@
 	../unistring/libunistring.la $(am__DEPENDENCIES_1) \
 	../gl/libgnu.la
 am_libidn2_la_OBJECTS = idna.lo lookup.lo decode.lo register.lo \
-	bidi.lo version.lo error.lo puny_encode.lo puny_decode.lo \
-	free.lo data.lo tr46map.lo tables.lo context.lo
+	bidi.lo version.lo error.lo punycode.lo free.lo data.lo \
+	tr46map.lo tables.lo context.lo
 libidn2_la_OBJECTS = $(am_libidn2_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -266,9 +270,9 @@
 	./$(DEPDIR)/data.Plo ./$(DEPDIR)/decode.Plo \
 	./$(DEPDIR)/error.Plo ./$(DEPDIR)/free.Plo \
 	./$(DEPDIR)/idna.Plo ./$(DEPDIR)/lookup.Plo \
-	./$(DEPDIR)/puny_decode.Plo ./$(DEPDIR)/puny_encode.Plo \
-	./$(DEPDIR)/register.Plo ./$(DEPDIR)/tables.Plo \
-	./$(DEPDIR)/tr46map.Plo ./$(DEPDIR)/version.Plo
+	./$(DEPDIR)/punycode.Plo ./$(DEPDIR)/register.Plo \
+	./$(DEPDIR)/tables.Plo ./$(DEPDIR)/tr46map.Plo \
+	./$(DEPDIR)/version.Plo
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -459,6 +463,7 @@
 GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@
 GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@
 GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@
+GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@
 GL_GNULIB_GETSUBOPT = @GL_GNULIB_GETSUBOPT@
 GL_GNULIB_GETUMASK = @GL_GNULIB_GETUMASK@
 GL_GNULIB_GETUSERSHELL = @GL_GNULIB_GETUSERSHELL@
@@ -488,6 +493,7 @@
 GL_GNULIB_MBSSPN = @GL_GNULIB_MBSSPN@
 GL_GNULIB_MBSSTR = @GL_GNULIB_MBSSTR@
 GL_GNULIB_MBSTOK_R = @GL_GNULIB_MBSTOK_R@
+GL_GNULIB_MBSTOWCS = @GL_GNULIB_MBSTOWCS@
 GL_GNULIB_MBTOWC = @GL_GNULIB_MBTOWC@
 GL_GNULIB_MDA_ACCESS = @GL_GNULIB_MDA_ACCESS@
 GL_GNULIB_MDA_CHDIR = @GL_GNULIB_MDA_CHDIR@
@@ -533,6 +539,7 @@
 GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@
 GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@
 GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@
+GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@
 GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@
 GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@
 GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@
@@ -570,6 +577,7 @@
 GL_GNULIB_PUTS = @GL_GNULIB_PUTS@
 GL_GNULIB_PWRITE = @GL_GNULIB_PWRITE@
 GL_GNULIB_QSORT_R = @GL_GNULIB_QSORT_R@
+GL_GNULIB_RAND = @GL_GNULIB_RAND@
 GL_GNULIB_RANDOM = @GL_GNULIB_RANDOM@
 GL_GNULIB_RANDOM_R = @GL_GNULIB_RANDOM_R@
 GL_GNULIB_RAWMEMCHR = @GL_GNULIB_RAWMEMCHR@
@@ -625,6 +633,7 @@
 GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@
 GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@
 GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@
+GL_GNULIB_TIME = @GL_GNULIB_TIME@
 GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@
 GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@
 GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@
@@ -702,6 +711,7 @@
 GL_UNISTRING_GNULIB_GETPAGESIZE = @GL_UNISTRING_GNULIB_GETPAGESIZE@
 GL_UNISTRING_GNULIB_GETPASS = @GL_UNISTRING_GNULIB_GETPASS@
 GL_UNISTRING_GNULIB_GETPASS_GNU = @GL_UNISTRING_GNULIB_GETPASS_GNU@
+GL_UNISTRING_GNULIB_GETPROGNAME = @GL_UNISTRING_GNULIB_GETPROGNAME@
 GL_UNISTRING_GNULIB_GETSUBOPT = @GL_UNISTRING_GNULIB_GETSUBOPT@
 GL_UNISTRING_GNULIB_GETUSERSHELL = @GL_UNISTRING_GNULIB_GETUSERSHELL@
 GL_UNISTRING_GNULIB_GRANTPT = @GL_UNISTRING_GNULIB_GRANTPT@
@@ -735,6 +745,8 @@
 GL_UNISTRING_GNULIB_MBSSPN = @GL_UNISTRING_GNULIB_MBSSPN@
 GL_UNISTRING_GNULIB_MBSSTR = @GL_UNISTRING_GNULIB_MBSSTR@
 GL_UNISTRING_GNULIB_MBSTOK_R = @GL_UNISTRING_GNULIB_MBSTOK_R@
+GL_UNISTRING_GNULIB_MBSTOWCS = @GL_UNISTRING_GNULIB_MBSTOWCS@
+GL_UNISTRING_GNULIB_MBSZERO = @GL_UNISTRING_GNULIB_MBSZERO@
 GL_UNISTRING_GNULIB_MBTOWC = @GL_UNISTRING_GNULIB_MBTOWC@
 GL_UNISTRING_GNULIB_MDA_ACCESS = @GL_UNISTRING_GNULIB_MDA_ACCESS@
 GL_UNISTRING_GNULIB_MDA_CHDIR = @GL_UNISTRING_GNULIB_MDA_CHDIR@
@@ -769,6 +781,7 @@
 GL_UNISTRING_GNULIB_MEMMEM = @GL_UNISTRING_GNULIB_MEMMEM@
 GL_UNISTRING_GNULIB_MEMPCPY = @GL_UNISTRING_GNULIB_MEMPCPY@
 GL_UNISTRING_GNULIB_MEMRCHR = @GL_UNISTRING_GNULIB_MEMRCHR@
+GL_UNISTRING_GNULIB_MEMSET_EXPLICIT = @GL_UNISTRING_GNULIB_MEMSET_EXPLICIT@
 GL_UNISTRING_GNULIB_MKDTEMP = @GL_UNISTRING_GNULIB_MKDTEMP@
 GL_UNISTRING_GNULIB_MKOSTEMP = @GL_UNISTRING_GNULIB_MKOSTEMP@
 GL_UNISTRING_GNULIB_MKOSTEMPS = @GL_UNISTRING_GNULIB_MKOSTEMPS@
@@ -784,6 +797,7 @@
 GL_UNISTRING_GNULIB_PUTENV = @GL_UNISTRING_GNULIB_PUTENV@
 GL_UNISTRING_GNULIB_PWRITE = @GL_UNISTRING_GNULIB_PWRITE@
 GL_UNISTRING_GNULIB_QSORT_R = @GL_UNISTRING_GNULIB_QSORT_R@
+GL_UNISTRING_GNULIB_RAND = @GL_UNISTRING_GNULIB_RAND@
 GL_UNISTRING_GNULIB_RANDOM = @GL_UNISTRING_GNULIB_RANDOM@
 GL_UNISTRING_GNULIB_RANDOM_R = @GL_UNISTRING_GNULIB_RANDOM_R@
 GL_UNISTRING_GNULIB_RAWMEMCHR = @GL_UNISTRING_GNULIB_RAWMEMCHR@
@@ -832,6 +846,141 @@
 GL_UNISTRING_GNULIB_SYSTEM_POSIX = @GL_UNISTRING_GNULIB_SYSTEM_POSIX@
 GL_UNISTRING_GNULIB_TRUNCATE = @GL_UNISTRING_GNULIB_TRUNCATE@
 GL_UNISTRING_GNULIB_TTYNAME_R = @GL_UNISTRING_GNULIB_TTYNAME_R@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE@
 GL_UNISTRING_GNULIB_UNISTD_H_GETOPT = @GL_UNISTRING_GNULIB_UNISTD_H_GETOPT@
 GL_UNISTRING_GNULIB_UNISTD_H_NONBLOCKING = @GL_UNISTRING_GNULIB_UNISTD_H_NONBLOCKING@
 GL_UNISTRING_GNULIB_UNISTD_H_SIGPIPE = @GL_UNISTRING_GNULIB_UNISTD_H_SIGPIPE@
@@ -870,6 +1019,7 @@
 GL_UNISTRING_GNULIB_WCTOB = @GL_UNISTRING_GNULIB_WCTOB@
 GL_UNISTRING_GNULIB_WCTOMB = @GL_UNISTRING_GNULIB_WCTOMB@
 GL_UNISTRING_GNULIB_WCWIDTH = @GL_UNISTRING_GNULIB_WCWIDTH@
+GL_UNISTRING_GNULIB_WGETCWD = @GL_UNISTRING_GNULIB_WGETCWD@
 GL_UNISTRING_GNULIB_WMEMCHR = @GL_UNISTRING_GNULIB_WMEMCHR@
 GL_UNISTRING_GNULIB_WMEMCMP = @GL_UNISTRING_GNULIB_WMEMCMP@
 GL_UNISTRING_GNULIB_WMEMCPY = @GL_UNISTRING_GNULIB_WMEMCPY@
@@ -881,7 +1031,6 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@
-GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
@@ -917,6 +1066,7 @@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
+HAVE_DECL_GETW = @HAVE_DECL_GETW@
 HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
 HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
 HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@
@@ -924,6 +1074,8 @@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
+HAVE_DECL_PROGRAM_INVOCATION_NAME = @HAVE_DECL_PROGRAM_INVOCATION_NAME@
+HAVE_DECL_PUTW = @HAVE_DECL_PUTW@
 HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
 HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@
@@ -945,6 +1097,9 @@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP3 = @HAVE_DUP3@
+HAVE_ERROR = @HAVE_ERROR@
+HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@
+HAVE_ERROR_H = @HAVE_ERROR_H@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
 HAVE_EXECVPE = @HAVE_EXECVPE@
 HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@
@@ -971,10 +1126,13 @@
 HAVE_GETOPT_H = @HAVE_GETOPT_H@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETPASS = @HAVE_GETPASS@
+HAVE_GETPROGNAME = @HAVE_GETPROGNAME@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
 HAVE_GETUMASK = @HAVE_GETUMASK@
 HAVE_GRANTPT = @HAVE_GRANTPT@
 HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_IMAXABS = @HAVE_IMAXABS@
+HAVE_IMAXDIV = @HAVE_IMAXDIV@
 HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@
 HAVE_INITSTATE = @HAVE_INITSTATE@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -993,6 +1151,7 @@
 HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
 HAVE_MBTOWC = @HAVE_MBTOWC@
 HAVE_MEMPCPY = @HAVE_MEMPCPY@
+HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@
 HAVE_MKDIRAT = @HAVE_MKDIRAT@
 HAVE_MKDTEMP = @HAVE_MKDTEMP@
 HAVE_MKFIFO = @HAVE_MKFIFO@
@@ -1068,6 +1227,7 @@
 HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@
 HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNISTRING_WOE32DLL_H = @HAVE_UNISTRING_WOE32DLL_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
 HAVE_USLEEP = @HAVE_USLEEP@
@@ -1129,6 +1289,10 @@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LCOV = @LCOV@
+LC_COLLATE_IMPLEMENTED = @LC_COLLATE_IMPLEMENTED@
+LC_MONETARY_IMPLEMENTED = @LC_MONETARY_IMPLEMENTED@
+LC_NUMERIC_IMPLEMENTED = @LC_NUMERIC_IMPLEMENTED@
+LC_TIME_IMPLEMENTED = @LC_TIME_IMPLEMENTED@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -1148,6 +1312,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
 LOG_VALGRIND = @LOG_VALGRIND@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
@@ -1168,6 +1333,7 @@
 NEXT_ASSERT_H = @NEXT_ASSERT_H@
 NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
+NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
@@ -1185,6 +1351,7 @@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
+NEXT_ERROR_H = @NEXT_ERROR_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
@@ -1240,6 +1407,9 @@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
+REPLACE_DUP3 = @REPLACE_DUP3@
+REPLACE_ERROR = @REPLACE_ERROR@
+REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@
 REPLACE_EXECL = @REPLACE_EXECL@
 REPLACE_EXECLE = @REPLACE_EXECLE@
 REPLACE_EXECLP = @REPLACE_EXECLP@
@@ -1248,10 +1418,12 @@
 REPLACE_EXECVP = @REPLACE_EXECVP@
 REPLACE_EXECVPE = @REPLACE_EXECVPE@
 REPLACE_FACCESSAT = @REPLACE_FACCESSAT@
+REPLACE_FCHDIR = @REPLACE_FCHDIR@
 REPLACE_FCHMODAT = @REPLACE_FCHMODAT@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
+REPLACE_FDATASYNC = @REPLACE_FDATASYNC@
 REPLACE_FDOPEN = @REPLACE_FDOPEN@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FFSLL = @REPLACE_FFSLL@
@@ -1273,16 +1445,22 @@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
 REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
 REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
+REPLACE_GETENTROPY = @REPLACE_GETENTROPY@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
+REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@
 REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETPASS = @REPLACE_GETPASS@
 REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@
+REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@
+REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@
 REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
+REPLACE_IMAXABS = @REPLACE_IMAXABS@
+REPLACE_IMAXDIV = @REPLACE_IMAXDIV@
 REPLACE_INITSTATE = @REPLACE_INITSTATE@
 REPLACE_ISATTY = @REPLACE_ISATTY@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
@@ -1300,14 +1478,20 @@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_MBSTOWCS = @REPLACE_MBSTOWCS@
 REPLACE_MBTOWC = @REPLACE_MBTOWC@
+REPLACE_MB_CUR_MAX = @REPLACE_MB_CUR_MAX@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
+REPLACE_MEMPCPY = @REPLACE_MEMPCPY@
+REPLACE_MEMSET_EXPLICIT = @REPLACE_MEMSET_EXPLICIT@
 REPLACE_MKDIR = @REPLACE_MKDIR@
 REPLACE_MKFIFO = @REPLACE_MKFIFO@
 REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@
 REPLACE_MKNOD = @REPLACE_MKNOD@
 REPLACE_MKNODAT = @REPLACE_MKNODAT@
+REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@
+REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@
 REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
 REPLACE_MKTIME = @REPLACE_MKTIME@
 REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
@@ -1316,8 +1500,10 @@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
 REPLACE_PERROR = @REPLACE_PERROR@
+REPLACE_PIPE2 = @REPLACE_PIPE2@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@
+REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
 REPLACE_PTSNAME = @REPLACE_PTSNAME@
@@ -1325,6 +1511,7 @@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
 REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RAND = @REPLACE_RAND@
 REPLACE_RANDOM = @REPLACE_RANDOM@
 REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
 REPLACE_READ = @REPLACE_READ@
@@ -1339,6 +1526,7 @@
 REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SETENV = @REPLACE_SETENV@
+REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@
 REPLACE_SETSTATE = @REPLACE_SETSTATE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
@@ -1346,6 +1534,7 @@
 REPLACE_STAT = @REPLACE_STAT@
 REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
+REPLACE_STPCPY = @REPLACE_STPCPY@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
 REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
@@ -1368,9 +1557,13 @@
 REPLACE_STRTOUL = @REPLACE_STRTOUL@
 REPLACE_STRTOULL = @REPLACE_STRTOULL@
 REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
+REPLACE_STRVERSCMP = @REPLACE_STRVERSCMP@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
+REPLACE_TIME = @REPLACE_TIME@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
+REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@
+REPLACE_TIMESPEC_GETRES = @REPLACE_TIMESPEC_GETRES@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
 REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
@@ -1387,21 +1580,26 @@
 REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@
 REPLACE_VSPRINTF = @REPLACE_VSPRINTF@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSCMP = @REPLACE_WCSCMP@
 REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
+REPLACE_WCSNCMP = @REPLACE_WCSNCMP@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
+REPLACE_WCSSTR = @REPLACE_WCSSTR@
 REPLACE_WCSTOK = @REPLACE_WCSTOK@
 REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
 REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+REPLACE_WMEMCMP = @REPLACE_WMEMCMP@
+REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@
 REPLACE_WRITE = @REPLACE_WRITE@
+REPLACE__EXIT = @REPLACE__EXIT@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
-STDALIGN_H = @STDALIGN_H@
 STDARG_H = @STDARG_H@
 STDCKDINT_H = @STDCKDINT_H@
 STDDEF_H = @STDDEF_H@
@@ -1424,6 +1622,8 @@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WERROR_CFLAGS = @WERROR_CFLAGS@
+WERROR_TESTS_CFLAGS = @WERROR_TESTS_CFLAGS@
 WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
 WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
@@ -1504,13 +1704,14 @@
 AM_CPPFLAGS = -DIDN2_BUILDING -DSRCDIR=\"$(srcdir)\" \
 	-I$(top_builddir)/gl -I$(top_srcdir)/gl \
 	-I$(top_srcdir)/unistring/ -I$(top_builddir)/unistring/
-AM_CFLAGS = $(WARN_CFLAGS) $(CFLAG_VISIBILITY) $(CODE_COVERAGE_CFLAGS)
+AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) $(CFLAG_VISIBILITY) \
+	$(CODE_COVERAGE_CFLAGS)
 lib_LTLIBRARIES = libidn2.la
 include_HEADERS = idn2.h
 libidn2_la_SOURCES = idn2.map idn2.h idna.h idna.c lookup.c decode.c \
-	register.c bidi.h bidi.c version.c error.c punycode.h \
-	puny_encode.c puny_decode.c free.c data.h data.c tr46map.h \
-	tr46map.c tables.h tables.c context.h context.c
+	register.c bidi.h bidi.c version.c error.c punycode.c free.c \
+	data.h data.c tr46map.h tr46map.c tables.h tables.c context.h \
+	context.c
 libidn2_la_LIBADD = $(LTLIBICONV) $(LTLIBINTL) \
 	../unistring/libunistring.la $(LTLIBUNISTRING) ../gl/libgnu.la
 libidn2_la_LDFLAGS = -version-info \
@@ -1622,8 +1823,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/free.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idna.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lookup.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/puny_decode.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/puny_encode.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/punycode.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/register.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tables.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tr46map.Plo@am__quote@ # am--include-marker
@@ -1849,8 +2049,7 @@
 	-rm -f ./$(DEPDIR)/free.Plo
 	-rm -f ./$(DEPDIR)/idna.Plo
 	-rm -f ./$(DEPDIR)/lookup.Plo
-	-rm -f ./$(DEPDIR)/puny_decode.Plo
-	-rm -f ./$(DEPDIR)/puny_encode.Plo
+	-rm -f ./$(DEPDIR)/punycode.Plo
 	-rm -f ./$(DEPDIR)/register.Plo
 	-rm -f ./$(DEPDIR)/tables.Plo
 	-rm -f ./$(DEPDIR)/tr46map.Plo
@@ -1908,8 +2107,7 @@
 	-rm -f ./$(DEPDIR)/free.Plo
 	-rm -f ./$(DEPDIR)/idna.Plo
 	-rm -f ./$(DEPDIR)/lookup.Plo
-	-rm -f ./$(DEPDIR)/puny_decode.Plo
-	-rm -f ./$(DEPDIR)/puny_encode.Plo
+	-rm -f ./$(DEPDIR)/punycode.Plo
 	-rm -f ./$(DEPDIR)/register.Plo
 	-rm -f ./$(DEPDIR)/tables.Plo
 	-rm -f ./$(DEPDIR)/tr46map.Plo

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/bidi.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/bidi.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/bidi.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/bidi.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/context.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/context.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/context.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/context.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/data.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/data.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/decode.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/decode.c Changed

@@ -1,5 +1,5 @@
-/* lookup.c - implementation of IDNA2008 lookup functions
-   Copyright (C) 2011-2022 Simon Josefsson
+/* decode.c - implementation of IDNA2008 decoding functions
+   Copyright (C) 2011-2024 Simon Josefsson
 
    Libidn2 is free software: you can redistribute it and/or modify it
    under the terms of either:
@@ -33,8 +33,6 @@
 #include <errno.h>		/* errno */
 #include <stdlib.h>		/* malloc, free */
 
-#include "punycode.h"
-
 #include <unitypes.h>
 #include <uniconv.h>		/* u8_strconv_from_locale */
 #include <unistr.h>		/* u8_to_u32, u32_cpy, ... */
@@ -61,7 +59,7 @@
  * Since: 2.0.0
  **/
 int
-idn2_to_unicode_8z4z (const char *input, uint32_t ** output,
+idn2_to_unicode_8z4z (const char *input, uint32_t **output,
 		      G_GNUC_UNUSED int flags)
 {
   uint32_t *domain_u32;
@@ -92,8 +90,8 @@
 	{
 	  s += 4;
 
-	  rc = _idn2_punycode_decode_internal (e - s, (char *) s,
-					       &label_len, label_u32);
+	  rc = idn2_punycode_decode ((char *) s, e - s,
+				     label_u32, &label_len);
 	  if (rc)
 	    return rc;
 
@@ -180,7 +178,7 @@
  * Since: 2.0.0
  **/
 int
-idn2_to_unicode_4z4z (const uint32_t * input, uint32_t ** output, int flags)
+idn2_to_unicode_4z4z (const uint32_t *input, uint32_t **output, int flags)
 {
   uint8_t *input_u8;
   uint32_t *output_u32;
@@ -243,7 +241,7 @@
  * Since: 2.0.0
  **/
 int
-idn2_to_unicode_44i (const uint32_t * in, size_t inlen, uint32_t * out,
+idn2_to_unicode_44i (const uint32_t *in, size_t inlen, uint32_t *out,
 		     size_t *outlen, int flags)
 {
   uint32_t *input_u32;

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/error.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/error.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/free.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/free.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/gendata.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/gendata.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/gentr46map.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/gentr46map.c Changed

@@ -1,5 +1,5 @@
 /* gentr46map.c - generate TR46 lookup tables
-   Copyright (C) 2016-2022 Tim Ruehsen
+   Copyright (C) 2016-2024 Tim Ruehsen
 
    Libidn2 is free software: you can redistribute it and/or modify it
    under the terms of either:
@@ -26,6 +26,8 @@
    not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <config.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -130,7 +132,7 @@
 }
 
 static size_t
-_u32_stream_len (uint32_t * src, size_t len)
+_u32_stream_len (uint32_t *src, size_t len)
 {
   unsigned it;
   size_t n = 0;
@@ -162,12 +164,10 @@
 }
 
 static size_t
-_u32_to_stream (uint8_t * dst, size_t dst_size, uint32_t * src, size_t len)
+_u32_to_stream (uint8_t *dst, size_t dst_size, uint32_t *src, size_t len)
 {
   unsigned it;
-  size_t n = 0;
-
-  n = _u32_stream_len (src, len);
+  size_t n = _u32_stream_len (src, len);
 
   if (!dst)
     return n;
@@ -214,7 +214,7 @@
 
 /* copy 'n' codepoints from stream 'src' to 'dst' */
 static void
-_copy_from_stream (uint32_t * dst, const uint8_t * src, size_t n)
+_copy_from_stream (uint32_t *dst, const uint8_t *src, size_t n)
 {
   uint32_t cp = 0;
 
@@ -288,7 +288,7 @@
       uint32_t cp, tmp20 = { 0 }, tmp220 = { 0 };
       int pos;
 
-      while ((n = sscanf (mapping, " %X%n", &cp, &pos)) == 1)
+      while (sscanf (mapping, " %X%n", &cp, &pos) == 1)
 	{
 	  if (mapdata_pos >= countof (genmapdata))
 	    {
@@ -346,7 +346,7 @@
 }
 
 static int
-_compare_map (IDNAMap_gen * m1, IDNAMap_gen * m2)
+_compare_map (IDNAMap_gen *m1, IDNAMap_gen *m2)
 {
   if (m1->cp1 < m2->cp1)
     return -1;
@@ -405,7 +405,7 @@
 }
 
 static int
-_compare_map_by_maplen (IDNAMap_gen * m1, IDNAMap_gen * m2)
+_compare_map_by_maplen (IDNAMap_gen *m1, IDNAMap_gen *m2)
 {
   if (m1->nmappings != m2->nmappings)
     return m2->nmappings - m1->nmappings;
@@ -436,7 +436,7 @@
 */
 
 static uint8_t *
-_u8_memmem (uint8_t * haystack, size_t hlen, uint8_t * needle, size_t nlen)
+_u8_memmem (uint8_t *haystack, size_t hlen, uint8_t *needle, size_t nlen)
 {
   uint8_t *p;
 
@@ -453,7 +453,7 @@
 }
 
 static size_t
-_u32_cp_stream_len (const uint8_t * stream, size_t ncp)
+_u32_cp_stream_len (const uint8_t *stream, size_t ncp)
 {
   const uint8_t *end;

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/idn2.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/idn2.h Changed

@@ -1,5 +1,5 @@
 /* idn2.h - header file for idn2
-   Copyright (C) 2011-2022 Simon Josefsson
+   Copyright (C) 2011-2024 Simon Josefsson
 
    Libidn2 is free software: you can redistribute it and/or modify it
    under the terms of either:
@@ -98,19 +98,6 @@
 # endif
 
 /**
- * G_GNUC_DEPRECATED
- *
- * Function attribute: Function is deprecated.
- */
-# if GCC_VERSION_AT_LEAST(3,1)
-#  define G_GNUC_DEPRECATED __attribute__((deprecated))
-# elif defined(_MSC_VER)
-#  define G_GNUC_DEPRECATED __declspec(deprecated)
-# else
-#  define G_GNUC_DEPRECATED	/* empty */
-# endif
-
-/**
  * G_GNUC_UNUSED
  *
  * Parameter attribute: Parameter is not used.
@@ -129,7 +116,7 @@
  * version number.  Used together with idn2_check_version() to verify
  * header file and run-time library consistency.
  */
-# define IDN2_VERSION "2.3.4"
+# define IDN2_VERSION "2.3.7"
 
 /**
  * IDN2_VERSION_NUMBER
@@ -140,7 +127,7 @@
  * digits are used to enumerate development snapshots, but for all
  * public releases they will be 0000.
  */
-# define IDN2_VERSION_NUMBER 0x02030004
+# define IDN2_VERSION_NUMBER 0x02030007
 
 /**
  * IDN2_VERSION_MAJOR
@@ -164,7 +151,7 @@
  * Pre-processor symbol for the patch level number (decimal).
  * The version scheme is major.minor.patchlevel.
  */
-# define IDN2_VERSION_PATCH 4
+# define IDN2_VERSION_PATCH 7
 
 /**
  * IDN2_LABEL_MAX_LENGTH
@@ -305,9 +292,8 @@
 
 /* Auxiliary functions. */
 
-  extern _IDN2_API int
-    idn2_to_ascii_4i (const uint32_t * input, size_t inlen, char *output,
-		      int flags) G_GNUC_DEPRECATED;
+  extern _IDN2_API int idn2_to_ascii_4i (const uint32_t * input, size_t inlen,
+					 char *output, int flags);
   extern _IDN2_API int idn2_to_ascii_4i2 (const uint32_t * input,
 					  size_t inlen, char **output,
 					  int flags);
@@ -318,9 +304,9 @@
   extern _IDN2_API int idn2_to_ascii_lz (const char *input, char **output,
 					 int flags);
 
-  extern _IDN2_API int
-    idn2_to_unicode_8z4z (const char *input, uint32_t ** output,
-			  int flags G_GNUC_UNUSED);
+  extern _IDN2_API int idn2_to_unicode_8z4z (const char *input,
+					     uint32_t ** output,
+					     int flags G_GNUC_UNUSED);
   extern _IDN2_API int idn2_to_unicode_4z4z (const uint32_t * input,
 					     uint32_t ** output, int flags);
   extern _IDN2_API int idn2_to_unicode_44i (const uint32_t * in, size_t inlen,
@@ -333,6 +319,15 @@
   extern _IDN2_API int idn2_to_unicode_lzlz (const char *input, char **output,
 					     int flags);
 
+  extern _IDN2_API int idn2_punycode_encode (const uint32_t * input,
+					     size_t input_length,
+					     char *output,
+					     size_t *output_length);
+  extern _IDN2_API int idn2_punycode_decode (const char *input,
+					     size_t input_length,
+					     uint32_t * output,
+					     size_t *output_length);
+
   extern _IDN2_API const char *idn2_strerror (int rc)
     G_GNUC_IDN2_ATTRIBUTE_CONST;
   extern _IDN2_API const char *idn2_strerror_name (int rc)

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/idn2.h.in -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/idn2.h.in Changed

@@ -1,5 +1,5 @@
 /* idn2.h - header file for idn2
-   Copyright (C) 2011-2022 Simon Josefsson
+   Copyright (C) 2011-2024 Simon Josefsson
 
    Libidn2 is free software: you can redistribute it and/or modify it
    under the terms of either:
@@ -98,19 +98,6 @@
 # endif
 
 /**
- * G_GNUC_DEPRECATED
- *
- * Function attribute: Function is deprecated.
- */
-# if GCC_VERSION_AT_LEAST(3,1)
-#  define G_GNUC_DEPRECATED __attribute__((deprecated))
-# elif defined(_MSC_VER)
-#  define G_GNUC_DEPRECATED __declspec(deprecated)
-# else
-#  define G_GNUC_DEPRECATED	/* empty */
-# endif
-
-/**
  * G_GNUC_UNUSED
  *
  * Parameter attribute: Parameter is not used.
@@ -305,9 +292,8 @@
 
 /* Auxiliary functions. */
 
-  extern _IDN2_API int
-    idn2_to_ascii_4i (const uint32_t * input, size_t inlen, char *output,
-		      int flags) G_GNUC_DEPRECATED;
+  extern _IDN2_API int idn2_to_ascii_4i (const uint32_t * input, size_t inlen,
+					 char *output, int flags);
   extern _IDN2_API int idn2_to_ascii_4i2 (const uint32_t * input,
 					  size_t inlen, char **output,
 					  int flags);
@@ -318,9 +304,9 @@
   extern _IDN2_API int idn2_to_ascii_lz (const char *input, char **output,
 					 int flags);
 
-  extern _IDN2_API int
-    idn2_to_unicode_8z4z (const char *input, uint32_t ** output,
-			  int flags G_GNUC_UNUSED);
+  extern _IDN2_API int idn2_to_unicode_8z4z (const char *input,
+					     uint32_t ** output,
+					     int flags G_GNUC_UNUSED);
   extern _IDN2_API int idn2_to_unicode_4z4z (const uint32_t * input,
 					     uint32_t ** output, int flags);
   extern _IDN2_API int idn2_to_unicode_44i (const uint32_t * in, size_t inlen,
@@ -333,6 +319,15 @@
   extern _IDN2_API int idn2_to_unicode_lzlz (const char *input, char **output,
 					     int flags);
 
+  extern _IDN2_API int idn2_punycode_encode (const uint32_t * input,
+					     size_t input_length,
+					     char *output,
+					     size_t *output_length);
+  extern _IDN2_API int idn2_punycode_decode (const char *input,
+					     size_t input_length,
+					     uint32_t * output,
+					     size_t *output_length);
+
   extern _IDN2_API const char *idn2_strerror (int rc)
     G_GNUC_IDN2_ATTRIBUTE_CONST;
   extern _IDN2_API const char *idn2_strerror_name (int rc)

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/idn2.map -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/idn2.map Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/idna.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/idna.c Changed

@@ -1,5 +1,5 @@
 /* idna.c - implementation of high-level IDNA processing function
-   Copyright (C) 2011-2022 Simon Josefsson
+   Copyright (C) 2011-2024 Simon Josefsson
 
    Libidn2 is free software: you can redistribute it and/or modify it
    under the terms of either:
@@ -52,7 +52,7 @@
  * Strings are very likely already in NFC form.
  */
 G_GNUC_IDN2_ATTRIBUTE_PURE static int
-_isNFC (uint32_t * label, size_t len)
+_isNFC (uint32_t *label, size_t len)
 {
   int lastCanonicalClass = 0;
   int result = 1;
@@ -85,8 +85,8 @@
 }
 
 int
-_idn2_u8_to_u32_nfc (const uint8_t * src, size_t srclen,
-		     uint32_t ** out, size_t *outlen, int nfc)
+_idn2_u8_to_u32_nfc (const uint8_t *src, size_t srclen,
+		     uint32_t **out, size_t *outlen, int nfc)
 {
   uint32_t *p;
   size_t plen;
@@ -121,7 +121,7 @@
 }
 
 bool
-_idn2_ascii_p (const uint8_t * src, size_t srclen)
+_idn2_ascii_p (const uint8_t *src, size_t srclen)
 {
   size_t i;
 
@@ -133,7 +133,7 @@
 }
 
 int
-_idn2_label_test (int what, const uint32_t * label, size_t llen)
+_idn2_label_test (int what, const uint32_t *label, size_t llen)
 {
   if (what & TEST_NFC)
     {

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/idna.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/idna.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/lookup.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/lookup.c Changed

@@ -1,6 +1,6 @@
 /* lookup.c - implementation of IDNA2008 lookup functions
-   Copyright (C) 2011-2022 Simon Josefsson
-   Copyright (C) 2017-2022 Tim Ruehsen
+   Copyright (C) 2011-2024 Simon Josefsson
+   Copyright (C) 2017-2024 Tim Ruehsen
 
    Libidn2 is free software: you can redistribute it and/or modify it
    under the terms of either:
@@ -34,8 +34,6 @@
 #include <errno.h>		/* errno */
 #include <stdlib.h>		/* malloc, free */
 
-#include "punycode.h"
-
 #include <unitypes.h>
 #include <uniconv.h>		/* u8_strconv_from_locale */
 #include <uninorm.h>		/* u32_normalize */
@@ -124,7 +122,7 @@
 }
 
 static int
-label (const uint8_t * src, size_t srclen, uint8_t * dst, size_t *dstlen,
+label (const uint8_t *src, size_t srclen, uint8_t *dst, size_t *dstlen,
        int flags)
 {
   size_t plen;
@@ -149,9 +147,8 @@
 	     entirely in lowercase (converting it to lowercase if
 	     necessary), and apply the tests of Section 5.4 and the
 	     conversion of Section 5.5 to that form. */
-	  rc =
-	    _idn2_punycode_decode_internal (srclen - 4, (char *) src + 4,
-					    &label32_len, label_u32);
+	  rc = idn2_punycode_decode ((char *) src + 4, srclen - 4,
+				     label_u32, &label32_len);
 	  if (rc)
 	    return rc;
 
@@ -212,7 +209,7 @@
   dst3 = '-';
 
   tmpl = *dstlen - 4;
-  rc = _idn2_punycode_encode_internal (plen, p, &tmpl, (char *) dst + 4);
+  rc = idn2_punycode_encode (p, plen, (char *) dst + 4, &tmpl);
   if (rc != IDN2_OK)
     goto out;
 
@@ -230,9 +227,8 @@
     }
   else if (!(flags & IDN2_NO_ALABEL_ROUNDTRIP))
     {
-      rc =
-	_idn2_punycode_decode_internal (*dstlen - 4, (char *) dst + 4,
-					&label32_len, label_u32);
+      rc = idn2_punycode_decode ((char *) dst + 4, *dstlen - 4,
+				 label_u32, &label32_len);
       if (rc)
 	{
 	  rc = IDN2_ALABEL_ROUNDTRIP_FAILED;
@@ -260,7 +256,7 @@
   (TEST_NFC | TEST_2HYPHEN | TEST_HYPHEN_STARTEND | TEST_LEADING_COMBINING | TEST_NONTRANSITIONAL)
 
 static int
-_tr46 (const uint8_t * domain_u8, uint8_t ** out, int flags)
+_tr46 (const uint8_t *domain_u8, uint8_t **out, int flags)
 {
   size_t len, it;
   uint32_t *domain_u32;
@@ -432,8 +428,8 @@
 	      return IDN2_ENCODING_ERROR;
 	    }
 
-	  rc = _idn2_punycode_decode_internal (ace_len, (char *) ace,
-					       &name_len, name_u32);
+	  rc = idn2_punycode_decode ((char *) ace, ace_len,
+				     name_u32, &name_len);
 
 	  free (ace);
 
@@ -531,7 +527,7 @@
  * Since: 0.1
  **/
 int
-idn2_lookup_u8 (const uint8_t * src, uint8_t ** lookupname, int flags)
+idn2_lookup_u8 (const uint8_t *src, uint8_t **lookupname, int flags)
 {
   size_t lookupnamelen = 0;
   uint8_t _lookupnameIDN2_DOMAIN_MAX_LENGTH + 1;
@@ -551,7 +547,7 @@
 
   if (!(flags & IDN2_NO_TR46))
     {
-      uint8_t *out;
+      uint8_t *out = NULL;
 
       rc = _tr46 (src, &out, flags);
       if (rc != IDN2_OK)
@@ -687,11 +683,10 @@
  * idn2_to_ascii_4i:
  * @input: zero terminated input Unicode (UCS-4) string.
  * @inlen: number of elements in @input.
- * @output: output zero terminated string that must have room for at least 63 characters plus the terminating zero.
+ * @output: output zero terminated string that must have room for at
+ *       least 63 characters plus the terminating zero.
  * @flags: optional #idn2_flags to modify behaviour.
  *
- * THIS FUNCTION HAS BEEN DEPRECATED DUE TO A DESIGN FLAW. USE idn2_to_ascii_4i2() INSTEAD !
- *
  * The ToASCII operation takes a sequence of Unicode code points that make
  * up one domain label and transforms it into a sequence of code points in
  * the ASCII range (0..7F). If ToASCII succeeds, the original sequence and
@@ -715,14 +710,18 @@
  * recommended to call this function with the %IDN2_NONTRANSITIONAL
  * and the %IDN2_NFC_INPUT flags for compatibility with other software.
  *
- * Return value: Returns %IDN2_OK on success, or error code.
+ * Warning: With version 2.1.1 until before version 2.3.5 this
+ * function was deprecated in favor idn2_to_ascii_4i2().  We still
+ * encourage you to use idn2_to_ascii_4i2() when appropriate.
  *
- * Since: 2.0.0
+ * Returns: On successful conversion %IDN2_OK is returned; if the
+ *   output label would have been too long %IDN2_TOO_BIG_LABEL is
+ *   returned, or another error code is returned.
  *
- * Deprecated: 2.1.1: Use idn2_to_ascii_4i2().
+ * Since: 2.0.0
  **/
 int
-idn2_to_ascii_4i (const uint32_t * input, size_t inlen, char *output,
+idn2_to_ascii_4i (const uint32_t *input, size_t inlen, char *output,
 		  int flags)
 {
   char *out;
@@ -740,10 +739,10 @@
     {
       size_t len = strlen (out);
 
-      if (len > 63)
-	rc = IDN2_TOO_BIG_DOMAIN;
+      if (len > IDN2_LABEL_MAX_LENGTH)
+	rc = IDN2_TOO_BIG_LABEL;
       else if (output)
-	memcpy (output, out, len);
+	strcpy (output, out);
 
       free (out);
     }
@@ -781,12 +780,14 @@
  * recommended to call this function with the %IDN2_NONTRANSITIONAL
  * and the %IDN2_NFC_INPUT flags for compatibility with other software.
  *
- * Return value: Returns %IDN2_OK on success, or error code.
+ * Returns: On successful conversion %IDN2_OK is returned; if the
+ *   output label would have been too long %IDN2_TOO_BIG_LABEL is
+ *   returned, or another error code is returned.
  *
  * Since: 2.1.1
  **/
 int
-idn2_to_ascii_4i2 (const uint32_t * input, size_t inlen, char **output,
+idn2_to_ascii_4i2 (const uint32_t *input, size_t inlen, char **output,
 		   int flags)
 {
   uint32_t *input_u32;
@@ -852,7 +853,7 @@
  * Since: 2.0.0
  **/
 int
-idn2_to_ascii_4z (const uint32_t * input, char **output, int flags)
+idn2_to_ascii_4z (const uint32_t *input, char **output, int flags)
 {
   uint8_t *input_u8;
   size_t length;

_service:tar_scm:libidn2-2.3.7.tar.gz/lib/punycode.c Added

@@ -0,0 +1,428 @@
+/* punycode.c - punycode encoding/decoding
+   Copyright (C) 2011-2024 Simon Josefsson
+
+   Libidn2 is free software: you can redistribute it and/or modify it
+   under the terms of either:
+
+     * 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.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   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 General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+  Code copied from http://www.nicemice.net/idn/punycode-spec.gz on
+  2011-01-04 with SHA-1 a966a8017f6be579d74a50a226accc7607c40133
+  labeled punycode-spec 1.0.3 (2006-Mar-23-Thu).  It is modified for
+  Libidn2 by Simon Josefsson and others.  Original code license:
+
+  punycode-spec 1.0.3 (2006-Mar-23-Thu)
+  http://www.nicemice.net/idn/
+  Adam M. Costello
+  http://www.nicemice.net/amc/
+
+  B. Disclaimer and license
+
+    Regarding this entire document or any portion of it (including
+    the pseudocode and C code), the author makes no guarantees and
+    is not responsible for any damage resulting from its use.  The
+    author grants irrevocable permission to anyone to use, modify,
+    and distribute it in any way that does not diminish the rights
+    of anyone else to use, modify, and distribute it, provided that
+    redistributed derivative works do not contain misleading author or
+    version information.  Derivative works need not be licensed under
+    similar terms.
+
+  C. Punycode sample implementation
+
+  punycode-sample.c 2.0.0 (2004-Mar-21-Sun)
+  http://www.nicemice.net/idn/
+  Adam M. Costello
+  http://www.nicemice.net/amc/
+
+  This is ANSI C code (C89) implementing Punycode 1.0.x.
+*/
+
+#include <config.h>
+
+#include "idn2.h"		/* IDN2_OK, ... */
+
+#include <string.h>
+
+/*** Bootstring parameters for Punycode ***/
+
+enum
+{ base = 36, tmin = 1, tmax = 26, skew = 38, damp = 700,
+  initial_bias = 72, initial_n = 0x80, delimiter = 0x2D
+};
+
+/* basic(cp) tests whether cp is a basic code point: */
+#define encode_basic(cp) ((uint32_t)(cp) < 0x80)
+
+/* encode_digit(d,flag) returns the basic code point whose value      */
+/* (when used for representing integers) is d, which needs to be in   */
+/* the range 0 to base-1.  The lowercase form is used unless flag is  */
+/* nonzero, in which case the uppercase form is used.  The behavior   */
+/* is undefined if flag is nonzero and digit d has no uppercase form. */
+
+static char
+encode_digit (uint32_t d, int flag)
+{
+  return d + 22 + 75 * (d < 26) - ((flag != 0) << 5);
+  /*  0..25 map to ASCII a..z or A..Z */
+  /* 26..35 map to ASCII 0..9         */
+}
+
+/* basic(cp) tests whether cp is a basic code point: */
+#define decode_basic(cp)			       \
+  ((cp >= 'a' && cp <= 'z') || (cp >= '0' && cp <='9')		\
+   || (cp >= 'A' && cp <='Z') || cp == '-' || cp == '_')
+
+/* decode_digit(cp) returns the numeric value of a basic code */
+/* point (for use in representing integers) in the range 0 to */
+/* base-1, or base if cp does not represent a value.          */
+
+static unsigned
+decode_digit (int cp)
+{
+  if (cp >= 'a' && cp <= 'z')
+    return cp - 'a';
+  if (cp >= '0' && cp <= '9')
+    return cp - '0' + 26;
+  if (cp >= 'A' && cp <= 'Z')
+    return cp - 'A';
+
+  return 0;
+}
+
+/*** Bias adaptation function ***/
+
+static uint32_t
+adapt (uint32_t delta, uint32_t numpoints, int firsttime)
+  _GL_ATTRIBUTE_CONST;
+
+     static uint32_t adapt (uint32_t delta, uint32_t numpoints, int firsttime)
+{
+  uint32_t k;
+
+  delta = firsttime ? delta / damp : delta >> 1;
+  /* delta >> 1 is a faster way of doing delta / 2 */
+  delta += delta / numpoints;
+
+  for (k = 0; delta > ((base - tmin) * tmax) / 2; k += base)
+    {
+      delta /= base - tmin;
+    }
+
+  return k + (base - tmin + 1) * delta / (delta + skew);
+}
+
+/**
+ * idn2_punycode_encode:
+ * @input: array of input Unicode (UCS-4) code points
+ * @input_length: number of code points in the @input array.
+ * @output: output character array with ASCII code points.
+ * @output_length: size of @output array
+ *
+ * Converts a sequence of code points to Punycode.
+ *
+ * Warning: Be aware that is rare for applications to need to perform
+ *   Punycode operations, and you should consider idn2_to_ascii_8z(),
+ *   idn2_to_ascii_lz(), idn2_to_ascii_4z() etc.
+ *
+ * Returns: On successful encoding %IDN2_OK is returned, or an error
+ *   codes like %IDN2_PUNYCODE_BAD_INPUT, %IDN2_PUNYCODE_BIG_OUTPUT,
+ *   or %IDN2_PUNYCODE_OVERFLOW.
+ *
+ * Since: 2.3.5
+ **/
+int
+idn2_punycode_encode (const uint32_t *input,
+		      size_t input_length,
+		      char *output, size_t *output_length)
+{
+  uint32_t our_input_length, n, delta, h, b, bias, j, m, q, k, t;
+  size_t out, max_out;
+
+  /* The Punycode spec assumes that the input length is the same type */
+  /* of integer as a code point, so we need to convert the size_t to  */
+  /* a uint32_t, which could overflow.                           */
+
+  if (input_length > UINT32_MAX)
+    return IDN2_PUNYCODE_OVERFLOW;
+  our_input_length = (uint32_t) input_length;
+
+  /* Initialize the state: */
+
+  n = initial_n;
+  delta = 0;
+  out = 0;
+  max_out = *output_length;
+  bias = initial_bias;
+
+  /* Handle the basic code points: */
+
+  for (j = 0; j < our_input_length; ++j)
+    {
+      if (encode_basic (inputj))
+	{
+	  if (max_out - out < 2)
+	    return IDN2_PUNYCODE_BIG_OUTPUT;
+	  outputout++ = (char) inputj;
+	}
+      else if (inputj > 0x10FFFF
+	       || (inputj >= 0xD800 && inputj <= 0xDBFF))
+	return IDN2_PUNYCODE_BAD_INPUT;
+    }
+
+  h = b = (uint32_t) out;
+  /* cannot overflow because out <= our_input_length <= UINT32_MAX */
+
+  /* h is the number of code points that have been handled, b is the  */
+  /* number of basic code points, and out is the number of ASCII code */
+  /* points that have been output.                                    */
+
+  if (b > 0)
+    outputout++ = delimiter;
+
+  /* Main encoding loop: */
+
+  while (h < our_input_length)
+    {
+      /* All non-basic code points < n have been     */
+      /* handled already.  Find the next larger one: */
+
+      for (m = UINT32_MAX, j = 0; j < our_input_length; ++j)
+	{
+	  /* if (basic(inputj)) continue; */
+	  /* (not needed for Punycode) */
+	  if (inputj >= n && inputj < m)
+	    m = inputj;
+	}
+
+      /* Increase delta enough to advance the decoder's    */
+      /* <n,i> state to <m,0>, but guard against overflow: */
+
+      if (m - n > (UINT32_MAX - delta) / (h + 1))
+	return IDN2_PUNYCODE_OVERFLOW;
+      delta += (m - n) * (h + 1);
+      n = m;
+
+      for (j = 0; j < our_input_length; ++j)
+	{
+	  /* Punycode does not need to check whether inputj is basic: */
+	  if (inputj < n /* || basic(inputj) */ )
+	    {
+	      if (++delta == 0)
+		return IDN2_PUNYCODE_OVERFLOW;
+	    }
+
+	  if (inputj == n)
+	    {
+	      /* Represent delta as a generalized variable-length integer: */
+
+	      for (q = delta, k = base;; k += base)
+		{
+		  if (out >= max_out)
+		    return IDN2_PUNYCODE_BIG_OUTPUT;
+		  t = k <= bias /* + tmin */ ? tmin :	/* +tmin not needed */
+		    k >= bias + tmax ? tmax : k - bias;
+		  if (q < t)
+		    break;
+		  outputout++ = encode_digit (t + (q - t) % (base - t), 0);
+		  q = (q - t) / (base - t);
+		}
+
+	      outputout++ = encode_digit (q, 0);
+	      bias = adapt (delta, h + 1, h == b);
+	      delta = 0;
+	      ++h;
+	    }
+	}
+
+      ++delta, ++n;
+    }
+
+  *output_length = out;
+  return IDN2_OK;
+}
+
+/**
+ * idn2_punycode_decode:
+ * @input: array of ASCII characters (0..7F)
+ * @input_length: Number of ASCII characters in the @input array.
+ * @output: output character array with ASCII code points.
+ * @output_length: on input, guarantee that @output has room
+ *   for this many code points; on output, *@output_length
+ *   holds number of code points in @output.
+ *
+ * Converts Punycode to a sequence of code points.
+ *
+ * The decoder will never need to output more code points than the
+ * number of ASCII code points in the input, because of the way the
+ * encoding is defined.
+ *
+ * The number of code points output cannot exceed the maximum possible
+ * value of a uint32_t, even if the supplied @output_length is greater
+ * than that.
+ *
+ * Warning: Be aware that is rare for applications to need to perform
+ *   Punycode operations, and you should consider
+ *   idn2_to_unicode_8z8z(), idn2_to_unicode_lzlz() etc.
+ *
+ * Returns: On successful encoding %IDN2_OK is returned, or an error
+ *   codes like %IDN2_PUNYCODE_BAD_INPUT, %IDN2_PUNYCODE_BIG_OUTPUT,
+ *   or %IDN2_PUNYCODE_OVERFLOW.
+ *
+ * Since: 2.3.5
+ **/
+int
+idn2_punycode_decode (const char *input,
+		      size_t input_length,
+		      uint32_t *output, size_t *output_length)
+{
+  uint32_t n, out = 0, i, max_out, bias, oldi, w, k, digit, t;
+  size_t b = 0, j, in;
+
+  if (!input_length)
+    return IDN2_PUNYCODE_BAD_INPUT;
+
+  /* Check that all chars are basic */
+  for (j = 0; j < input_length; ++j)
+    {
+      if (!decode_basic (inputj))
+	return IDN2_PUNYCODE_BAD_INPUT;
+      if (inputj == delimiter)
+	b = j;
+    }
+
+  max_out =
+    *output_length > UINT32_MAX ? UINT32_MAX : (uint32_t) * output_length;
+
+  if (inputb == delimiter)
+    {
+      /* do not accept leading or trailing delimiter
+       *   - leading delim must be omitted if there is no ASCII char in u-label
+       *   - trailing delim means there where no non-ASCII chars in u-label
+       */
+      if (!b || b == input_length - 1)
+	return IDN2_PUNYCODE_BAD_INPUT;
+
+      if (b >= max_out)
+	return IDN2_PUNYCODE_BIG_OUTPUT;
+
+      /* Check that all chars before last delimiter are basic chars */
+      /* and copy the first b code points to the output. */
+      for (j = 0; j < b; j++)
+	outputout++ = inputj;
+
+      b += 1;			/* advance to non-basic char encoding */
+    }
+
+  /* Initialize the state: */
+  n = initial_n;
+  i = 0;
+  bias = initial_bias;
+
+  /* Main decoding loop:  Start just after the last delimiter if any  */
+  /* basic code points were copied; start at the beginning otherwise. */
+  for (in = b; in < input_length; ++out)
+    {
+
+      /* in is the index of the next ASCII code point to be consumed, */
+      /* and out is the number of code points in the output array.    */
+
+      /* Decode a generalized variable-length integer into delta,  */
+      /* which gets added to i.  The overflow checking is easier   */
+      /* if we increase i as we go, then subtract off its starting */
+      /* value at the end to obtain delta.                         */
+      for (oldi = i, w = 1, k = base;; k += base)
+	{
+	  if (in >= input_length)
+	    return IDN2_PUNYCODE_BAD_INPUT;
+	  digit = decode_digit (inputin++);
+	  if (digit >= base)
+	    return IDN2_PUNYCODE_BAD_INPUT;
+	  if (digit > (UINT32_MAX - i) / w)
+	    return IDN2_PUNYCODE_OVERFLOW;
+	  i += digit * w;
+	  t = k <= bias /* + tmin */ ? tmin :	/* +tmin not needed */
+	    k >= bias + tmax ? tmax : k - bias;
+	  if (digit < t)
+	    break;
+	  if (w > UINT32_MAX / (base - t))
+	    return IDN2_PUNYCODE_OVERFLOW;
+	  w *= (base - t);
+	}
+
+      bias = adapt (i - oldi, out + 1, oldi == 0);
+
+      /* i was supposed to wrap around from out+1 to 0,   */
+      /* incrementing n each time, so we'll fix that now: */
+      if (i / (out + 1) > UINT32_MAX - n)
+	return IDN2_PUNYCODE_OVERFLOW;
+      n += i / (out + 1);
+      if (n > 0x10FFFF || (n >= 0xD800 && n <= 0xDBFF))
+	return IDN2_PUNYCODE_BAD_INPUT;
+      i %= (out + 1);
+
+      /* Insert n at position i of the output: */
+
+      /* not needed for Punycode: */
+      /* if (basic(n)) return IDN2_PUNYCODE_BAD_INPUT; */
+      if (out >= max_out)
+	return IDN2_PUNYCODE_BIG_OUTPUT;
+
+      memmove (output + i + 1, output + i, (out - i) * sizeof *output);
+      outputi++ = n;
+    }
+
+  *output_length = (size_t) out;
+  /* cannot overflow because out <= old value of *output_length */
+  return IDN2_OK;
+}
+
+/* We are stuck exporting these old internal interfaces because old
+   versions of GNUTLS used them, and maybe other software. */
+
+extern int _IDN2_API _idn2_punycode_decode (size_t input_length,
+					    const char input,
+					    size_t *output_length,
+					    uint32_t output);
+extern int _IDN2_API _idn2_punycode_encode (size_t input_length,
+					    const uint32_t input,
+					    size_t *output_length,
+					    char output);
+
+int
+_idn2_punycode_decode (size_t input_length,
+		       const char input,
+		       size_t *output_length, uint32_t output)
+{
+  return idn2_punycode_decode (input, input_length, output, output_length);
+
+}
+
+int
+_idn2_punycode_encode (size_t input_length,
+		       const uint32_t input,
+		       size_t *output_length, char output)
+{
+  return idn2_punycode_encode (input, input_length, output, output_length);
+}

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/register.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/register.c Changed

@@ -1,5 +1,5 @@
 /* register.c - implementation of IDNA2008 register functions
-   Copyright (C) 2011-2022 Simon Josefsson
+   Copyright (C) 2011-2024 Simon Josefsson
 
    Libidn2 is free software: you can redistribute it and/or modify it
    under the terms of either:
@@ -33,8 +33,6 @@
 #include <errno.h>		/* errno */
 #include <stdlib.h>		/* free */
 
-#include "punycode.h"
-
 #include <unitypes.h>
 #include <uniconv.h>		/* u8_strconv_from_locale */
 #include <unistr.h>		/* u32_to_u8 */
@@ -71,8 +69,8 @@
  *   is returned, or another error code is returned.
  **/
 int
-idn2_register_u8 (const uint8_t * ulabel, const uint8_t * alabel,
-		  uint8_t ** insertname, int flags)
+idn2_register_u8 (const uint8_t *ulabel, const uint8_t *alabel,
+		  uint8_t **insertname, int flags)
 {
   int rc;
 
@@ -104,8 +102,8 @@
       if (!_idn2_ascii_p (alabel, alabellen))
 	return IDN2_INVALID_ALABEL;
 
-      rc = _idn2_punycode_decode_internal (alabellen - 4, (char *) alabel + 4,
-					   &u32len, u32);
+      rc = idn2_punycode_decode ((char *) alabel + 4, alabellen - 4,
+				 u32, &u32len);
       if (rc != IDN2_OK)
 	return rc;
 
@@ -186,8 +184,7 @@
       tmp3 = '-';
 
       tmpl = IDN2_LABEL_MAX_LENGTH - 4;
-      rc =
-	_idn2_punycode_encode_internal (u32len, u32, &tmpl, (char *) tmp + 4);
+      rc = idn2_punycode_encode (u32, u32len, (char *) tmp + 4, &tmpl);
       free (u32);
       if (rc != IDN2_OK)
 	return rc;

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/tables.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/tables.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/tables.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/tables.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/tr46map.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/tr46map.c Changed

@@ -38,7 +38,7 @@
 #define countof(a) (sizeof(a)/sizeof(*(a)))
 
 static void
-_fill_map (uint32_t c, const uint8_t * p, IDNAMap * map)
+_fill_map (uint32_t c, const uint8_t *p, IDNAMap *map)
 {
   uint32_t value;
 
@@ -70,7 +70,7 @@
 }
 
 static int
-_compare_idna_map (const uint32_t * c, const uint8_t * p)
+_compare_idna_map (const uint32_t *c, const uint8_t *p)
 {
   IDNAMap map;
 
@@ -102,7 +102,7 @@
 */
 
 int
-get_idna_map (uint32_t c, IDNAMap * map)
+get_idna_map (uint32_t c, IDNAMap *map)
 {
   uint8_t *p;
 
@@ -135,13 +135,13 @@
 }
 
 int
-map_is (const IDNAMap * map, unsigned flags)
+map_is (const IDNAMap *map, unsigned flags)
 {
   return (idna_flagsmap->flag_index & flags) == flags;
 }
 
 static int G_GNUC_IDN2_ATTRIBUTE_PURE
-_compare_nfcqc_map (uint32_t * c, NFCQCMap * m2)
+_compare_nfcqc_map (uint32_t *c, NFCQCMap *m2)
 {
   if (*c < m2->cp1)
     return -1;
@@ -161,7 +161,7 @@
 
 /* copy 'n' codepoints from mapdata stream */
 int
-get_map_data (uint32_t * dst, const IDNAMap * map)
+get_map_data (uint32_t *dst, const IDNAMap *map)
 {
   int n = map->nmappings;
   const uint8_t *src = mapdata + map->offset;

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/tr46map.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/tr46map.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/lib/version.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/lib/version.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/m4/gettext.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/m4/gettext.m4 Changed

@@ -1,16 +1,16 @@
-# gettext.m4 serial 66 (gettext-0.18.2)
-dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
+# gettext.m4 serial 68 (gettext-0.19.8)
+dnl Copyright (C) 1995-2014, 2016 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
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Authors:
@@ -161,13 +161,18 @@
             AC_LANG_PROGRAM(
                
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
                ,
                
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
                ),
             eval "$gt_func_gnugettext_libc=yes",
             eval "$gt_func_gnugettext_libc=no"))
@@ -193,17 +198,22 @@
               AC_LANG_PROGRAM(
                  
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
                  ,
                  
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
                  ),
               eval "$gt_func_gnugettext_libintl=yes",
               eval "$gt_func_gnugettext_libintl=no")
@@ -214,17 +224,22 @@
                 AC_LANG_PROGRAM(
                    
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
                    ,
                    
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
                    ),
                 LIBINTL="$LIBINTL $LIBICONV"
                  LTLIBINTL="$LTLIBINTL $LTLIBICONV"
@@ -399,3 +414,7 @@
 
 dnl Usage: AM_GNU_GETTEXT_VERSION(gettext-version)
 AC_DEFUN(AM_GNU_GETTEXT_VERSION, )
+
+
+dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION(gettext-version)
+AC_DEFUN(AM_GNU_GETTEXT_REQUIRE_VERSION, )

_service:tar_scm:libidn2-2.3.4.tar.gz/m4/intlmacosx.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/m4/intlmacosx.m4 Changed

@@ -1,16 +1,16 @@
 # intlmacosx.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2014, 2016 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
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Checks for special options needed on Mac OS X.

_service:tar_scm:libidn2-2.3.4.tar.gz/m4/nls.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/m4/nls.m4 Changed

@@ -1,17 +1,17 @@
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
+dnl 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
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Authors:

_service:tar_scm:libidn2-2.3.4.tar.gz/m4/po.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/m4/po.m4 Changed

@@ -1,16 +1,16 @@
-# po.m4 serial 22 (gettext-0.19)
-dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
+# po.m4 serial 24 (gettext-0.19)
+dnl Copyright (C) 1995-2014, 2016 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
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Authors:

_service:tar_scm:libidn2-2.3.4.tar.gz/m4/progtest.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/m4/progtest.m4 Changed

@@ -1,16 +1,16 @@
 # progtest.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2005, 2008-2016 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
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Authors:

_service:tar_scm:libidn2-2.3.4.tar.gz/maint.mk -> _service:tar_scm:libidn2-2.3.7.tar.gz/maint.mk Changed

@@ -2,7 +2,7 @@
 # This Makefile fragment tries to be general-purpose enough to be
 # used by many projects via the gnulib maintainer-makefile module.
 
-## Copyright (C) 2001-2022 Free Software Foundation, Inc.
+## Copyright (C) 2001-2024 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -64,10 +64,10 @@
 
 # You can override this variable in cfg.mk if your gnulib submodule lives
 # in a different location.
-gnulib_dir ?= $(shell if test -f $(srcdir)/gnulib/gnulib-tool; then \
-			echo $(srcdir)/gnulib; \
+gnulib_dir ?= $(shell if test -n "$(GNULIB_SRCDIR)" && test -f "$(GNULIB_SRCDIR)/gnulib-tool"; then \
+			echo "$(GNULIB_SRCDIR)"; \
 		else \
-			echo ${GNULIB_SRCDIR}; \
+			echo $(srcdir)/gnulib; \
 		fi)
 
 # You can override this variable in cfg.mk to set your own regexp
@@ -180,7 +180,7 @@
 endif
 .PHONY: $(local-checks-available)
 
-# Arrange to print the name of each syntax-checking rule just before running it.
+# Arrange to prine the name of each syntax-checking rule just before running it.
 $(syntax-check-rules): %: %.m
 sc_m_rules_ = $(patsubst %, %.m, $(syntax-check-rules))
 .PHONY: $(sc_m_rules_)
@@ -598,23 +598,14 @@
 	re='\<error(_at_line|_print_progname|_one_per_line|_message_count)? *\('\
 	  $(_sc_header_without_use)
 
-# Don't include xalloc.h unless you use one of its functions.
+# Don't include xalloc.h unless you use one of its symbols.
 # Consider these symbols:
 # perl -lne '/^# *define (\w+)\(/ and print $1' lib/xalloc.h|grep -v '^__';
-# perl -lne '/^(?:extern )?(?:void|char) \*?(\w+) *\(/ and print $1' lib/xalloc.h
+# perl -lne 'm{^(?:_Noreturn )?(?:void|char) \*?(\w+) *\(} and print $1' lib/xalloc.h
 # Divide into two sets on case, and filter each through this:
 # | sort | perl -MRegexp::Assemble -le \
 #  'print Regexp::Assemble->new(file => "/dev/stdin")->as_string'|sed 's/\?://g'
-# Note this was produced by the above:
-# _xa1 = \
-#x(((2n?)?re|c(har)?|n(re|m)|z)alloc|alloc_(oversized|die)|m(alloc|emdup)|strdup)
-# But we can do better, in at least two ways:
-# 1) take advantage of two "dup"-suffixed strings:
-# x(((2n?)?re|c(har)?|n(re|m)|mz)alloc|alloc_(oversized|die)|(mem|str)dup)
-# 2) notice that "c(har)?|mz" is equivalent to the shorter and more readable
-# "char|cmz"
-# x(((2n?)?re|char|n(re|m)|cmz)alloc|alloc_(oversized|die)|(mem|str)dup)
-_xa1 = x(((2n?)?re|char|n(re|m)|cmz)alloc|alloc_(oversized|die)|(mem|str)dup)
+_xa1 = x(i(m(emdup0?|alloc)|realloc(array)?|(cz|nm)alloc)|(pz|c(har)?|2n?re|nm)alloc|realloc(array)?|m(alloc|emdup)|alloc_die|strdup)
 _xa2 = X(CZ|N?M)ALLOC
 sc_prohibit_xalloc_without_use:
 	@h='xalloc.h' \
@@ -745,7 +736,8 @@
 	re='\<($(_intprops_syms_re)) *\('				\
 	  $(_sc_header_without_use)
 
-_stddef_syms_re = NULL|offsetof|ptrdiff_t|size_t|wchar_t
+_stddef_syms_re = \
+  NULL|max_align_t|nullptr_t|offsetof|ptrdiff_t|size_t|unreachable|wchar_t
 # Prohibit the inclusion of stddef.h without an actual use.
 sc_prohibit_stddef_without_use:
 	@h='stddef.h'							\
@@ -1006,12 +998,12 @@
 	       exit 1; }						\
 	  || :
 
-# Make sure we don't use st_blocks.  Use ST_NBLOCKS instead.
+# Make sure we don't use st_blocks.  Use ST_NBLOCKS or STP_NBLOCKS instead.
 # This is a bit of a kludge, since it prevents use of the string
 # even in comments, but for now it does the job with no false positives.
 sc_prohibit_stat_st_blocks:
 	@prohibit='.>st_blocks'					\
-	halt='do not use st_blocks; use ST_NBLOCKS'			\
+	halt='do not use st_blocks; use ST_NBLOCKS or STP_NBLOCKS'	\
 	  $(_sc_search_regexp)
 
 # Make sure we don't define any S_IS* macros in src/*.c files.
@@ -1373,6 +1365,26 @@
 	  '  see https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2012-3386 for details') \
 	  $(_sc_search_regexp)
 
+sc_unportable_grep_q:
+	@prohibit='grep -q' halt="unportable 'grep -q', use >/dev/null instead" \
+	  $(_sc_search_regexp)
+
+# The GNU Coding standards say that README should refer to both
+# INSTALL and the file that contains the copying conditions.  This
+# shall be COPYING for GPL and COPYING.LESSER for LGPL.
+
+sc_readme_link_install:
+	@require='INSTALL'					\
+	in_vc_files='^README$$'					\
+	halt='The README file should refer to INSTALL'          \
+	  $(_sc_search_regexp)
+
+sc_readme_link_copying:
+	@require='COPYING'					\
+	in_vc_files='^README$$'					\
+	halt='The README file should refer to COPYING.LESSER' \
+	  $(_sc_search_regexp)
+
 vc-diff-check:
 	$(AM_V_GEN)(unset CDPATH; cd $(srcdir) && $(VC) diff) > vc-diffs || :
 	$(AM_V_at)if test -s vc-diffs; then			\
@@ -1659,8 +1671,8 @@
 	indent $(indent_args) $(INDENT_SOURCES)
 
 sc_indent:
-	@if ! command -v indent > /dev/null; then			\
-	    echo 1>&2 '$(ME): sc_indent: indent is missing';		\
+	@if ! indent --version 2> /dev/null | grep 'GNU indent' > /dev/null; then \
+	    echo 1>&2 '$(ME): sc_indent: GNU indent is missing';	\
 	else								\
 	  fail=0; files="$(INDENT_SOURCES)";				\
 	  for f in $$files; do						\

_service:tar_scm:libidn2-2.3.4.tar.gz/po/Makefile.in.in -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/Makefile.in.in Changed

@@ -1,14 +1,12 @@
 # Makefile for PO directory in any package using GNU gettext.
 # Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU General Public
-# License but which still want to provide support for the GNU gettext
-# functionality.
-# Please note that the actual code of GNU gettext is covered by the GNU
-# General Public License and is *not* in the public domain.
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
 #
-# Origin: gettext-0.19
+# Origin: gettext-0.19.8
 GETTEXT_MACRO_VERSION = 0.19
 
 PACKAGE = @PACKAGE@
@@ -45,6 +43,11 @@
 MKDIR_P = @MKDIR_P@
 mkdir_p = @mkdir_p@
 
+# When building gettext-tools, we prefer to use the built programs
+# rather than installed programs.  However, we can't do that when we
+# are cross compiling.
+CROSS_COMPILING = @CROSS_COMPILING@
+
 GMSGFMT_ = @GMSGFMT@
 GMSGFMT_no = @GMSGFMT@
 GMSGFMT_yes = @GMSGFMT_015@
@@ -197,6 +200,11 @@
 	    ;; \
 	esac
 	test ! -f $(DOMAIN).po || { \
+	  if test -f $(srcdir)/$(DOMAIN).pot-header; then \
+	    sed -e '1,/^#$$/d' < $(DOMAIN).po > $(DOMAIN).1po && \
+	    cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po; \
+	    rm -f $(DOMAIN).1po; \
+	  fi; \
 	  if test -f $(srcdir)/$(DOMAIN).pot; then \
 	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
 	    sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
@@ -226,7 +234,7 @@
 	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
 	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
 	  cd $(srcdir) \
-	    && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^^0-9*,,'` in \
+	    && { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^^0-9*,,'` in \
 	           '' | 0.0-9 | 0.0-9.* | 0.10-7 | 0.10-7.*) \
 	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
 	           *) \
@@ -427,7 +435,7 @@
 
 .nop.po-update:
 	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
-	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
+	if test "$(PACKAGE)" = "gettext-tools" && test "$(CROSS_COMPILING)" != "yes"; then PATH=`pwd`/../src:$$PATH; fi; \
 	tmpdir=`pwd`; \
 	echo "$$lang:"; \
 	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \

_service:tar_scm:libidn2-2.3.4.tar.gz/po/Makevars -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/Makevars Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/Rules-quot -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/Rules-quot Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/cs.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/cs.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/da.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/da.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/de.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/de.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/eo.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/eo.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/es.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/es.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/fi.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/fi.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/fr.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/fr.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/fur.gmo -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/fur.gmo Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/fur.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/fur.po Changed

@@ -1,23 +1,24 @@
 # Friulian messages for libidn.
 # Copyright (C) 2018 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libidn2 package.
-# Fabio Tomat <f.t.public@gmail.com>, 2018.
+# Fabio Tomat <f.t.public@gmail.com>, 2023.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libidn2 2.0.4\n"
+"Project-Id-Version: libidn2 2.3.3\n"
 "Report-Msgid-Bugs-To: bug-libidn2@gnu.org\n"
-"POT-Creation-Date: 2022-10-23 15:42+0200\n"
-"PO-Revision-Date: 2018-03-21 12:24+0100\n"
+"POT-Creation-Date: 2024-01-27 12:28+0100\n"
+"PO-Revision-Date: 2023-02-11 06:26+0000\n"
 "Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
 "Language-Team: Friulian <f.t.public@gmail.com>\n"
 "Language: fur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
+"X-Editor: HaiPO 1.4 beta\n"
 "X-Generator: Poedit 2.0.6\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: lib/error.c:54
 msgid "success"
@@ -117,19 +118,22 @@
 
 #: lib/error.c:102
 msgid "domain label has forbidden dot (TR46)"
-msgstr ""
+msgstr "la etichete dal domini e à un pont vietât (TR46)"
 
 #: lib/error.c:105
 msgid "domain label has character forbidden in transitional mode (TR46)"
 msgstr ""
+"la etichete dal domini e à un caratar vietât te modalitât transizionâl (TR46)"
 
 #: lib/error.c:109
 msgid "domain label has character forbidden in non-transitional mode (TR46)"
 msgstr ""
+"la etichete dal domini e à un caratar vietât te modalitât no-transizionâl "
+"(TR46)"
 
 #: lib/error.c:111
 msgid "A-label roundtrip failed"
-msgstr ""
+msgstr "lâ e tornâ di etichete-A falît"
 
 #: lib/error.c:113
 msgid "Unknown error"
@@ -178,7 +182,6 @@
 "curtis.\n"
 
 #: src/idn2.c:78
-#, fuzzy
 msgid ""
 "  -h, --help                Print help and exit\n"
 "  -V, --version             Print version and exit\n"
@@ -187,7 +190,6 @@
 "  -V, --version            Stampe la version e jes\n"
 
 #: src/idn2.c:82
-#, fuzzy
 msgid ""
 "  -d, --decode              Decode (punycode) domain name\n"
 "  -l, --lookup              Lookup domain name (default)\n"
@@ -195,10 +197,9 @@
 msgstr ""
 "  -d, --decode             Decodifiche (punycode) il non dal domini\n"
 "  -l, --lookup             Cîr il non dal domini (predefinît)\n"
-"  -r, --register           Regjistre etichete\n"
+"  -r, --register           Etichete dal regjistri\n"
 
 #: src/idn2.c:87
-#, fuzzy
 msgid ""
 "  -T, --tr46t               Enable TR46 transitional processing\n"
 "  -N, --tr46nt              Enable TR46 non-transitional processing\n"
@@ -209,14 +210,15 @@
 "      --no-tr46            Disabilite elaborazion TR46\n"
 
 #: src/idn2.c:92
-#, fuzzy
 msgid ""
 "      --usestd3asciirules   Enable STD3 ASCII rules\n"
 "      --no-alabelroundtrip  Disable A-label roundtrip for lookups\n"
 "      --debug               Print debugging information\n"
 "      --quiet               Silent operation\n"
 msgstr ""
-"      --nostd3asciirules   Disabilite lis regulis ASCII STD3\n"
+"      --usestd3asciirules   Abilite regulis ASCII STD3\n"
+"      --no-alabelroundtrip  Disabilite lâ e tornâ de etichete-A pes "
+"ricercjis\n"
 "      --debug              Stampe lis informazions di debug\n"
 "      --quiet              Operazion cidine\n"
 
@@ -228,7 +230,7 @@
 #: src/idn2.c:211
 #, c-format
 msgid "libiconv required for non-UTF-8 character encoding: %s"
-msgstr ""
+msgstr "libiconv necessari pe codifiche dai caratars che no son UTF-8: %s"
 
 #: src/idn2.c:217
 msgid ""

_service:tar_scm:libidn2-2.3.4.tar.gz/po/hr.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/hr.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/hu.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/hu.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/id.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/id.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/it.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/it.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/ja.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/ja.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/ka.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/ka.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/ko.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/ko.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/libidn2.pot -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/libidn2.pot Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/nl.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/nl.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/pl.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/pl.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/pt_BR.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/pt_BR.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/ro.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/ro.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/ru.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/ru.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/sr.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/sr.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/sv.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/sv.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/uk.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/uk.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/vi.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/vi.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/po/zh_CN.po -> _service:tar_scm:libidn2-2.3.7.tar.gz/po/zh_CN.po Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/src/Makefile.am -> _service:tar_scm:libidn2-2.3.7.tar.gz/src/Makefile.am Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/src/Makefile.in -> _service:tar_scm:libidn2-2.3.7.tar.gz/src/Makefile.in Changed

@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2011-2022 Simon Josefsson
+# Copyright (C) 2011-2024 Simon Josefsson
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -107,8 +107,7 @@
 bin_PROGRAMS = idn2$(EXEEXT)
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/unistring/m4/codeset.m4 \
-	$(top_srcdir)/unistring/m4/free.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/unistring/m4/free.m4 \
 	$(top_srcdir)/unistring/m4/gnulib-comp.m4 \
 	$(top_srcdir)/unistring/m4/host-cpu-c-abi.m4 \
 	$(top_srcdir)/unistring/m4/iconv.m4 \
@@ -122,15 +121,19 @@
 	$(top_srcdir)/unistring/m4/libunistring-optional.m4 \
 	$(top_srcdir)/unistring/m4/libunistring.m4 \
 	$(top_srcdir)/unistring/m4/localcharset.m4 \
+	$(top_srcdir)/unistring/m4/unictype_h.m4 \
+	$(top_srcdir)/unistring/m4/uninorm_h.m4 \
 	$(top_srcdir)/unistring/m4/wchar_h.m4 \
 	$(top_srcdir)/gl/m4/00gnulib.m4 \
 	$(top_srcdir)/gl/m4/__inline.m4 \
 	$(top_srcdir)/gl/m4/absolute-header.m4 \
 	$(top_srcdir)/gl/m4/alloca.m4 $(top_srcdir)/gl/m4/assert_h.m4 \
 	$(top_srcdir)/gl/m4/c-bool.m4 $(top_srcdir)/gl/m4/close.m4 \
+	$(top_srcdir)/gl/m4/codeset.m4 \
 	$(top_srcdir)/gl/m4/double-slash-root.m4 \
 	$(top_srcdir)/gl/m4/dup2.m4 $(top_srcdir)/gl/m4/eealloc.m4 \
 	$(top_srcdir)/gl/m4/errno_h.m4 $(top_srcdir)/gl/m4/error.m4 \
+	$(top_srcdir)/gl/m4/error_h.m4 \
 	$(top_srcdir)/gl/m4/extensions.m4 \
 	$(top_srcdir)/gl/m4/extern-inline.m4 \
 	$(top_srcdir)/gl/m4/fcntl-o.m4 $(top_srcdir)/gl/m4/fcntl.m4 \
@@ -145,12 +148,14 @@
 	$(top_srcdir)/gl/m4/inline.m4 $(top_srcdir)/gl/m4/largefile.m4 \
 	$(top_srcdir)/gl/m4/ld-output-def.m4 \
 	$(top_srcdir)/gl/m4/ld-version-script.m4 \
-	$(top_srcdir)/gl/m4/limits-h.m4 $(top_srcdir)/gl/m4/malloca.m4 \
+	$(top_srcdir)/gl/m4/limits-h.m4 \
+	$(top_srcdir)/gl/m4/locale-fr.m4 \
+	$(top_srcdir)/gl/m4/malloca.m4 \
 	$(top_srcdir)/gl/m4/manywarnings.m4 \
 	$(top_srcdir)/gl/m4/mode_t.m4 \
 	$(top_srcdir)/gl/m4/msvc-inval.m4 \
 	$(top_srcdir)/gl/m4/msvc-nothrow.m4 \
-	$(top_srcdir)/gl/m4/multiarch.m4 \
+	$(top_srcdir)/gl/m4/multiarch.m4 $(top_srcdir)/gl/m4/musl.m4 \
 	$(top_srcdir)/gl/m4/nocrash.m4 $(top_srcdir)/gl/m4/off_t.m4 \
 	$(top_srcdir)/gl/m4/open-cloexec.m4 \
 	$(top_srcdir)/gl/m4/open-slash.m4 $(top_srcdir)/gl/m4/open.m4 \
@@ -158,9 +163,9 @@
 	$(top_srcdir)/gl/m4/rawmemchr.m4 \
 	$(top_srcdir)/gl/m4/ssize_t.m4 \
 	$(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \
-	$(top_srcdir)/gl/m4/stdalign.m4 $(top_srcdir)/gl/m4/stdarg.m4 \
-	$(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \
-	$(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \
+	$(top_srcdir)/gl/m4/stdarg.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \
+	$(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \
+	$(top_srcdir)/gl/m4/stdlib_h.m4 \
 	$(top_srcdir)/gl/m4/strchrnul.m4 \
 	$(top_srcdir)/gl/m4/strerror.m4 \
 	$(top_srcdir)/gl/m4/string_h.m4 \
@@ -174,8 +179,7 @@
 	$(top_srcdir)/gl/m4/visibility.m4 \
 	$(top_srcdir)/gl/m4/warn-on-use.m4 \
 	$(top_srcdir)/gl/m4/warnings.m4 $(top_srcdir)/gl/m4/wchar_t.m4 \
-	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/year2038.m4 \
-	$(top_srcdir)/gl/m4/zzgnulib.m4 \
+	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/zzgnulib.m4 \
 	$(top_srcdir)/m4/ax_ac_append_to_file.m4 \
 	$(top_srcdir)/m4/ax_ac_print_to_file.m4 \
 	$(top_srcdir)/m4/ax_add_am_macro_static.m4 \
@@ -423,6 +427,7 @@
 GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@
 GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@
 GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@
+GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@
 GL_GNULIB_GETSUBOPT = @GL_GNULIB_GETSUBOPT@
 GL_GNULIB_GETUMASK = @GL_GNULIB_GETUMASK@
 GL_GNULIB_GETUSERSHELL = @GL_GNULIB_GETUSERSHELL@
@@ -452,6 +457,7 @@
 GL_GNULIB_MBSSPN = @GL_GNULIB_MBSSPN@
 GL_GNULIB_MBSSTR = @GL_GNULIB_MBSSTR@
 GL_GNULIB_MBSTOK_R = @GL_GNULIB_MBSTOK_R@
+GL_GNULIB_MBSTOWCS = @GL_GNULIB_MBSTOWCS@
 GL_GNULIB_MBTOWC = @GL_GNULIB_MBTOWC@
 GL_GNULIB_MDA_ACCESS = @GL_GNULIB_MDA_ACCESS@
 GL_GNULIB_MDA_CHDIR = @GL_GNULIB_MDA_CHDIR@
@@ -497,6 +503,7 @@
 GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@
 GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@
 GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@
+GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@
 GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@
 GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@
 GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@
@@ -534,6 +541,7 @@
 GL_GNULIB_PUTS = @GL_GNULIB_PUTS@
 GL_GNULIB_PWRITE = @GL_GNULIB_PWRITE@
 GL_GNULIB_QSORT_R = @GL_GNULIB_QSORT_R@
+GL_GNULIB_RAND = @GL_GNULIB_RAND@
 GL_GNULIB_RANDOM = @GL_GNULIB_RANDOM@
 GL_GNULIB_RANDOM_R = @GL_GNULIB_RANDOM_R@
 GL_GNULIB_RAWMEMCHR = @GL_GNULIB_RAWMEMCHR@
@@ -589,6 +597,7 @@
 GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@
 GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@
 GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@
+GL_GNULIB_TIME = @GL_GNULIB_TIME@
 GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@
 GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@
 GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@
@@ -666,6 +675,7 @@
 GL_UNISTRING_GNULIB_GETPAGESIZE = @GL_UNISTRING_GNULIB_GETPAGESIZE@
 GL_UNISTRING_GNULIB_GETPASS = @GL_UNISTRING_GNULIB_GETPASS@
 GL_UNISTRING_GNULIB_GETPASS_GNU = @GL_UNISTRING_GNULIB_GETPASS_GNU@
+GL_UNISTRING_GNULIB_GETPROGNAME = @GL_UNISTRING_GNULIB_GETPROGNAME@
 GL_UNISTRING_GNULIB_GETSUBOPT = @GL_UNISTRING_GNULIB_GETSUBOPT@
 GL_UNISTRING_GNULIB_GETUSERSHELL = @GL_UNISTRING_GNULIB_GETUSERSHELL@
 GL_UNISTRING_GNULIB_GRANTPT = @GL_UNISTRING_GNULIB_GRANTPT@
@@ -699,6 +709,8 @@
 GL_UNISTRING_GNULIB_MBSSPN = @GL_UNISTRING_GNULIB_MBSSPN@
 GL_UNISTRING_GNULIB_MBSSTR = @GL_UNISTRING_GNULIB_MBSSTR@
 GL_UNISTRING_GNULIB_MBSTOK_R = @GL_UNISTRING_GNULIB_MBSTOK_R@
+GL_UNISTRING_GNULIB_MBSTOWCS = @GL_UNISTRING_GNULIB_MBSTOWCS@
+GL_UNISTRING_GNULIB_MBSZERO = @GL_UNISTRING_GNULIB_MBSZERO@
 GL_UNISTRING_GNULIB_MBTOWC = @GL_UNISTRING_GNULIB_MBTOWC@
 GL_UNISTRING_GNULIB_MDA_ACCESS = @GL_UNISTRING_GNULIB_MDA_ACCESS@
 GL_UNISTRING_GNULIB_MDA_CHDIR = @GL_UNISTRING_GNULIB_MDA_CHDIR@
@@ -733,6 +745,7 @@
 GL_UNISTRING_GNULIB_MEMMEM = @GL_UNISTRING_GNULIB_MEMMEM@
 GL_UNISTRING_GNULIB_MEMPCPY = @GL_UNISTRING_GNULIB_MEMPCPY@
 GL_UNISTRING_GNULIB_MEMRCHR = @GL_UNISTRING_GNULIB_MEMRCHR@
+GL_UNISTRING_GNULIB_MEMSET_EXPLICIT = @GL_UNISTRING_GNULIB_MEMSET_EXPLICIT@
 GL_UNISTRING_GNULIB_MKDTEMP = @GL_UNISTRING_GNULIB_MKDTEMP@
 GL_UNISTRING_GNULIB_MKOSTEMP = @GL_UNISTRING_GNULIB_MKOSTEMP@
 GL_UNISTRING_GNULIB_MKOSTEMPS = @GL_UNISTRING_GNULIB_MKOSTEMPS@
@@ -748,6 +761,7 @@
 GL_UNISTRING_GNULIB_PUTENV = @GL_UNISTRING_GNULIB_PUTENV@
 GL_UNISTRING_GNULIB_PWRITE = @GL_UNISTRING_GNULIB_PWRITE@
 GL_UNISTRING_GNULIB_QSORT_R = @GL_UNISTRING_GNULIB_QSORT_R@
+GL_UNISTRING_GNULIB_RAND = @GL_UNISTRING_GNULIB_RAND@
 GL_UNISTRING_GNULIB_RANDOM = @GL_UNISTRING_GNULIB_RANDOM@
 GL_UNISTRING_GNULIB_RANDOM_R = @GL_UNISTRING_GNULIB_RANDOM_R@
 GL_UNISTRING_GNULIB_RAWMEMCHR = @GL_UNISTRING_GNULIB_RAWMEMCHR@
@@ -796,6 +810,141 @@
 GL_UNISTRING_GNULIB_SYSTEM_POSIX = @GL_UNISTRING_GNULIB_SYSTEM_POSIX@
 GL_UNISTRING_GNULIB_TRUNCATE = @GL_UNISTRING_GNULIB_TRUNCATE@
 GL_UNISTRING_GNULIB_TTYNAME_R = @GL_UNISTRING_GNULIB_TTYNAME_R@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE@
 GL_UNISTRING_GNULIB_UNISTD_H_GETOPT = @GL_UNISTRING_GNULIB_UNISTD_H_GETOPT@
 GL_UNISTRING_GNULIB_UNISTD_H_NONBLOCKING = @GL_UNISTRING_GNULIB_UNISTD_H_NONBLOCKING@
 GL_UNISTRING_GNULIB_UNISTD_H_SIGPIPE = @GL_UNISTRING_GNULIB_UNISTD_H_SIGPIPE@
@@ -834,6 +983,7 @@
 GL_UNISTRING_GNULIB_WCTOB = @GL_UNISTRING_GNULIB_WCTOB@
 GL_UNISTRING_GNULIB_WCTOMB = @GL_UNISTRING_GNULIB_WCTOMB@
 GL_UNISTRING_GNULIB_WCWIDTH = @GL_UNISTRING_GNULIB_WCWIDTH@
+GL_UNISTRING_GNULIB_WGETCWD = @GL_UNISTRING_GNULIB_WGETCWD@
 GL_UNISTRING_GNULIB_WMEMCHR = @GL_UNISTRING_GNULIB_WMEMCHR@
 GL_UNISTRING_GNULIB_WMEMCMP = @GL_UNISTRING_GNULIB_WMEMCMP@
 GL_UNISTRING_GNULIB_WMEMCPY = @GL_UNISTRING_GNULIB_WMEMCPY@
@@ -845,7 +995,6 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@
-GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
@@ -881,6 +1030,7 @@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
+HAVE_DECL_GETW = @HAVE_DECL_GETW@
 HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
 HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
 HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@
@@ -888,6 +1038,8 @@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
+HAVE_DECL_PROGRAM_INVOCATION_NAME = @HAVE_DECL_PROGRAM_INVOCATION_NAME@
+HAVE_DECL_PUTW = @HAVE_DECL_PUTW@
 HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
 HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@
@@ -909,6 +1061,9 @@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP3 = @HAVE_DUP3@
+HAVE_ERROR = @HAVE_ERROR@
+HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@
+HAVE_ERROR_H = @HAVE_ERROR_H@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
 HAVE_EXECVPE = @HAVE_EXECVPE@
 HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@
@@ -935,10 +1090,13 @@
 HAVE_GETOPT_H = @HAVE_GETOPT_H@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETPASS = @HAVE_GETPASS@
+HAVE_GETPROGNAME = @HAVE_GETPROGNAME@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
 HAVE_GETUMASK = @HAVE_GETUMASK@
 HAVE_GRANTPT = @HAVE_GRANTPT@
 HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_IMAXABS = @HAVE_IMAXABS@
+HAVE_IMAXDIV = @HAVE_IMAXDIV@
 HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@
 HAVE_INITSTATE = @HAVE_INITSTATE@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -957,6 +1115,7 @@
 HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
 HAVE_MBTOWC = @HAVE_MBTOWC@
 HAVE_MEMPCPY = @HAVE_MEMPCPY@
+HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@
 HAVE_MKDIRAT = @HAVE_MKDIRAT@
 HAVE_MKDTEMP = @HAVE_MKDTEMP@
 HAVE_MKFIFO = @HAVE_MKFIFO@
@@ -1032,6 +1191,7 @@
 HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@
 HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNISTRING_WOE32DLL_H = @HAVE_UNISTRING_WOE32DLL_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
 HAVE_USLEEP = @HAVE_USLEEP@
@@ -1093,6 +1253,10 @@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LCOV = @LCOV@
+LC_COLLATE_IMPLEMENTED = @LC_COLLATE_IMPLEMENTED@
+LC_MONETARY_IMPLEMENTED = @LC_MONETARY_IMPLEMENTED@
+LC_NUMERIC_IMPLEMENTED = @LC_NUMERIC_IMPLEMENTED@
+LC_TIME_IMPLEMENTED = @LC_TIME_IMPLEMENTED@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -1112,6 +1276,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
 LOG_VALGRIND = @LOG_VALGRIND@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
@@ -1132,6 +1297,7 @@
 NEXT_ASSERT_H = @NEXT_ASSERT_H@
 NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
+NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
@@ -1149,6 +1315,7 @@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
+NEXT_ERROR_H = @NEXT_ERROR_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
@@ -1204,6 +1371,9 @@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
+REPLACE_DUP3 = @REPLACE_DUP3@
+REPLACE_ERROR = @REPLACE_ERROR@
+REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@
 REPLACE_EXECL = @REPLACE_EXECL@
 REPLACE_EXECLE = @REPLACE_EXECLE@
 REPLACE_EXECLP = @REPLACE_EXECLP@
@@ -1212,10 +1382,12 @@
 REPLACE_EXECVP = @REPLACE_EXECVP@
 REPLACE_EXECVPE = @REPLACE_EXECVPE@
 REPLACE_FACCESSAT = @REPLACE_FACCESSAT@
+REPLACE_FCHDIR = @REPLACE_FCHDIR@
 REPLACE_FCHMODAT = @REPLACE_FCHMODAT@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
+REPLACE_FDATASYNC = @REPLACE_FDATASYNC@
 REPLACE_FDOPEN = @REPLACE_FDOPEN@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FFSLL = @REPLACE_FFSLL@
@@ -1237,16 +1409,22 @@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
 REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
 REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
+REPLACE_GETENTROPY = @REPLACE_GETENTROPY@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
+REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@
 REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETPASS = @REPLACE_GETPASS@
 REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@
+REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@
+REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@
 REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
+REPLACE_IMAXABS = @REPLACE_IMAXABS@
+REPLACE_IMAXDIV = @REPLACE_IMAXDIV@
 REPLACE_INITSTATE = @REPLACE_INITSTATE@
 REPLACE_ISATTY = @REPLACE_ISATTY@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
@@ -1264,14 +1442,20 @@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_MBSTOWCS = @REPLACE_MBSTOWCS@
 REPLACE_MBTOWC = @REPLACE_MBTOWC@
+REPLACE_MB_CUR_MAX = @REPLACE_MB_CUR_MAX@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
+REPLACE_MEMPCPY = @REPLACE_MEMPCPY@
+REPLACE_MEMSET_EXPLICIT = @REPLACE_MEMSET_EXPLICIT@
 REPLACE_MKDIR = @REPLACE_MKDIR@
 REPLACE_MKFIFO = @REPLACE_MKFIFO@
 REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@
 REPLACE_MKNOD = @REPLACE_MKNOD@
 REPLACE_MKNODAT = @REPLACE_MKNODAT@
+REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@
+REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@
 REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
 REPLACE_MKTIME = @REPLACE_MKTIME@
 REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
@@ -1280,8 +1464,10 @@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
 REPLACE_PERROR = @REPLACE_PERROR@
+REPLACE_PIPE2 = @REPLACE_PIPE2@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@
+REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
 REPLACE_PTSNAME = @REPLACE_PTSNAME@
@@ -1289,6 +1475,7 @@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
 REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RAND = @REPLACE_RAND@
 REPLACE_RANDOM = @REPLACE_RANDOM@
 REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
 REPLACE_READ = @REPLACE_READ@
@@ -1303,6 +1490,7 @@
 REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SETENV = @REPLACE_SETENV@
+REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@
 REPLACE_SETSTATE = @REPLACE_SETSTATE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
@@ -1310,6 +1498,7 @@
 REPLACE_STAT = @REPLACE_STAT@
 REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
+REPLACE_STPCPY = @REPLACE_STPCPY@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
 REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
@@ -1332,9 +1521,13 @@
 REPLACE_STRTOUL = @REPLACE_STRTOUL@
 REPLACE_STRTOULL = @REPLACE_STRTOULL@
 REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
+REPLACE_STRVERSCMP = @REPLACE_STRVERSCMP@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
+REPLACE_TIME = @REPLACE_TIME@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
+REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@
+REPLACE_TIMESPEC_GETRES = @REPLACE_TIMESPEC_GETRES@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
 REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
@@ -1351,21 +1544,26 @@
 REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@
 REPLACE_VSPRINTF = @REPLACE_VSPRINTF@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSCMP = @REPLACE_WCSCMP@
 REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
+REPLACE_WCSNCMP = @REPLACE_WCSNCMP@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
+REPLACE_WCSSTR = @REPLACE_WCSSTR@
 REPLACE_WCSTOK = @REPLACE_WCSTOK@
 REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
 REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+REPLACE_WMEMCMP = @REPLACE_WMEMCMP@
+REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@
 REPLACE_WRITE = @REPLACE_WRITE@
+REPLACE__EXIT = @REPLACE__EXIT@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
-STDALIGN_H = @STDALIGN_H@
 STDARG_H = @STDARG_H@
 STDCKDINT_H = @STDCKDINT_H@
 STDDEF_H = @STDDEF_H@
@@ -1388,6 +1586,8 @@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WERROR_CFLAGS = @WERROR_CFLAGS@
+WERROR_TESTS_CFLAGS = @WERROR_TESTS_CFLAGS@
 WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
 WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
@@ -1469,7 +1669,7 @@
 	-I$(top_builddir) -I$(top_builddir)/lib -I$(srcdir) \
 	-DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/unistring/ \
 	-I$(top_builddir)/unistring/
-AM_CFLAGS = $(WARN_CFLAGS)
+AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
 idn2_SOURCES = idn2.c
 idn2_LDADD = libidn2_cmd.la ../lib/libidn2.la ../gl/libgnu.la ../unistring/libunistring.la $(LTLIBUNISTRING) $(LIBS)
 noinst_LTLIBRARIES = libidn2_cmd.la

_service:tar_scm:libidn2-2.3.4.tar.gz/src/idn2.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/src/idn2.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/src/idn2.ggo -> _service:tar_scm:libidn2-2.3.7.tar.gz/src/idn2.ggo Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/tests/Makefile.am -> _service:tar_scm:libidn2-2.3.7.tar.gz/tests/Makefile.am Changed

@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2022 Simon Josefsson
+# Copyright (C) 2011-2024 Simon Josefsson
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 AM_CPPFLAGS += -I$(top_builddir)/gl -I$(top_srcdir)/gl
 AM_CPPFLAGS += -DSRCDIR=\"$(srcdir)\"
 AM_CPPFLAGS += -I$(top_srcdir)/unistring/ -I$(top_builddir)/unistring/
-AM_CFLAGS = $(WARN_CFLAGS)
+AM_CFLAGS = $(WERROR_CFLAGS) $(WERROR_TESTS_CFLAGS) $(WARN_CFLAGS)
 AM_LDFLAGS = -no-install
 
 AM_VALGRINDFLAGS = --suppressions=$(top_srcdir)/unistring/libunistring.valgrind
@@ -26,8 +26,11 @@
 LDADD += ../unistring/libunistring.la $(LTLIBUNISTRING)
 LDADD += ../gl/libgnu.la
 
-ctests = test-punycode test-lookup test-register test-strerror test-tounicode
-ctests += test-locale
+EXTRA_DIST = standalone.sh
+
+ctests = test-version test-strerror test-locale test-tounicode
+ctests += test-punycode test-compat-punycode
+ctests += test-IdnaTest-inc test-IdnaTest-txt test-lookup test-register
 if TEST_GLIBC
 ctests += test-glibc
 endif
@@ -35,22 +38,19 @@
 
 dist_check_SCRIPTS = test-idn2.sh
 
-TESTS = $(dist_check_SCRIPTS) $(ctests)
+TESTS = $(ctests) $(dist_check_SCRIPTS)
 TEST_EXTENSIONS = .sh
 LOG_COMPILER = $(LOG_VALGRIND)
 SH_LOG_COMPILER= $(SHELL) -x
 
 AM_TESTS_ENVIRONMENT = EXEEXT="$(EXEEXT)" LOG_VALGRIND="$(LOG_VALGRIND)" LIBTOOL="$(LIBTOOL)"
 
-test_punycode_LDADD = ../lib/puny_decode.o ../lib/puny_encode.o $(LDADD) $(CODE_COVERAGE_LIBS)
-
 IDNA_TXT = IdnaTest.txt
 IDNA_INC = IdnaTest.inc
-test_lookup_SOURCES = test-lookup.c
 
 BUILT_SOURCES = $(IDNA_TXT) $(IDNA_INC)
 MAINTAINERCLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = gen-utc-test.pl $(IDNA_TXT) $(IDNA_INC)
+EXTRA_DIST += gen-utc-test.pl $(IDNA_TXT) $(IDNA_INC)
 
 $(IDNA_TXT):
 	rm -f $(IDNA_TXT)

_service:tar_scm:libidn2-2.3.4.tar.gz/tests/Makefile.in -> _service:tar_scm:libidn2-2.3.7.tar.gz/tests/Makefile.in Changed

@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2011-2022 Simon Josefsson
+# Copyright (C) 2011-2024 Simon Josefsson
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -104,11 +104,10 @@
 host_triplet = @host@
 @TEST_GLIBC_TRUE@am__append_1 = test-glibc
 check_PROGRAMS = $(am__EXEEXT_2)
-TESTS = $(dist_check_SCRIPTS) $(am__EXEEXT_2)
+TESTS = $(am__EXEEXT_2) $(dist_check_SCRIPTS)
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/unistring/m4/codeset.m4 \
-	$(top_srcdir)/unistring/m4/free.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/unistring/m4/free.m4 \
 	$(top_srcdir)/unistring/m4/gnulib-comp.m4 \
 	$(top_srcdir)/unistring/m4/host-cpu-c-abi.m4 \
 	$(top_srcdir)/unistring/m4/iconv.m4 \
@@ -122,15 +121,19 @@
 	$(top_srcdir)/unistring/m4/libunistring-optional.m4 \
 	$(top_srcdir)/unistring/m4/libunistring.m4 \
 	$(top_srcdir)/unistring/m4/localcharset.m4 \
+	$(top_srcdir)/unistring/m4/unictype_h.m4 \
+	$(top_srcdir)/unistring/m4/uninorm_h.m4 \
 	$(top_srcdir)/unistring/m4/wchar_h.m4 \
 	$(top_srcdir)/gl/m4/00gnulib.m4 \
 	$(top_srcdir)/gl/m4/__inline.m4 \
 	$(top_srcdir)/gl/m4/absolute-header.m4 \
 	$(top_srcdir)/gl/m4/alloca.m4 $(top_srcdir)/gl/m4/assert_h.m4 \
 	$(top_srcdir)/gl/m4/c-bool.m4 $(top_srcdir)/gl/m4/close.m4 \
+	$(top_srcdir)/gl/m4/codeset.m4 \
 	$(top_srcdir)/gl/m4/double-slash-root.m4 \
 	$(top_srcdir)/gl/m4/dup2.m4 $(top_srcdir)/gl/m4/eealloc.m4 \
 	$(top_srcdir)/gl/m4/errno_h.m4 $(top_srcdir)/gl/m4/error.m4 \
+	$(top_srcdir)/gl/m4/error_h.m4 \
 	$(top_srcdir)/gl/m4/extensions.m4 \
 	$(top_srcdir)/gl/m4/extern-inline.m4 \
 	$(top_srcdir)/gl/m4/fcntl-o.m4 $(top_srcdir)/gl/m4/fcntl.m4 \
@@ -145,12 +148,14 @@
 	$(top_srcdir)/gl/m4/inline.m4 $(top_srcdir)/gl/m4/largefile.m4 \
 	$(top_srcdir)/gl/m4/ld-output-def.m4 \
 	$(top_srcdir)/gl/m4/ld-version-script.m4 \
-	$(top_srcdir)/gl/m4/limits-h.m4 $(top_srcdir)/gl/m4/malloca.m4 \
+	$(top_srcdir)/gl/m4/limits-h.m4 \
+	$(top_srcdir)/gl/m4/locale-fr.m4 \
+	$(top_srcdir)/gl/m4/malloca.m4 \
 	$(top_srcdir)/gl/m4/manywarnings.m4 \
 	$(top_srcdir)/gl/m4/mode_t.m4 \
 	$(top_srcdir)/gl/m4/msvc-inval.m4 \
 	$(top_srcdir)/gl/m4/msvc-nothrow.m4 \
-	$(top_srcdir)/gl/m4/multiarch.m4 \
+	$(top_srcdir)/gl/m4/multiarch.m4 $(top_srcdir)/gl/m4/musl.m4 \
 	$(top_srcdir)/gl/m4/nocrash.m4 $(top_srcdir)/gl/m4/off_t.m4 \
 	$(top_srcdir)/gl/m4/open-cloexec.m4 \
 	$(top_srcdir)/gl/m4/open-slash.m4 $(top_srcdir)/gl/m4/open.m4 \
@@ -158,9 +163,9 @@
 	$(top_srcdir)/gl/m4/rawmemchr.m4 \
 	$(top_srcdir)/gl/m4/ssize_t.m4 \
 	$(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \
-	$(top_srcdir)/gl/m4/stdalign.m4 $(top_srcdir)/gl/m4/stdarg.m4 \
-	$(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \
-	$(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \
+	$(top_srcdir)/gl/m4/stdarg.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \
+	$(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \
+	$(top_srcdir)/gl/m4/stdlib_h.m4 \
 	$(top_srcdir)/gl/m4/strchrnul.m4 \
 	$(top_srcdir)/gl/m4/strerror.m4 \
 	$(top_srcdir)/gl/m4/string_h.m4 \
@@ -174,8 +179,7 @@
 	$(top_srcdir)/gl/m4/visibility.m4 \
 	$(top_srcdir)/gl/m4/warn-on-use.m4 \
 	$(top_srcdir)/gl/m4/warnings.m4 $(top_srcdir)/gl/m4/wchar_t.m4 \
-	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/year2038.m4 \
-	$(top_srcdir)/gl/m4/zzgnulib.m4 \
+	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/zzgnulib.m4 \
 	$(top_srcdir)/m4/ax_ac_append_to_file.m4 \
 	$(top_srcdir)/m4/ax_ac_print_to_file.m4 \
 	$(top_srcdir)/m4/ax_add_am_macro_static.m4 \
@@ -199,38 +203,58 @@
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 @TEST_GLIBC_TRUE@am__EXEEXT_1 = test-glibc$(EXEEXT)
-am__EXEEXT_2 = test-punycode$(EXEEXT) test-lookup$(EXEEXT) \
-	test-register$(EXEEXT) test-strerror$(EXEEXT) \
-	test-tounicode$(EXEEXT) test-locale$(EXEEXT) $(am__EXEEXT_1)
-test_glibc_SOURCES = test-glibc.c
-test_glibc_OBJECTS = test-glibc.$(OBJEXT)
-test_glibc_LDADD = $(LDADD)
+am__EXEEXT_2 = test-version$(EXEEXT) test-strerror$(EXEEXT) \
+	test-locale$(EXEEXT) test-tounicode$(EXEEXT) \
+	test-punycode$(EXEEXT) test-compat-punycode$(EXEEXT) \
+	test-IdnaTest-inc$(EXEEXT) test-IdnaTest-txt$(EXEEXT) \
+	test-lookup$(EXEEXT) test-register$(EXEEXT) $(am__EXEEXT_1)
+test_IdnaTest_inc_SOURCES = test-IdnaTest-inc.c
+test_IdnaTest_inc_OBJECTS = test-IdnaTest-inc.$(OBJEXT)
+test_IdnaTest_inc_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
-test_glibc_DEPENDENCIES = ../lib/libidn2.la \
+test_IdnaTest_inc_DEPENDENCIES = ../lib/libidn2.la \
 	../unistring/libunistring.la $(am__DEPENDENCIES_1) \
 	../gl/libgnu.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
+test_IdnaTest_txt_SOURCES = test-IdnaTest-txt.c
+test_IdnaTest_txt_OBJECTS = test-IdnaTest-txt.$(OBJEXT)
+test_IdnaTest_txt_LDADD = $(LDADD)
+test_IdnaTest_txt_DEPENDENCIES = ../lib/libidn2.la \
+	../unistring/libunistring.la $(am__DEPENDENCIES_1) \
+	../gl/libgnu.la
+test_compat_punycode_SOURCES = test-compat-punycode.c
+test_compat_punycode_OBJECTS = test-compat-punycode.$(OBJEXT)
+test_compat_punycode_LDADD = $(LDADD)
+test_compat_punycode_DEPENDENCIES = ../lib/libidn2.la \
+	../unistring/libunistring.la $(am__DEPENDENCIES_1) \
+	../gl/libgnu.la
+test_glibc_SOURCES = test-glibc.c
+test_glibc_OBJECTS = test-glibc.$(OBJEXT)
+test_glibc_LDADD = $(LDADD)
+test_glibc_DEPENDENCIES = ../lib/libidn2.la \
+	../unistring/libunistring.la $(am__DEPENDENCIES_1) \
+	../gl/libgnu.la
 test_locale_SOURCES = test-locale.c
 test_locale_OBJECTS = test-locale.$(OBJEXT)
 test_locale_LDADD = $(LDADD)
 test_locale_DEPENDENCIES = ../lib/libidn2.la \
 	../unistring/libunistring.la $(am__DEPENDENCIES_1) \
 	../gl/libgnu.la
-am_test_lookup_OBJECTS = test-lookup.$(OBJEXT)
-test_lookup_OBJECTS = $(am_test_lookup_OBJECTS)
+test_lookup_SOURCES = test-lookup.c
+test_lookup_OBJECTS = test-lookup.$(OBJEXT)
 test_lookup_LDADD = $(LDADD)
 test_lookup_DEPENDENCIES = ../lib/libidn2.la \
 	../unistring/libunistring.la $(am__DEPENDENCIES_1) \
 	../gl/libgnu.la
 test_punycode_SOURCES = test-punycode.c
 test_punycode_OBJECTS = test-punycode.$(OBJEXT)
-am__DEPENDENCIES_2 = ../lib/libidn2.la ../unistring/libunistring.la \
-	$(am__DEPENDENCIES_1) ../gl/libgnu.la
-test_punycode_DEPENDENCIES = ../lib/puny_decode.o ../lib/puny_encode.o \
-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+test_punycode_LDADD = $(LDADD)
+test_punycode_DEPENDENCIES = ../lib/libidn2.la \
+	../unistring/libunistring.la $(am__DEPENDENCIES_1) \
+	../gl/libgnu.la
 test_register_SOURCES = test-register.c
 test_register_OBJECTS = test-register.$(OBJEXT)
 test_register_LDADD = $(LDADD)
@@ -249,6 +273,12 @@
 test_tounicode_DEPENDENCIES = ../lib/libidn2.la \
 	../unistring/libunistring.la $(am__DEPENDENCIES_1) \
 	../gl/libgnu.la
+test_version_SOURCES = test-version.c
+test_version_OBJECTS = test-version.$(OBJEXT)
+test_version_LDADD = $(LDADD)
+test_version_DEPENDENCIES = ../lib/libidn2.la \
+	../unistring/libunistring.la $(am__DEPENDENCIES_1) \
+	../gl/libgnu.la
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -264,10 +294,13 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/test-glibc.Po \
+am__depfiles_remade = ./$(DEPDIR)/test-IdnaTest-inc.Po \
+	./$(DEPDIR)/test-IdnaTest-txt.Po \
+	./$(DEPDIR)/test-compat-punycode.Po ./$(DEPDIR)/test-glibc.Po \
 	./$(DEPDIR)/test-locale.Po ./$(DEPDIR)/test-lookup.Po \
 	./$(DEPDIR)/test-punycode.Po ./$(DEPDIR)/test-register.Po \
-	./$(DEPDIR)/test-strerror.Po ./$(DEPDIR)/test-tounicode.Po
+	./$(DEPDIR)/test-strerror.Po ./$(DEPDIR)/test-tounicode.Po \
+	./$(DEPDIR)/test-version.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -287,12 +320,14 @@
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = test-glibc.c test-locale.c $(test_lookup_SOURCES) \
-	test-punycode.c test-register.c test-strerror.c \
-	test-tounicode.c
-DIST_SOURCES = test-glibc.c test-locale.c $(test_lookup_SOURCES) \
-	test-punycode.c test-register.c test-strerror.c \
-	test-tounicode.c
+SOURCES = test-IdnaTest-inc.c test-IdnaTest-txt.c \
+	test-compat-punycode.c test-glibc.c test-locale.c \
+	test-lookup.c test-punycode.c test-register.c test-strerror.c \
+	test-tounicode.c test-version.c
+DIST_SOURCES = test-IdnaTest-inc.c test-IdnaTest-txt.c \
+	test-compat-punycode.c test-glibc.c test-locale.c \
+	test-lookup.c test-punycode.c test-register.c test-strerror.c \
+	test-tounicode.c test-version.c
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -664,6 +699,7 @@
 GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@
 GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@
 GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@
+GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@
 GL_GNULIB_GETSUBOPT = @GL_GNULIB_GETSUBOPT@
 GL_GNULIB_GETUMASK = @GL_GNULIB_GETUMASK@
 GL_GNULIB_GETUSERSHELL = @GL_GNULIB_GETUSERSHELL@
@@ -693,6 +729,7 @@
 GL_GNULIB_MBSSPN = @GL_GNULIB_MBSSPN@
 GL_GNULIB_MBSSTR = @GL_GNULIB_MBSSTR@
 GL_GNULIB_MBSTOK_R = @GL_GNULIB_MBSTOK_R@
+GL_GNULIB_MBSTOWCS = @GL_GNULIB_MBSTOWCS@
 GL_GNULIB_MBTOWC = @GL_GNULIB_MBTOWC@
 GL_GNULIB_MDA_ACCESS = @GL_GNULIB_MDA_ACCESS@
 GL_GNULIB_MDA_CHDIR = @GL_GNULIB_MDA_CHDIR@
@@ -738,6 +775,7 @@
 GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@
 GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@
 GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@
+GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@
 GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@
 GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@
 GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@
@@ -775,6 +813,7 @@
 GL_GNULIB_PUTS = @GL_GNULIB_PUTS@
 GL_GNULIB_PWRITE = @GL_GNULIB_PWRITE@
 GL_GNULIB_QSORT_R = @GL_GNULIB_QSORT_R@
+GL_GNULIB_RAND = @GL_GNULIB_RAND@
 GL_GNULIB_RANDOM = @GL_GNULIB_RANDOM@
 GL_GNULIB_RANDOM_R = @GL_GNULIB_RANDOM_R@
 GL_GNULIB_RAWMEMCHR = @GL_GNULIB_RAWMEMCHR@
@@ -830,6 +869,7 @@
 GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@
 GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@
 GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@
+GL_GNULIB_TIME = @GL_GNULIB_TIME@
 GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@
 GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@
 GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@
@@ -907,6 +947,7 @@
 GL_UNISTRING_GNULIB_GETPAGESIZE = @GL_UNISTRING_GNULIB_GETPAGESIZE@
 GL_UNISTRING_GNULIB_GETPASS = @GL_UNISTRING_GNULIB_GETPASS@
 GL_UNISTRING_GNULIB_GETPASS_GNU = @GL_UNISTRING_GNULIB_GETPASS_GNU@
+GL_UNISTRING_GNULIB_GETPROGNAME = @GL_UNISTRING_GNULIB_GETPROGNAME@
 GL_UNISTRING_GNULIB_GETSUBOPT = @GL_UNISTRING_GNULIB_GETSUBOPT@
 GL_UNISTRING_GNULIB_GETUSERSHELL = @GL_UNISTRING_GNULIB_GETUSERSHELL@
 GL_UNISTRING_GNULIB_GRANTPT = @GL_UNISTRING_GNULIB_GRANTPT@
@@ -940,6 +981,8 @@
 GL_UNISTRING_GNULIB_MBSSPN = @GL_UNISTRING_GNULIB_MBSSPN@
 GL_UNISTRING_GNULIB_MBSSTR = @GL_UNISTRING_GNULIB_MBSSTR@
 GL_UNISTRING_GNULIB_MBSTOK_R = @GL_UNISTRING_GNULIB_MBSTOK_R@
+GL_UNISTRING_GNULIB_MBSTOWCS = @GL_UNISTRING_GNULIB_MBSTOWCS@
+GL_UNISTRING_GNULIB_MBSZERO = @GL_UNISTRING_GNULIB_MBSZERO@
 GL_UNISTRING_GNULIB_MBTOWC = @GL_UNISTRING_GNULIB_MBTOWC@
 GL_UNISTRING_GNULIB_MDA_ACCESS = @GL_UNISTRING_GNULIB_MDA_ACCESS@
 GL_UNISTRING_GNULIB_MDA_CHDIR = @GL_UNISTRING_GNULIB_MDA_CHDIR@
@@ -974,6 +1017,7 @@
 GL_UNISTRING_GNULIB_MEMMEM = @GL_UNISTRING_GNULIB_MEMMEM@
 GL_UNISTRING_GNULIB_MEMPCPY = @GL_UNISTRING_GNULIB_MEMPCPY@
 GL_UNISTRING_GNULIB_MEMRCHR = @GL_UNISTRING_GNULIB_MEMRCHR@
+GL_UNISTRING_GNULIB_MEMSET_EXPLICIT = @GL_UNISTRING_GNULIB_MEMSET_EXPLICIT@
 GL_UNISTRING_GNULIB_MKDTEMP = @GL_UNISTRING_GNULIB_MKDTEMP@
 GL_UNISTRING_GNULIB_MKOSTEMP = @GL_UNISTRING_GNULIB_MKOSTEMP@
 GL_UNISTRING_GNULIB_MKOSTEMPS = @GL_UNISTRING_GNULIB_MKOSTEMPS@
@@ -989,6 +1033,7 @@
 GL_UNISTRING_GNULIB_PUTENV = @GL_UNISTRING_GNULIB_PUTENV@
 GL_UNISTRING_GNULIB_PWRITE = @GL_UNISTRING_GNULIB_PWRITE@
 GL_UNISTRING_GNULIB_QSORT_R = @GL_UNISTRING_GNULIB_QSORT_R@
+GL_UNISTRING_GNULIB_RAND = @GL_UNISTRING_GNULIB_RAND@
 GL_UNISTRING_GNULIB_RANDOM = @GL_UNISTRING_GNULIB_RANDOM@
 GL_UNISTRING_GNULIB_RANDOM_R = @GL_UNISTRING_GNULIB_RANDOM_R@
 GL_UNISTRING_GNULIB_RAWMEMCHR = @GL_UNISTRING_GNULIB_RAWMEMCHR@
@@ -1037,6 +1082,141 @@
 GL_UNISTRING_GNULIB_SYSTEM_POSIX = @GL_UNISTRING_GNULIB_SYSTEM_POSIX@
 GL_UNISTRING_GNULIB_TRUNCATE = @GL_UNISTRING_GNULIB_TRUNCATE@
 GL_UNISTRING_GNULIB_TTYNAME_R = @GL_UNISTRING_GNULIB_TTYNAME_R@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE@
 GL_UNISTRING_GNULIB_UNISTD_H_GETOPT = @GL_UNISTRING_GNULIB_UNISTD_H_GETOPT@
 GL_UNISTRING_GNULIB_UNISTD_H_NONBLOCKING = @GL_UNISTRING_GNULIB_UNISTD_H_NONBLOCKING@
 GL_UNISTRING_GNULIB_UNISTD_H_SIGPIPE = @GL_UNISTRING_GNULIB_UNISTD_H_SIGPIPE@
@@ -1075,6 +1255,7 @@
 GL_UNISTRING_GNULIB_WCTOB = @GL_UNISTRING_GNULIB_WCTOB@
 GL_UNISTRING_GNULIB_WCTOMB = @GL_UNISTRING_GNULIB_WCTOMB@
 GL_UNISTRING_GNULIB_WCWIDTH = @GL_UNISTRING_GNULIB_WCWIDTH@
+GL_UNISTRING_GNULIB_WGETCWD = @GL_UNISTRING_GNULIB_WGETCWD@
 GL_UNISTRING_GNULIB_WMEMCHR = @GL_UNISTRING_GNULIB_WMEMCHR@
 GL_UNISTRING_GNULIB_WMEMCMP = @GL_UNISTRING_GNULIB_WMEMCMP@
 GL_UNISTRING_GNULIB_WMEMCPY = @GL_UNISTRING_GNULIB_WMEMCPY@
@@ -1086,7 +1267,6 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@
-GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
@@ -1122,6 +1302,7 @@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
+HAVE_DECL_GETW = @HAVE_DECL_GETW@
 HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
 HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
 HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@
@@ -1129,6 +1310,8 @@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
+HAVE_DECL_PROGRAM_INVOCATION_NAME = @HAVE_DECL_PROGRAM_INVOCATION_NAME@
+HAVE_DECL_PUTW = @HAVE_DECL_PUTW@
 HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
 HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@
@@ -1150,6 +1333,9 @@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP3 = @HAVE_DUP3@
+HAVE_ERROR = @HAVE_ERROR@
+HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@
+HAVE_ERROR_H = @HAVE_ERROR_H@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
 HAVE_EXECVPE = @HAVE_EXECVPE@
 HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@
@@ -1176,10 +1362,13 @@
 HAVE_GETOPT_H = @HAVE_GETOPT_H@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETPASS = @HAVE_GETPASS@
+HAVE_GETPROGNAME = @HAVE_GETPROGNAME@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
 HAVE_GETUMASK = @HAVE_GETUMASK@
 HAVE_GRANTPT = @HAVE_GRANTPT@
 HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_IMAXABS = @HAVE_IMAXABS@
+HAVE_IMAXDIV = @HAVE_IMAXDIV@
 HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@
 HAVE_INITSTATE = @HAVE_INITSTATE@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -1198,6 +1387,7 @@
 HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
 HAVE_MBTOWC = @HAVE_MBTOWC@
 HAVE_MEMPCPY = @HAVE_MEMPCPY@
+HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@
 HAVE_MKDIRAT = @HAVE_MKDIRAT@
 HAVE_MKDTEMP = @HAVE_MKDTEMP@
 HAVE_MKFIFO = @HAVE_MKFIFO@
@@ -1273,6 +1463,7 @@
 HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@
 HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNISTRING_WOE32DLL_H = @HAVE_UNISTRING_WOE32DLL_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
 HAVE_USLEEP = @HAVE_USLEEP@
@@ -1334,6 +1525,10 @@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LCOV = @LCOV@
+LC_COLLATE_IMPLEMENTED = @LC_COLLATE_IMPLEMENTED@
+LC_MONETARY_IMPLEMENTED = @LC_MONETARY_IMPLEMENTED@
+LC_NUMERIC_IMPLEMENTED = @LC_NUMERIC_IMPLEMENTED@
+LC_TIME_IMPLEMENTED = @LC_TIME_IMPLEMENTED@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -1353,6 +1548,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
 LOG_VALGRIND = @LOG_VALGRIND@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
@@ -1373,6 +1569,7 @@
 NEXT_ASSERT_H = @NEXT_ASSERT_H@
 NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
+NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
@@ -1390,6 +1587,7 @@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
+NEXT_ERROR_H = @NEXT_ERROR_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
@@ -1445,6 +1643,9 @@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
+REPLACE_DUP3 = @REPLACE_DUP3@
+REPLACE_ERROR = @REPLACE_ERROR@
+REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@
 REPLACE_EXECL = @REPLACE_EXECL@
 REPLACE_EXECLE = @REPLACE_EXECLE@
 REPLACE_EXECLP = @REPLACE_EXECLP@
@@ -1453,10 +1654,12 @@
 REPLACE_EXECVP = @REPLACE_EXECVP@
 REPLACE_EXECVPE = @REPLACE_EXECVPE@
 REPLACE_FACCESSAT = @REPLACE_FACCESSAT@
+REPLACE_FCHDIR = @REPLACE_FCHDIR@
 REPLACE_FCHMODAT = @REPLACE_FCHMODAT@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
+REPLACE_FDATASYNC = @REPLACE_FDATASYNC@
 REPLACE_FDOPEN = @REPLACE_FDOPEN@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FFSLL = @REPLACE_FFSLL@
@@ -1478,16 +1681,22 @@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
 REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
 REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
+REPLACE_GETENTROPY = @REPLACE_GETENTROPY@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
+REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@
 REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETPASS = @REPLACE_GETPASS@
 REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@
+REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@
+REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@
 REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
+REPLACE_IMAXABS = @REPLACE_IMAXABS@
+REPLACE_IMAXDIV = @REPLACE_IMAXDIV@
 REPLACE_INITSTATE = @REPLACE_INITSTATE@
 REPLACE_ISATTY = @REPLACE_ISATTY@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
@@ -1505,14 +1714,20 @@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_MBSTOWCS = @REPLACE_MBSTOWCS@
 REPLACE_MBTOWC = @REPLACE_MBTOWC@
+REPLACE_MB_CUR_MAX = @REPLACE_MB_CUR_MAX@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
+REPLACE_MEMPCPY = @REPLACE_MEMPCPY@
+REPLACE_MEMSET_EXPLICIT = @REPLACE_MEMSET_EXPLICIT@
 REPLACE_MKDIR = @REPLACE_MKDIR@
 REPLACE_MKFIFO = @REPLACE_MKFIFO@
 REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@
 REPLACE_MKNOD = @REPLACE_MKNOD@
 REPLACE_MKNODAT = @REPLACE_MKNODAT@
+REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@
+REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@
 REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
 REPLACE_MKTIME = @REPLACE_MKTIME@
 REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
@@ -1521,8 +1736,10 @@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
 REPLACE_PERROR = @REPLACE_PERROR@
+REPLACE_PIPE2 = @REPLACE_PIPE2@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@
+REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
 REPLACE_PTSNAME = @REPLACE_PTSNAME@
@@ -1530,6 +1747,7 @@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
 REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RAND = @REPLACE_RAND@
 REPLACE_RANDOM = @REPLACE_RANDOM@
 REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
 REPLACE_READ = @REPLACE_READ@
@@ -1544,6 +1762,7 @@
 REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SETENV = @REPLACE_SETENV@
+REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@
 REPLACE_SETSTATE = @REPLACE_SETSTATE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
@@ -1551,6 +1770,7 @@
 REPLACE_STAT = @REPLACE_STAT@
 REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
+REPLACE_STPCPY = @REPLACE_STPCPY@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
 REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
@@ -1573,9 +1793,13 @@
 REPLACE_STRTOUL = @REPLACE_STRTOUL@
 REPLACE_STRTOULL = @REPLACE_STRTOULL@
 REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
+REPLACE_STRVERSCMP = @REPLACE_STRVERSCMP@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
+REPLACE_TIME = @REPLACE_TIME@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
+REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@
+REPLACE_TIMESPEC_GETRES = @REPLACE_TIMESPEC_GETRES@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
 REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
@@ -1592,21 +1816,26 @@
 REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@
 REPLACE_VSPRINTF = @REPLACE_VSPRINTF@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSCMP = @REPLACE_WCSCMP@
 REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
+REPLACE_WCSNCMP = @REPLACE_WCSNCMP@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
+REPLACE_WCSSTR = @REPLACE_WCSSTR@
 REPLACE_WCSTOK = @REPLACE_WCSTOK@
 REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
 REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+REPLACE_WMEMCMP = @REPLACE_WMEMCMP@
+REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@
 REPLACE_WRITE = @REPLACE_WRITE@
+REPLACE__EXIT = @REPLACE__EXIT@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
-STDALIGN_H = @STDALIGN_H@
 STDARG_H = @STDARG_H@
 STDCKDINT_H = @STDCKDINT_H@
 STDDEF_H = @STDDEF_H@
@@ -1629,6 +1858,8 @@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WERROR_CFLAGS = @WERROR_CFLAGS@
+WERROR_TESTS_CFLAGS = @WERROR_TESTS_CFLAGS@
 WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
 WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
@@ -1710,24 +1941,23 @@
 	-I$(top_builddir)/lib -I$(srcdir) -I$(top_builddir) \
 	-I$(top_builddir)/gl -I$(top_srcdir)/gl -DSRCDIR=\"$(srcdir)\" \
 	-I$(top_srcdir)/unistring/ -I$(top_builddir)/unistring/
-AM_CFLAGS = $(WARN_CFLAGS)
+AM_CFLAGS = $(WERROR_CFLAGS) $(WERROR_TESTS_CFLAGS) $(WARN_CFLAGS)
 AM_LDFLAGS = -no-install
 LDADD = ../lib/libidn2.la ../unistring/libunistring.la \
 	$(LTLIBUNISTRING) ../gl/libgnu.la
-ctests = test-punycode test-lookup test-register test-strerror \
-	test-tounicode test-locale $(am__append_1)
+EXTRA_DIST = standalone.sh gen-utc-test.pl $(IDNA_TXT) $(IDNA_INC)
+ctests = test-version test-strerror test-locale test-tounicode \
+	test-punycode test-compat-punycode test-IdnaTest-inc \
+	test-IdnaTest-txt test-lookup test-register $(am__append_1)
 dist_check_SCRIPTS = test-idn2.sh
 TEST_EXTENSIONS = .sh
 LOG_COMPILER = $(LOG_VALGRIND)
 SH_LOG_COMPILER = $(SHELL) -x
 AM_TESTS_ENVIRONMENT = EXEEXT="$(EXEEXT)" LOG_VALGRIND="$(LOG_VALGRIND)" LIBTOOL="$(LIBTOOL)"
-test_punycode_LDADD = ../lib/puny_decode.o ../lib/puny_encode.o $(LDADD) $(CODE_COVERAGE_LIBS)
 IDNA_TXT = IdnaTest.txt
 IDNA_INC = IdnaTest.inc
-test_lookup_SOURCES = test-lookup.c
 BUILT_SOURCES = $(IDNA_TXT) $(IDNA_INC)
 MAINTAINERCLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = gen-utc-test.pl $(IDNA_TXT) $(IDNA_INC)
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -1772,6 +2002,18 @@
 	echo " rm -f" $$list; \
 	rm -f $$list
 
+test-IdnaTest-inc$(EXEEXT): $(test_IdnaTest_inc_OBJECTS) $(test_IdnaTest_inc_DEPENDENCIES) $(EXTRA_test_IdnaTest_inc_DEPENDENCIES) 
+	@rm -f test-IdnaTest-inc$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_IdnaTest_inc_OBJECTS) $(test_IdnaTest_inc_LDADD) $(LIBS)
+
+test-IdnaTest-txt$(EXEEXT): $(test_IdnaTest_txt_OBJECTS) $(test_IdnaTest_txt_DEPENDENCIES) $(EXTRA_test_IdnaTest_txt_DEPENDENCIES) 
+	@rm -f test-IdnaTest-txt$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_IdnaTest_txt_OBJECTS) $(test_IdnaTest_txt_LDADD) $(LIBS)
+
+test-compat-punycode$(EXEEXT): $(test_compat_punycode_OBJECTS) $(test_compat_punycode_DEPENDENCIES) $(EXTRA_test_compat_punycode_DEPENDENCIES) 
+	@rm -f test-compat-punycode$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_compat_punycode_OBJECTS) $(test_compat_punycode_LDADD) $(LIBS)
+
 test-glibc$(EXEEXT): $(test_glibc_OBJECTS) $(test_glibc_DEPENDENCIES) $(EXTRA_test_glibc_DEPENDENCIES) 
 	@rm -f test-glibc$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_glibc_OBJECTS) $(test_glibc_LDADD) $(LIBS)
@@ -1800,12 +2042,19 @@
 	@rm -f test-tounicode$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_tounicode_OBJECTS) $(test_tounicode_LDADD) $(LIBS)
 
+test-version$(EXEEXT): $(test_version_OBJECTS) $(test_version_DEPENDENCIES) $(EXTRA_test_version_DEPENDENCIES) 
+	@rm -f test-version$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_version_OBJECTS) $(test_version_LDADD) $(LIBS)
+
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-IdnaTest-inc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-IdnaTest-txt.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-compat-punycode.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-glibc.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-locale.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-lookup.Po@am__quote@ # am--include-marker
@@ -1813,6 +2062,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-register.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-strerror.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-tounicode.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-version.Po@am__quote@ # am--include-marker
 
 $(am__depfiles_remade):
 	@$(MKDIR_P) $(@D)
@@ -2043,6 +2293,34 @@
 	        am__force_recheck=am--force-recheck \
 	        TEST_LOGS="$$log_list"; \
 	exit $$?
+test-version.log: test-version$(EXEEXT)
+	@p='test-version$(EXEEXT)'; \
+	b='test-version'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-strerror.log: test-strerror$(EXEEXT)
+	@p='test-strerror$(EXEEXT)'; \
+	b='test-strerror'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-locale.log: test-locale$(EXEEXT)
+	@p='test-locale$(EXEEXT)'; \
+	b='test-locale'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test-tounicode.log: test-tounicode$(EXEEXT)
+	@p='test-tounicode$(EXEEXT)'; \
+	b='test-tounicode'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test-punycode.log: test-punycode$(EXEEXT)
 	@p='test-punycode$(EXEEXT)'; \
 	b='test-punycode'; \
@@ -2050,37 +2328,37 @@
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test-lookup.log: test-lookup$(EXEEXT)
-	@p='test-lookup$(EXEEXT)'; \
-	b='test-lookup'; \
+test-compat-punycode.log: test-compat-punycode$(EXEEXT)
+	@p='test-compat-punycode$(EXEEXT)'; \
+	b='test-compat-punycode'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test-register.log: test-register$(EXEEXT)
-	@p='test-register$(EXEEXT)'; \
-	b='test-register'; \
+test-IdnaTest-inc.log: test-IdnaTest-inc$(EXEEXT)
+	@p='test-IdnaTest-inc$(EXEEXT)'; \
+	b='test-IdnaTest-inc'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test-strerror.log: test-strerror$(EXEEXT)
-	@p='test-strerror$(EXEEXT)'; \
-	b='test-strerror'; \
+test-IdnaTest-txt.log: test-IdnaTest-txt$(EXEEXT)
+	@p='test-IdnaTest-txt$(EXEEXT)'; \
+	b='test-IdnaTest-txt'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test-tounicode.log: test-tounicode$(EXEEXT)
-	@p='test-tounicode$(EXEEXT)'; \
-	b='test-tounicode'; \
+test-lookup.log: test-lookup$(EXEEXT)
+	@p='test-lookup$(EXEEXT)'; \
+	b='test-lookup'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test-locale.log: test-locale$(EXEEXT)
-	@p='test-locale$(EXEEXT)'; \
-	b='test-locale'; \
+test-register.log: test-register$(EXEEXT)
+	@p='test-register$(EXEEXT)'; \
+	b='test-register'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
@@ -2190,13 +2468,17 @@
 	mostlyclean-am
 
 distclean: distclean-am
-		-rm -f ./$(DEPDIR)/test-glibc.Po
+		-rm -f ./$(DEPDIR)/test-IdnaTest-inc.Po
+	-rm -f ./$(DEPDIR)/test-IdnaTest-txt.Po
+	-rm -f ./$(DEPDIR)/test-compat-punycode.Po
+	-rm -f ./$(DEPDIR)/test-glibc.Po
 	-rm -f ./$(DEPDIR)/test-locale.Po
 	-rm -f ./$(DEPDIR)/test-lookup.Po
 	-rm -f ./$(DEPDIR)/test-punycode.Po
 	-rm -f ./$(DEPDIR)/test-register.Po
 	-rm -f ./$(DEPDIR)/test-strerror.Po
 	-rm -f ./$(DEPDIR)/test-tounicode.Po
+	-rm -f ./$(DEPDIR)/test-version.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -2242,13 +2524,17 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/test-glibc.Po
+		-rm -f ./$(DEPDIR)/test-IdnaTest-inc.Po
+	-rm -f ./$(DEPDIR)/test-IdnaTest-txt.Po
+	-rm -f ./$(DEPDIR)/test-compat-punycode.Po
+	-rm -f ./$(DEPDIR)/test-glibc.Po
 	-rm -f ./$(DEPDIR)/test-locale.Po
 	-rm -f ./$(DEPDIR)/test-lookup.Po
 	-rm -f ./$(DEPDIR)/test-punycode.Po
 	-rm -f ./$(DEPDIR)/test-register.Po
 	-rm -f ./$(DEPDIR)/test-strerror.Po
 	-rm -f ./$(DEPDIR)/test-tounicode.Po
+	-rm -f ./$(DEPDIR)/test-version.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic

_service:tar_scm:libidn2-2.3.4.tar.gz/tests/gen-utc-test.pl -> _service:tar_scm:libidn2-2.3.7.tar.gz/tests/gen-utc-test.pl Changed

_service:tar_scm:libidn2-2.3.7.tar.gz/tests/standalone.sh Added

@@ -0,0 +1,141 @@
+#!/bin/sh
+
+# Copyright (C) 2024 Simon Josefsson
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# standalone.sh: build and run libidn2's C-based test suite.
+#
+# To check that system libidn2 behaves:
+#
+# tests/standalone.sh
+#
+# To specify the location of the libidn2 tests/ sub-directory use srcdir:
+#
+# srcdir=/home/user/src/libidn2/tests /usr/local/libexec/libidn2/standalone.sh
+#
+# If your system libidn2 is too old to pass certain tests, disable
+# them using STANDALONE_DISABLE like this:
+#
+# STANDALONE_DISABLE='*punycode*' tests/standalone.sh
+#
+# To disable multiple tests, separate each glob pattern with whitespace:
+#
+# STANDALONE_DISABLE='*punycode* *register*' tests/standalone.sh
+#
+# To avoid glob patterns but use explicit names, use names relative to
+# the $srcdir used:
+#
+# STANDALONE_DISABLE='tests/test-punycode.c tests/test-compat-punycode.c' tests/standalone.sh
+#
+# To specify a particular idn2 tool to test use the IDN2 variable, by
+# default it searches for idn2 in your PATH using 'command -v'.
+#
+# IDN2=/usr/local/bin/idn2 tests/standalone.sh
+#
+# To check a newly built STATIC libidn WITH system -lunistring:
+#
+# env STANDALONE_CFLAGS="-Ilib lib/.libs/libidn2.a unistring/.libs/libunistring.a gl/.libs/libgnu.a -lunistring" tests/standalone.sh
+#
+# To check a newly built SHARED libidn WITH system -lunistring:
+#
+# env STANDALONE_CFLAGS="-Ilib -Wl,-rpath lib/.libs lib/.libs/libidn2.so unistring/.libs/libunistring.a gl/.libs/libgnu.a -lunistring" tests/standalone.sh
+#
+# To check a newly built STATIC libidn WITHOUT system -lunistring:
+#
+# env STANDALONE_CFLAGS="-DHAVE_CONFIG_H -I. -Ilib -Iunistring lib/.libs/libidn2.a unistring/.libs/libunistring.a gl/.libs/libgnu.a" tests/standalone.sh
+#
+# To check a newly built SHARED libidn WITHOUT system -lunistring:
+#
+# env STANDALONE_CFLAGS="-DHAVE_CONFIG_H -I. -Ilib -Iunistring -Wl,-rpath lib/.libs lib/.libs/libidn2.so unistring/.libs/libunistring.a gl/.libs/libgnu.a" tests/standalone.sh
+#
+# All variables can be combined to support combined behaviour.
+
+set -e
+
+srcdir="${srcdir:-$(dirname "$0")}"
+STANDALONE_CC="${CC:-cc}"
+STANDALONE_CFLAGS="${STANDALONE_CFLAGS:--lidn2 -lunistring}"
+IDN2=${IDN2:-$(command -v idn2 || echo $srcdir/../src/idn2$EXEEXT)}; export IDN2
+
+echo "srcdir=$srcdir"
+echo "STANDALONE_CC: $STANDALONE_CC"
+echo "STANDALONE_CFLAGS: $STANDALONE_CFLAGS"
+echo "STANDALONE_DISABLE: $STANDALONE_DISABLE"
+echo "IDN2: $IDN2"
+
+rc=0
+
+for f in "$srcdir"/test-*.c; do
+    disable=
+    set -o noglob
+    for d in $STANDALONE_DISABLE; do
+	set +o noglob
+	case $f in
+	    $d) disable=yes ;;
+	esac
+    done
+    set +o noglob
+    if test -n "$disable"; then
+	echo "SKIP: $f"
+	continue
+    fi
+
+    if $STANDALONE_CC -DSRCDIR=\"$srcdir\" -D'_GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD(x,y)=' -o foo "$f" $STANDALONE_CFLAGS; then
+        echo "PASS: cc $f"
+        if ./foo; then
+            echo "PASS: run $f"
+        else
+            echo "FAIL: run $f"
+	    rc=1
+        fi
+    else
+        echo "FAIL: cc $f"
+	rc=1
+    fi
+    rm -f foo
+done
+
+for f in "$srcdir"/test-*.sh; do
+    test -x "$f" || continue
+
+    disable=
+    set -o noglob
+    for d in $STANDALONE_DISABLE; do
+	set +o noglob
+	case $f in
+	    $d) disable=yes ;;
+	esac
+    done
+    set +o noglob
+    if test -n "$disable"; then
+	echo "SKIP: $f"
+	continue
+    fi
+
+    if $f; then
+        echo "PASS: $f"
+    else
+        echo "FAIL: $f"
+	rc=1
+    fi
+done
+
+if test "$rc" != 0; then
+    echo "FAIL: $0: error exit ($rc)"
+    exit $rc
+fi
+
+echo "PASS: $0"
+exit 0

_service:tar_scm:libidn2-2.3.7.tar.gz/tests/test-IdnaTest-inc.c Added

@@ -0,0 +1,260 @@
+/* test-IdnaTest-inc.c --- Self-test Libidn2 on IdnaTest.inc
+   Copyright (C) 2011-2024 Simon Josefsson
+   Copyright (C) 2017-2024 Tim Ruehsen
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU 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 General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <stdint.h>
+#include <ctype.h>
+#include <errno.h>
+
+#include <idn2.h>
+
+#include "unistr.h"		/* u32_to_u8, u8_to_u32 */
+
+struct idna
+{
+  const char *in;
+  const char *out;
+  int rc;
+  int flags;
+};
+
+static const struct idna idna = {
+#include "IdnaTest.inc"
+};
+
+static int ok = 0, failed = 0;
+static int break_on_error = 0;
+
+static void
+test_homebrewed (void)
+{
+  uint32_t dummy_u324 = { 'a', 'b', 'c', 0 };
+  uint8_t *out;
+  size_t i;
+  int rc;
+
+  for (i = 0; i < sizeof (idna) / sizeof (idna0); i++)
+    {
+      rc = idn2_lookup_u8 ((uint8_t *) idnai.in, &out, idnai.flags);
+      printf ("%3d  %-25s %-40s %s\n", (int) i, idn2_strerror_name (rc),
+	      rc == IDN2_OK ? idnai.out : "", idnai.in);
+
+      if (rc != idnai.rc && rc == IDN2_ENCODING_ERROR)
+	{
+	  printf ("utc bug\n");
+	}
+      else if (rc != idnai.rc && idnai.rc != -1)
+	{
+	  failed++;
+	  printf ("expected rc %d got rc %d\n", idnai.rc, rc);
+	}
+      else if (rc == IDN2_OK && strcmp ((char *) out, idnai.out) != 0)
+	{
+	  failed++;
+	  printf ("expected: %s\ngot: %s\n", idnai.out, out);
+	}
+      else
+	ok++;
+
+      if (rc == IDN2_OK)
+	idn2_free (out);
+
+      /* Try the IDN2_NO_TR46 flag behavior */
+      if (!(idnai.flags & (IDN2_NONTRANSITIONAL | IDN2_TRANSITIONAL)))
+	{
+	  rc =
+	    idn2_lookup_u8 ((uint8_t *) idnai.in, &out,
+			    idnai.flags | IDN2_NO_TR46);
+	  printf ("%3d  %-25s %-40s %s\n", (int) i, idn2_strerror_name (rc),
+		  rc == IDN2_OK ? idnai.out : "", idnai.in);
+
+	  if (rc != idnai.rc && rc == IDN2_ENCODING_ERROR)
+	    {
+	      printf ("utc bug\n");
+	    }
+	  else if (rc != idnai.rc && idnai.rc != -1)
+	    {
+	      failed++;
+	      printf ("expected rc %d got rc %d\n", idnai.rc, rc);
+	    }
+	  else if (rc == IDN2_OK && strcmp ((char *) out, idnai.out) != 0)
+	    {
+	      failed++;
+	      printf ("expected: %s\ngot: %s\n", idnai.out, out);
+	    }
+	  else
+	    ok++;
+
+	  if (rc == IDN2_OK)
+	    idn2_free (out);
+	}
+
+      /* Try whether the default flags behave as NONTRANSITIONAL */
+      if (!(idnai.flags & (IDN2_NO_TR46 | IDN2_TRANSITIONAL)))
+	{
+	  rc =
+	    idn2_lookup_u8 ((uint8_t *) idnai.in, &out,
+			    idnai.flags | IDN2_NONTRANSITIONAL);
+	  printf ("%3d  %-25s %-40s %s\n", (int) i, idn2_strerror_name (rc),
+		  rc == IDN2_OK ? idnai.out : "", idnai.in);
+
+	  if (rc != idnai.rc && rc == IDN2_ENCODING_ERROR)
+	    {
+	      printf ("utc bug\n");
+	    }
+	  else if (rc != idnai.rc && idnai.rc != -1)
+	    {
+	      failed++;
+	      printf ("expected rc %d got rc %d\n", idnai.rc, rc);
+	    }
+	  else if (rc == IDN2_OK && strcmp ((char *) out, idnai.out) != 0)
+	    {
+	      failed++;
+	      printf ("expected: %s\ngot: %s\n", idnai.out, out);
+	    }
+	  else
+	    ok++;
+
+	  if (rc == IDN2_OK)
+	    idn2_free (out);
+	}
+
+      if (failed && break_on_error)
+	exit (EXIT_FAILURE);
+    }
+
+  /* special calls to cover edge cases */
+  if ((rc = idn2_lookup_u8 (NULL, NULL, 0)) != IDN2_OK)
+    {
+      failed++;
+      printf ("special #1 failed with %d\n", rc);
+    }
+  else
+    ok++;
+
+  out = (uint8_t *) 0x123;
+  if ((rc = idn2_lookup_u8 (NULL, &out, 0)) != IDN2_OK)
+    {
+      failed++;
+      printf ("special #2 failed with %d\n", rc);
+    }
+  else if (out)
+    {
+      failed++;
+      printf ("special #2 failed with out!=NULL\n");
+    }
+  else
+    ok++;
+
+  if ((rc = idn2_lookup_ul (NULL, NULL, 0)) != IDN2_OK)
+    {
+      failed++;
+      printf ("special #3 failed with %d\n", rc);
+    }
+  else
+    ok++;
+
+  out = (uint8_t *) 0x123;
+  if ((rc = idn2_lookup_ul (NULL, (char **) &out, 0)) != IDN2_OK)
+    {
+      failed++;
+      printf ("special #4 failed with %d\n", rc);
+    }
+  else if (out)
+    {
+      failed++;
+      printf ("special #4 failed with out!=NULL\n");
+    }
+  else
+    ok++;
+
+  if ((rc = idna_to_ascii_8z ("abc", (char **) &out, 0)) != IDN2_OK)
+    {
+      failed++;
+      printf ("special #7 failed with %d\n", rc);
+    }
+  else
+    {
+      idn2_free (out);
+      ok++;
+    }
+
+  if ((rc = idna_to_ascii_4z (dummy_u32, (char **) &out, 0)) != IDN2_OK)
+    {
+      failed++;
+      printf ("special #8 failed with %d\n", rc);
+    }
+  else
+    {
+      idn2_free (out);
+      ok++;
+    }
+
+  if ((rc = idn2_to_ascii_4i2 (dummy_u32, 4, (char **) &out, 0)) != IDN2_OK)
+    {
+      failed++;
+      printf ("special #9 failed with %d\n", rc);
+    }
+  else
+    {
+      idn2_free (out);
+      ok++;
+    }
+
+  if ((rc = idn2_to_ascii_4i2 (NULL, 4, (char **) &out, 0)) != IDN2_OK)
+    {
+      failed++;
+      printf ("special #10 failed with %d\n", rc);
+    }
+  else
+    {
+      idn2_free (out);
+      ok++;
+    }
+}
+
+int
+main (void)
+{
+  puts ("-----------------------------------------------------------"
+	"-------------------------------------");
+  puts ("                                          IDNA2008 Lookup\n");
+  puts ("  #  Result                    ACE output                  "
+	"             Unicode input");
+  puts ("-----------------------------------------------------------"
+	"-------------------------------------");
+
+  test_homebrewed ();
+
+  if (failed)
+    {
+      printf ("Summary: %d out of %d tests failed\n", failed, ok + failed);
+      return EXIT_FAILURE;
+    }
+
+  printf ("Summary: All %d tests passed\n", ok + failed);
+
+  return EXIT_SUCCESS;
+}

_service:tar_scm:libidn2-2.3.7.tar.gz/tests/test-IdnaTest-txt.c Added

@@ -0,0 +1,359 @@
+/* test-IdnaTest-txt.c --- Self-test Libidn2 on UTC's IdnaTest.txt
+   Copyright (C) 2011-2024 Simon Josefsson
+   Copyright (C) 2017-2024 Tim Ruehsen
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU 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 General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <stdint.h>
+#include <ctype.h>
+#include <errno.h>
+
+#include <idn2.h>
+
+#include "unistr.h"		/* u32_to_u8, u8_to_u32 */
+
+static int ok = 0, failed = 0;
+static int break_on_error = 0;
+static int verbose = 0;
+
+static const char *
+_nextField (char **line)
+{
+  char *s = *line, *e;
+
+  if (!*s)
+    return "";
+
+  if (!(e = strpbrk (s, ";#")))
+    {
+      e = *line += strlen (s);
+    }
+  else
+    {
+      *line = e + (*e == ';');
+      *e = 0;
+    }
+
+  // trim leading and trailing whitespace
+  while (isspace (*s))
+    s++;
+  while (e > s && isspace (e-1))
+    *--e = 0;
+
+  return s;
+}
+
+static int
+_scan_file (const char *fname, int (*scan) (char *))
+{
+  FILE *fp = fopen (fname, "r");
+  char *buf = NULL, *linep;
+  size_t bufsize = 0;
+  ssize_t buflen;
+  int ret = 0;
+
+  printf ("Scanning file: %s\n", fname);
+
+  if (!fp)
+    {
+      fprintf (stderr, "Failed to open %s (%d)\n", fname, errno);
+      return -1;
+    }
+
+  while ((buflen = getline (&buf, &bufsize, fp)) >= 0)
+    {
+      linep = buf;
+
+      while (isspace (*linep))
+	linep++;		// ignore leading whitespace
+
+      // strip off \r\n
+      while (buflen > 0 && (bufbuflen == '\n' || bufbuflen == '\r'))
+	buf--buflen = 0;
+
+      if (!*linep || *linep == '#')
+	continue;		// skip empty lines and comments
+
+      if ((ret = scan (linep)))
+	break;
+    }
+
+  free (buf);
+  fclose (fp);
+
+  return ret;
+}
+
+// decode embedded UTF-16/32 sequences
+static uint8_t *
+_decodeIdnaTest (const uint8_t *src_u8)
+{
+  size_t it2 = 0, len;
+  uint32_t *src;
+
+  // convert UTF-8 to UCS-4 (Unicode))
+  if (!(src = u8_to_u32 (src_u8, u8_strlen (src_u8) + 1, NULL, &len)))
+    {
+      if (verbose)
+	printf ("u8_to_u32(%s) failed (%d)\n", src_u8, errno);
+      return NULL;
+    }
+
+  // replace escaped UTF-16 incl. surrogates
+  for (size_t it = 0; it < len;)
+    {
+      if (srcit == '\\' && srcit + 1 == 'u')
+	{
+	  srcit2 =
+	    ((srcit + 2 >=
+	      'A' ? srcit + 2 - 'A' + 10 : srcit + 2 - '0') << 12) +
+	    ((srcit + 3 >=
+	      'A' ? srcit + 3 - 'A' + 10 : srcit + 3 - '0') << 8) +
+	    ((srcit + 4 >=
+	      'A' ? srcit + 4 - 'A' + 10 : srcit + 4 - '0') << 4) +
+	    (srcit + 5 >= 'A' ? srcit + 5 - 'A' + 10 : srcit + 5 - '0');
+	  it += 6;
+
+	  if (srcit2 >= 0xD800 && srcit2 <= 0xDBFF)
+	    {
+	      // high surrogate followed by low surrogate
+	      if (srcit == '\\' && srcit + 1 == 'u')
+		{
+		  uint32_t low =
+		    ((srcit + 2 >=
+		      'A' ? srcit + 2 - 'A' + 10 : srcit + 2 -
+		      '0') << 12) + ((srcit + 3 >=
+				      'A' ? srcit + 3 - 'A' + 10 : srcit +
+									 3 -
+				      '0') << 8) + ((srcit + 4 >=
+						     'A' ? srcit + 4 - 'A' +
+						     10 : srcit + 4 -
+						     '0') << 4) + (srcit +
+								       5 >=
+								   'A' ?
+								   srcit +
+								       5 -
+								   'A' +
+								   10 : srcit
+									    +
+									    5
+								   - '0');
+		  if (low >= 0xDC00 && low <= 0xDFFF)
+		    srcit2 =
+		      0x10000 + (srcit2 - 0xD800) * 0x400 + (low - 0xDC00);
+		  else if (verbose)
+		    printf ("Missing low surrogate\n");
+		  it += 6;
+		}
+	      else
+		{
+		  it++;
+		  if (verbose)
+		    printf ("Missing low surrogate\n");
+		}
+	    }
+	  it2++;
+	}
+      else
+	srcit2++ = srcit++;
+    }
+
+  // convert UTF-32 to UTF-8
+  uint8_t *dst_u8 = u32_to_u8 (src, it2, NULL, &len);
+  if (!dst_u8 && verbose)
+    printf ("u32_to_u8(%s) failed (%d)\n", src_u8, errno);
+
+  free (src);
+  return dst_u8;
+}
+
+static void
+_check_toASCII (const char *source, const char *expected, int transitional,
+		int expected_toASCII_failure)
+{
+  int rc;
+  char *ace = NULL;
+
+  rc =
+    idn2_lookup_u8 ((uint8_t *) source, (uint8_t **) & ace,
+		    transitional ? IDN2_TRANSITIONAL : IDN2_NONTRANSITIONAL);
+
+  // printf("n=%d expected=%s t=%d got=%s, expected_failure=%d\n", n, expected, transitional, ace ? ace : "", expected_toASCII_failure);
+  if (rc && expected_toASCII_failure)
+    {
+      if (verbose)
+	printf ("OK\n");
+      ok++;
+    }
+  else if (rc && !transitional && *expected != '')
+    {
+      failed++;
+      printf ("Failed: _check_toASCII(%s) -> %d (expected 0) %p\n", source,
+	      rc, ace);
+    }
+  else if (rc == 0 && !transitional && *expected != ''
+	   && strcmp (expected, ace))
+    {
+      failed++;
+      printf ("Failed: _check_toASCII(%s) -> %s (expected %s) %p\n", source,
+	      ace, expected, ace);
+    }
+  else
+    {
+      if (verbose)
+	printf ("OK\n");
+      ok++;
+    }
+
+  if (rc == IDN2_OK)
+    idn2_free (ace);
+}
+
+#if HAVE_LIBUNISTRING
+extern int _libunistring_version;
+#endif
+
+static int
+test_IdnaTest (char *linep)
+{
+  char *source;
+  const char *type, *toUnicode, *toASCII, *NV8, *org_source;
+  int expected_toASCII_failure;
+
+  type = _nextField (&linep);
+  org_source = _nextField (&linep);
+  toUnicode = _nextField (&linep);
+  toASCII = _nextField (&linep);
+  NV8 = _nextField (&linep);	// if set, the input should be disallowed for IDNA2008
+
+  // sigh, these Unicode people really mix UTF-8 and UCS-2/4
+  // quick and dirty translation of '\uXXXX' found in IdnaTest.txt including surrogate handling
+  source = (char *) _decodeIdnaTest ((uint8_t *) org_source);
+  if (!source)
+    return 0;			// some Unicode sequences can't be encoded into UTF-8, skip them
+
+  if (!*toUnicode)
+    toUnicode = source;
+  if (!*toASCII)
+    toASCII = toUnicode;
+  expected_toASCII_failure = NV8 && *NV8;
+
+  if (verbose)
+    printf ("##########%s#%s#%s#%s#%s#\n", type, org_source, toUnicode,
+	    toASCII, NV8);
+
+#if HAVE_LIBUNISTRING
+  /* 3 tests fail with libunicode <= 0.9.3 - just skip them until we have a newer version installed */
+  /* watch out, libunicode changed versioning scheme up from 0.9.4 */
+  /* If !HAVE_LIBUNISTRING, we use internal gnulib code which works. */
+  if (_libunistring_version <= 9)
+    {
+      if (!strcmp (toASCII, "xn--8jb.xn--etb875g"))
+	{
+	  free (source);
+	  return 0;
+	}
+    }
+#endif
+
+  if (*type == 'B')
+    {
+      _check_toASCII (source, toASCII, 1, expected_toASCII_failure);
+      _check_toASCII (source, toASCII, 0, expected_toASCII_failure);
+    }
+  else if (*type == 'T')
+    {
+      _check_toASCII (source, toASCII, 1, expected_toASCII_failure);
+    }
+  else if (*type == 'N')
+    {
+      _check_toASCII (source, toASCII, 0, expected_toASCII_failure);
+    }
+  else
+    {
+      printf ("Failed: Unknown type '%s'\n", type);
+    }
+
+  free (source);
+
+  if (failed && break_on_error)
+    return 1;
+
+  return 0;
+}
+
+#ifdef SRCDIR
+# define IDNATEST_TXT SRCDIR "/IdnaTest.txt"
+#else
+# define IDNATEST_TXT "IdnaTest.txt"
+#endif
+
+int
+main (int argc, const char *argv)
+{
+  const char *fname = IDNATEST_TXT;
+
+  if (argc > 1 && strcmp (argv1, "--verbose") == 0)
+    {
+      verbose = 1;
+      if (argc > 2)
+	fname = argv2;
+    }
+  else if (argc > 1)
+    fname = argv1;
+
+  if (verbose)
+    {
+      puts ("-----------------------------------------------------------"
+	    "-------------------------------------");
+      puts ("                                          IDNA2008 Lookup\n");
+      puts ("  #  Result                    ACE output                  "
+	    "             Unicode input");
+      puts ("-----------------------------------------------------------"
+	    "-------------------------------------");
+    }
+
+  if (_scan_file (fname, test_IdnaTest))
+    return EXIT_FAILURE;
+
+  if (verbose)
+    puts ("-----------------------------------------------------------"
+	  "-------------------------------------");
+
+  if (failed)
+    {
+      printf ("INFO: test-IdnaTest-txt: %d out of %d tests failed\n", failed,
+	      ok + failed);
+      return EXIT_FAILURE;
+    }
+
+  if (ok == 0)
+    {
+      printf ("FAIL: test-IdnaTest-txt: no test vectors found\n");
+      return EXIT_FAILURE;
+    }
+
+  printf ("PASS: test-IdnaTest-txt: All %d tests passed\n", ok + failed);
+
+  return EXIT_SUCCESS;
+}

_service:tar_scm:libidn2-2.3.7.tar.gz/tests/test-compat-punycode.c Added

@@ -0,0 +1,95 @@
+/* test-compat-punycode.c --- Self test Libidn2 punycode internal symbols.
+   Copyright (C) 2002-2024 Simon Josefsson
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU 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 General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+
+#include <idn2.h>
+
+extern int _IDN2_API _idn2_punycode_decode (size_t input_length,
+					    const char input,
+					    size_t *output_length,
+					    uint32_t output);
+extern int _IDN2_API _idn2_punycode_encode (size_t input_length,
+					    const uint32_t input,
+					    size_t *output_length,
+					    char output);
+
+int
+main (void)
+{
+  int rc;
+  const uint32_t ucs4_input = { 0x00DF, 0x00E5 };	/* ßå */
+  size_t output_length = 2;
+  uint32_t ucs4_output2;
+  char ascii4;
+
+  output_length = 4;
+  rc = _idn2_punycode_encode (2, ucs4_input, &output_length, ascii);
+  if (rc != IDN2_OK)
+    {
+      printf ("FAIL: encode: %d: %s: %s\n",
+	      rc, idn2_strerror_name (rc), idn2_strerror (rc));
+      return EXIT_FAILURE;
+    }
+
+  if (output_length != 4)
+    {
+      printf ("FAIL: encode 4 != %lu\n", (unsigned long) output_length);
+      return EXIT_FAILURE;
+    }
+
+  if (memcmp (ascii, "zcam", 4) != 0)
+    {
+      printf ("FAIL: encode: memcmp: %s\n", ascii);
+      return EXIT_FAILURE;
+    }
+
+  printf ("PASS: ßå => zcam\n");
+
+  rc = _idn2_punycode_decode (4, ascii, &output_length, ucs4_output);
+  if (rc != IDN2_OK)
+    {
+      printf ("FAIL: decode: %d: %s: %s\n",
+	      rc, idn2_strerror_name (rc), idn2_strerror (rc));
+      return EXIT_FAILURE;
+    }
+
+  if (output_length != 2)
+    {
+      printf ("FAIL: decode 2 != %lu\n", (unsigned long) output_length);
+      return EXIT_FAILURE;
+    }
+
+  if (memcmp (ucs4_output, ucs4_input, 2 * sizeof (uint32_t)) != 0)
+    {
+      printf ("FAIL: decode: memcmp: %s\n", ascii);
+      printf ("ucs4_output0 = %lX\n", (unsigned long) ucs4_output0);
+      printf ("ucs4_output1 = %lX\n", (unsigned long) ucs4_output1);
+      return EXIT_FAILURE;
+    }
+
+  printf ("PASS: zcam => ßå\n");
+
+  return EXIT_SUCCESS;
+}

_service:tar_scm:libidn2-2.3.4.tar.gz/tests/test-glibc.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/tests/test-glibc.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/tests/test-idn2.sh -> _service:tar_scm:libidn2-2.3.7.tar.gz/tests/test-idn2.sh Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/tests/test-locale.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/tests/test-locale.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/tests/test-lookup.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/tests/test-lookup.c Changed

@@ -1,6 +1,6 @@
 /* test-lookup.c --- Self tests for IDNA processing
-   Copyright (C) 2011-2022 Simon Josefsson
-   Copyright (C) 2017-2022 Tim Ruehsen
+   Copyright (C) 2011-2024 Simon Josefsson
+   Copyright (C) 2017-2024 Tim Ruehsen
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -73,9 +73,6 @@
   {"\xe3\x8b\xbf", "xn--nnqt1l", IDN2_OK,
    IDN2_TRANSITIONAL | IDN2_USE_STD3_ASCII_RULES | IDN2_ALABEL_ROUNDTRIP},
 
-  /* UTC's test vectors. */
-#include "IdnaTest.inc"
-
   /* Start of contribution from "Abdulrahman I. ALGhadir" <aghadir@citc.gov.sa>. */
   {"\xd8\xa7\xd9\x84\xd9\x85\xd8\xb1\xd9\x83\xd8\xb2\x2d\xd8\xa7\xd9\x84\xd8\xb3\xd8\xb9\xd9\x88\xd8\xaf\xd9\x8a\x2d\xd9\x84\xd9\x85\xd8\xb9\xd9\x84\xd9\x88\xd9\x85\xd8\xa7\xd8\xaa\x2d\xd8\xa7\xd9\x84\xd8\xb4\xd8\xa8\xd9\x83\xd8\xa9", "xn------nzebbbijg6cvanqv7ec6ooadfebehlc1fg8c"},
   {"\xd8\xb5\xd8\xad\xd8\xa7\xd8\xb1\xd9\x89\x2d\xd9\x86\xd8\xaa",
@@ -692,7 +689,7 @@
    },
   {"\xf0\x90\x88\x85\xc3\xad\x64\x6e\x2e\x65\x78\x61\x6d\x70\x6c\x65",
    "xn--dn-mja7734x.example", IDN2_UNASSIGNED, IDN2_NO_TR46
-   /* 5-1-2 Unassinged outside BMP; zone editors should reject */
+   /* 5-1-2 Unassigned outside BMP; zone editors should reject */
    /* Don't resolve as xn--dn-mja7922x.example */
    },
   {"\xc8\xb4\xc3\xad\x64\x6e\x2e\x65\x78\x61\x6d\x70\x6c\x65",
@@ -903,72 +900,6 @@
 static int ok = 0, failed = 0;
 static int break_on_error = 0;
 
-static const char *
-_nextField (char **line)
-{
-  char *s = *line, *e;
-
-  if (!*s)
-    return "";
-
-  if (!(e = strpbrk (s, ";#")))
-    {
-      e = *line += strlen (s);
-    }
-  else
-    {
-      *line = e + (*e == ';');
-      *e = 0;
-    }
-
-  // trim leading and trailing whitespace
-  while (isspace (*s))
-    s++;
-  while (e > s && isspace (e-1))
-    *--e = 0;
-
-  return s;
-}
-
-static int
-_scan_file (const char *fname, int (*scan) (char *))
-{
-  FILE *fp = fopen (fname, "r");
-  char *buf = NULL, *linep;
-  size_t bufsize = 0;
-  ssize_t buflen;
-  int ret = 0;
-
-  if (!fp)
-    {
-      fprintf (stderr, "Failed to open %s (%d)\n", fname, errno);
-      return -1;
-    }
-
-  while ((buflen = getline (&buf, &bufsize, fp)) >= 0)
-    {
-      linep = buf;
-
-      while (isspace (*linep))
-	linep++;		// ignore leading whitespace
-
-      // strip off \r\n
-      while (buflen > 0 && (bufbuflen == '\n' || bufbuflen == '\r'))
-	buf--buflen = 0;
-
-      if (!*linep || *linep == '#')
-	continue;		// skip empty lines and comments
-
-      if ((ret = scan (linep)))
-	break;
-    }
-
-  free (buf);
-  fclose (fp);
-
-  return ret;
-}
-
 static void
 test_homebrewed (void)
 {
@@ -1144,199 +1075,17 @@
       idn2_free (out);
       ok++;
     }
-}
-
-// decode embedded UTF-16/32 sequences
-static uint8_t *
-_decodeIdnaTest (const uint8_t * src_u8)
-{
-  size_t it2 = 0, len;
-  uint32_t *src;
-
-  // convert UTF-8 to UCS-4 (Unicode))
-  if (!(src = u8_to_u32 (src_u8, u8_strlen (src_u8) + 1, NULL, &len)))
-    {
-      printf ("u8_to_u32(%s) failed (%d)\n", src_u8, errno);
-      return NULL;
-    }
-
-  // replace escaped UTF-16 incl. surrogates
-  for (size_t it = 0; it < len;)
-    {
-      if (srcit == '\\' && srcit + 1 == 'u')
-	{
-	  srcit2 =
-	    ((srcit + 2 >=
-	      'A' ? srcit + 2 - 'A' + 10 : srcit + 2 - '0') << 12) +
-	    ((srcit + 3 >=
-	      'A' ? srcit + 3 - 'A' + 10 : srcit + 3 - '0') << 8) +
-	    ((srcit + 4 >=
-	      'A' ? srcit + 4 - 'A' + 10 : srcit + 4 - '0') << 4) +
-	    (srcit + 5 >= 'A' ? srcit + 5 - 'A' + 10 : srcit + 5 - '0');
-	  it += 6;
-
-	  if (srcit2 >= 0xD800 && srcit2 <= 0xDBFF)
-	    {
-	      // high surrogate followed by low surrogate
-	      if (srcit == '\\' && srcit + 1 == 'u')
-		{
-		  uint32_t low =
-		    ((srcit + 2 >=
-		      'A' ? srcit + 2 - 'A' + 10 : srcit + 2 -
-		      '0') << 12) + ((srcit + 3 >=
-				      'A' ? srcit + 3 - 'A' + 10 : srcit +
-									 3 -
-				      '0') << 8) + ((srcit + 4 >=
-						     'A' ? srcit + 4 - 'A' +
-						     10 : srcit + 4 -
-						     '0') << 4) + (srcit +
-								       5 >=
-								   'A' ?
-								   srcit +
-								       5 -
-								   'A' +
-								   10 : srcit
-									    +
-									    5
-								   - '0');
-		  if (low >= 0xDC00 && low <= 0xDFFF)
-		    srcit2 =
-		      0x10000 + (srcit2 - 0xD800) * 0x400 + (low - 0xDC00);
-		  else
-		    printf ("Missing low surrogate\n");
-		  it += 6;
-		}
-	      else
-		{
-		  it++;
-		  printf ("Missing low surrogate\n");
-		}
-	    }
-	  it2++;
-	}
-      else
-	srcit2++ = srcit++;
-    }
-
-  // convert UTF-32 to UTF-8
-  uint8_t *dst_u8 = u32_to_u8 (src, it2, NULL, &len);
-  if (!dst_u8)
-    printf ("u32_to_u8(%s) failed (%d)\n", src_u8, errno);
-
-  free (src);
-  return dst_u8;
-}
 
-static void
-_check_toASCII (const char *source, const char *expected, int transitional,
-		int expected_toASCII_failure)
-{
-  int rc;
-  char *ace = NULL;
-
-  rc =
-    idn2_lookup_u8 ((uint8_t *) source, (uint8_t **) & ace,
-		    transitional ? IDN2_TRANSITIONAL : IDN2_NONTRANSITIONAL);
-
-  // printf("n=%d expected=%s t=%d got=%s, expected_failure=%d\n", n, expected, transitional, ace ? ace : "", expected_toASCII_failure);
-  if (rc && expected_toASCII_failure)
-    {
-      printf ("OK\n");
-      ok++;
-    }
-  else if (rc && !transitional && *expected != '')
-    {
-      failed++;
-      printf ("Failed: _check_toASCII(%s) -> %d (expected 0) %p\n", source,
-	      rc, ace);
-    }
-  else if (rc == 0 && !transitional && *expected != ''
-	   && strcmp (expected, ace))
+  if ((rc = idn2_to_ascii_4i2 (NULL, 4, (char **) &out, 0)) != IDN2_OK)
     {
       failed++;
-      printf ("Failed: _check_toASCII(%s) -> %s (expected %s) %p\n", source,
-	      ace, expected, ace);
+      printf ("special #10 failed with %d\n", rc);
     }
   else
     {
-      printf ("OK\n");
+      idn2_free (out);
       ok++;
     }
-
-  if (rc == IDN2_OK)
-    idn2_free (ace);
-}
-
-#if HAVE_LIBUNISTRING
-extern int _libunistring_version;
-#endif
-
-static int
-test_IdnaTest (char *linep)
-{
-  char *source;
-  const char *type, *toUnicode, *toASCII, *NV8, *org_source;
-  int expected_toASCII_failure;
-
-  type = _nextField (&linep);
-  org_source = _nextField (&linep);
-  toUnicode = _nextField (&linep);
-  toASCII = _nextField (&linep);
-  NV8 = _nextField (&linep);	// if set, the input should be disallowed for IDNA2008
-
-  // sigh, these Unicode people really mix UTF-8 and UCS-2/4
-  // quick and dirty translation of '\uXXXX' found in IdnaTest.txt including surrogate handling
-  source = (char *) _decodeIdnaTest ((uint8_t *) org_source);
-  if (!source)
-    return 0;			// some Unicode sequences can't be encoded into UTF-8, skip them
-
-  if (!*toUnicode)
-    toUnicode = source;
-  if (!*toASCII)
-    toASCII = toUnicode;
-  expected_toASCII_failure = NV8 && *NV8;
-
-  printf ("##########%s#%s#%s#%s#%s#\n", type, org_source, toUnicode, toASCII,
-	  NV8);
-
-#if HAVE_LIBUNISTRING
-  /* 3 tests fail with libunicode <= 0.9.3 - just skip them until we have a newer version installed */
-  /* watch out, libunicode changed versioning scheme up from 0.9.4 */
-  /* If !HAVE_LIBUNISTRING, we use internal gnulib code which works. */
-  if (_libunistring_version <= 9)
-    {
-      if (!strcmp (toASCII, "xn--8jb.xn--etb875g"))
-	{
-	  free (source);
-	  return 0;
-	}
-    }
-#endif
-
-  if (*type == 'B')
-    {
-      _check_toASCII (source, toASCII, 1, expected_toASCII_failure);
-      _check_toASCII (source, toASCII, 0, expected_toASCII_failure);
-    }
-  else if (*type == 'T')
-    {
-      _check_toASCII (source, toASCII, 1, expected_toASCII_failure);
-    }
-  else if (*type == 'N')
-    {
-      _check_toASCII (source, toASCII, 0, expected_toASCII_failure);
-    }
-  else
-    {
-      printf ("Failed: Unknown type '%s'\n", type);
-    }
-
-  free (source);
-
-  if (failed && break_on_error)
-    return 1;
-
-  return 0;
 }
 
 static void
@@ -1386,14 +1135,8 @@
     }
 }
 
-#ifdef SRCDIR
-# define IDNATEST_TXT SRCDIR "/IdnaTest.txt"
-#else
-# define IDNATEST_TXT "IdnaTest.txt"
-#endif
-
 int
-main (int argc, const char *argv)
+main (void)
 {
   separator ();
   puts ("                                          IDNA2008 Lookup\n");
@@ -1405,12 +1148,6 @@
 
   separator ();
 
-  // test all IDNA cases from Unicode 9.0.0
-  if (_scan_file (argc == 1 ? IDNATEST_TXT : argv1, test_IdnaTest))
-    return EXIT_FAILURE;
-
-  separator ();
-
   test_unicode_range ();
 
   if (failed)

_service:tar_scm:libidn2-2.3.4.tar.gz/tests/test-punycode.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/tests/test-punycode.c Changed

@@ -1,5 +1,5 @@
 /* test-punycode.c --- Self tests for Libidn2 punycode.
-   Copyright (C) 2002-2022 Simon Josefsson
+   Copyright (C) 2002-2024 Simon Josefsson
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,7 +17,9 @@
 
 /* Based on GNU Libidn tst_punycode.c */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,7 +27,6 @@
 #include <string.h>
 
 #include <idn2.h>
-#include "punycode.h"
 
 struct punycode
 {
@@ -184,7 +185,7 @@
 }
 
 static void
-ucs4print (const uint32_t * str, size_t len)
+ucs4print (const uint32_t *str, size_t len)
 {
   size_t i;
 
@@ -200,8 +201,6 @@
   puts ("");
 }
 
-#include "punycode.h"
-
 int
 main (void)
 {
@@ -210,15 +209,6 @@
   int rc;
   size_t i, outlen;
 
-  if (!idn2_check_version (IDN2_VERSION))
-    fail ("idn2_check_version(%s) failed\n", IDN2_VERSION);
-
-  if (!idn2_check_version (NULL))
-    fail ("idn2_check_version(NULL) failed\n");
-
-  if (idn2_check_version ("100.100"))
-    fail ("idn2_check_version(\"100.100\") failed\n");
-
   p = (char *) malloc (sizeof (*p) * BUFSIZ);
   if (p == NULL)
     fail ("malloc() returned NULL\n");
@@ -239,8 +229,8 @@
 	}
 
       outlen = BUFSIZ;
-      rc = _idn2_punycode_encode_internal (punycodei.inlen, punycodei.in,
-					   &outlen, p);
+      rc = idn2_punycode_encode (punycodei.in, punycodei.inlen,
+				 p, &outlen);
       if (rc != punycodei.rc)
 	{
 	  fail ("punycode_encode() entry %d failed: %d\n", (int) i, rc);
@@ -281,8 +271,8 @@
 	}
 
       outlen = BUFSIZ;
-      rc = _idn2_punycode_decode_internal (strlen (punycodei.out),
-					   punycodei.out, &outlen, q);
+      rc = idn2_punycode_decode (punycodei.out, strlen (punycodei.out),
+				 q, &outlen);
       if (rc != punycodei.rc)
 	{
 	  fail ("punycode() entry %d failed: %d\n", (int) i, rc);

_service:tar_scm:libidn2-2.3.4.tar.gz/tests/test-register.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/tests/test-register.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/tests/test-tounicode.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/tests/test-tounicode.c Changed

_service:tar_scm:libidn2-2.3.7.tar.gz/tests/test-version.c Added

@@ -0,0 +1,145 @@
+/* test-version.c --- Self tests for Libidn2 version handling.
+   Copyright (C) 2002-2024 Simon Josefsson
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU 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 General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>		/* printf */
+#include <stdlib.h>		/* EXIT_SUCCESS */
+#include <string.h>		/* strcmp */
+
+#include <idn2.h>
+
+int
+main (void)
+{
+  unsigned gvn = IDN2_VERSION_NUMBER;
+  unsigned gvmmp = (IDN2_VERSION_MAJOR << 24)
+    + (IDN2_VERSION_MINOR << 16) + IDN2_VERSION_PATCH;
+  const char *check_version_null;
+  char bufBUFSIZ;
+  int j;
+
+  printf ("IDN2_VERSION: %s\n", IDN2_VERSION);
+  printf ("IDN2_VERSION_MAJOR: %d\n", IDN2_VERSION_MAJOR);
+  printf ("IDN2_VERSION_MINOR: %d\n", IDN2_VERSION_MINOR);
+  printf ("IDN2_VERSION_PATCH: %d\n", IDN2_VERSION_PATCH);
+  printf ("IDN2_VERSION_NUMBER: %x\n", gvn);
+  printf ("IDN2_VERSION_MAJOR.IDN2_VERSION_MINOR."
+	  "IDN2_VERSION_PATCH: %d.%d.%d\n",
+	  IDN2_VERSION_MAJOR, IDN2_VERSION_MINOR, IDN2_VERSION_PATCH);
+
+  check_version_null = idn2_check_version (NULL);
+  if (!check_version_null)
+    {
+      printf ("FAIL: idn2_check_version (NULL)\n");
+      return EXIT_FAILURE;
+    }
+  printf ("idn2_check_version (NULL): %s\n", check_version_null);
+
+#ifdef PACKAGE_VERSION
+  printf ("PACKAGE_VERSION %s\n", PACKAGE_VERSION);
+
+  if (!idn2_check_version (PACKAGE_VERSION))
+    {
+      printf ("FAIL: idn2_check_version (PACKAGE_VERSION)\n");
+      return EXIT_FAILURE;
+    }
+#endif
+
+  j = snprintf (buf, sizeof buf, "%d.%d.%d", IDN2_VERSION_MAJOR,
+		IDN2_VERSION_MINOR, IDN2_VERSION_PATCH);
+  if (j < 0 || j == sizeof buf)
+    {
+      printf ("FAIL: snprintf: %d", j);
+      return EXIT_FAILURE;
+    }
+
+  if (!idn2_check_version (buf))
+    {
+      printf ("FAIL: idn2_check_version(buf == %s)\n", buf);
+      return EXIT_FAILURE;
+    }
+
+  /* IDN2_VERSION may look like "1.0.4.10-b872" but the derived string
+     should be "1.0.4" anyway.  */
+  if (strncmp (IDN2_VERSION, buf, strlen (buf)) != 0)
+    {
+      printf ("FAIL: strncmp (IDN2_VERSION, %s, strlen (%s))\n", buf, buf);
+      return EXIT_FAILURE;
+    }
+
+  if (!idn2_check_version (IDN2_VERSION))
+    {
+      printf ("FAIL: idn2_check_version (IDN2_VERSION)\n");
+      return EXIT_FAILURE;
+    }
+
+  if (check_version_null != idn2_check_version (NULL))
+    {
+      printf ("FAIL: check_version_null != idn2_check_version (NULL)\n");
+      return EXIT_FAILURE;
+    }
+
+  if (idn2_check_version (IDN2_VERSION) != idn2_check_version (IDN2_VERSION))
+    {
+      printf ("FAIL: idn2_check_version (IDN2_VERSION) "
+	      "!= idn2_check_version (IDN2_VERSION)\n");
+      return EXIT_FAILURE;
+    }
+
+  if (!idn2_check_version ("1.0.1"))
+    {
+      printf ("FAIL: idn2_check_version (1.0.1)\n");
+      return EXIT_FAILURE;
+    }
+
+  if (strcmp (IDN2_VERSION, check_version_null) != 0)
+    {
+      printf ("FAIL: strcmp (IDN2_VERSION, idn2_check_version (NULL))\n");
+      return EXIT_FAILURE;
+    }
+
+  if (gvn != gvmmp)
+    {
+      printf ("FAIL: IDN2_VERSION_NUMBER != (IDN2_VERSION_MAJOR << 24) +"
+	      " (IDN2_VERSION_MINOR << 16) + IDN2_VERSION_PATCH: %x\n",
+	      gvmmp);
+      return EXIT_FAILURE;
+    }
+
+  if (idn2_check_version ("100.100"))
+    {
+      printf ("FAIL: idn2_check_version(100.100)\n");
+      return EXIT_FAILURE;
+    }
+
+  if (idn2_check_version ("4711.42.23"))
+    {
+      printf ("FAIL: idn2_check_version(4711.42.23)\n");
+      return EXIT_FAILURE;
+    }
+
+  if (idn2_check_version ("UNKNOWN"))
+    {
+      printf ("FAIL: idn2_check_version (UNKNOWN)\n");
+      return EXIT_FAILURE;
+    }
+
+  return EXIT_SUCCESS;
+}

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/Makefile.in -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/Makefile.in Changed

@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2002-2022 Free Software Foundation, Inc.
+# Copyright (C) 2002-2024 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
@@ -147,45 +147,42 @@
 @GL_COND_OBJ_FREE_TRUE@am__append_1 = free.c
 @GL_COND_OBJ_ICONV_OPEN_TRUE@am__append_2 = iconv_open.c
 @GL_COND_OBJ_ICONV_TRUE@am__append_3 = iconv.c iconv_close.c
-@GL_COND_LIBTOOL_TRUE@am__append_4 = $(LTLIBICONV)
-@LIBUNISTRING_COMPILE_UNICONV_U8_CONV_FROM_ENC_TRUE@am__append_5 = uniconv/u8-conv-from-enc.c
-@LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_FROM_ENC_TRUE@am__append_6 = uniconv/u8-strconv-from-enc.c
-@LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_FROM_LOCALE_TRUE@am__append_7 = uniconv/u8-strconv-from-locale.c
-@LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_TO_ENC_TRUE@am__append_8 = uniconv/u8-strconv-to-enc.c
-@LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_TO_LOCALE_TRUE@am__append_9 = uniconv/u8-strconv-to-locale.c
-@LIBUNISTRING_COMPILE_UNICTYPE_BIDICLASS_OF_TRUE@am__append_10 = unictype/bidi_of.c
-@LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_M_TRUE@am__append_11 = unictype/categ_M.c
-@LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NONE_TRUE@am__append_12 = unictype/categ_none.c
-@LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_OF_TRUE@am__append_13 = unictype/categ_of.c
-@LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_TEST_TRUE@am__append_14 = unictype/categ_test.c
-@LIBUNISTRING_COMPILE_UNICTYPE_COMBINING_CLASS_TRUE@am__append_15 = unictype/combiningclass.c
-@LIBUNISTRING_COMPILE_UNICTYPE_JOININGTYPE_OF_TRUE@am__append_16 = unictype/joiningtype_of.c
-@LIBUNISTRING_COMPILE_UNICTYPE_SCRIPTS_TRUE@am__append_17 = unictype/scripts.c
-@LIBUNISTRING_COMPILE_UNINORM_CANONICAL_DECOMPOSITION_TRUE@am__append_18 = uninorm/canonical-decomposition.c
-@LIBUNISTRING_COMPILE_UNINORM_COMPOSITION_TRUE@am__append_19 = uninorm/composition.c
-@LIBUNISTRING_COMPILE_UNINORM_NFC_TRUE@am__append_20 = uninorm/nfc.c
-@LIBUNISTRING_COMPILE_UNINORM_NFD_TRUE@am__append_21 = uninorm/nfd.c
-@LIBUNISTRING_COMPILE_UNINORM_U32_NORMALIZE_TRUE@am__append_22 = uninorm/u32-normalize.c
-@LIBUNISTRING_COMPILE_UNISTR_U32_CMP_TRUE@am__append_23 = unistr/u32-cmp.c
-@LIBUNISTRING_COMPILE_UNISTR_U32_CPY_TRUE@am__append_24 = unistr/u32-cpy.c
-@LIBUNISTRING_COMPILE_UNISTR_U32_CPY_ALLOC_TRUE@am__append_25 = unistr/u32-cpy-alloc.c
-@LIBUNISTRING_COMPILE_UNISTR_U32_MBTOUC_UNSAFE_TRUE@am__append_26 = unistr/u32-mbtouc-unsafe.c
-@LIBUNISTRING_COMPILE_UNISTR_U32_STRLEN_TRUE@am__append_27 = unistr/u32-strlen.c
-@LIBUNISTRING_COMPILE_UNISTR_U32_TO_U8_TRUE@am__append_28 = unistr/u32-to-u8.c
-@LIBUNISTRING_COMPILE_UNISTR_U32_UCTOMB_TRUE@am__append_29 = unistr/u32-uctomb.c
-@LIBUNISTRING_COMPILE_UNISTR_U8_CHECK_TRUE@am__append_30 = unistr/u8-check.c
-@LIBUNISTRING_COMPILE_UNISTR_U8_MBLEN_TRUE@am__append_31 = unistr/u8-mblen.c
-@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_TRUE@am__append_32 = unistr/u8-mbtouc.c unistr/u8-mbtouc-aux.c
-@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_TRUE@am__append_33 = unistr/u8-mbtouc-unsafe.c unistr/u8-mbtouc-unsafe-aux.c
-@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__append_34 = unistr/u8-mbtoucr.c
-@LIBUNISTRING_COMPILE_UNISTR_U8_PREV_TRUE@am__append_35 = unistr/u8-prev.c
-@LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN_TRUE@am__append_36 = unistr/u8-strlen.c
-@LIBUNISTRING_COMPILE_UNISTR_U8_TO_U32_TRUE@am__append_37 = unistr/u8-to-u32.c
-@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__append_38 = unistr/u8-uctomb.c unistr/u8-uctomb-aux.c
+@LIBUNISTRING_COMPILE_UNICONV_U8_CONV_FROM_ENC_TRUE@am__append_4 = uniconv/u8-conv-from-enc.c
+@LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_FROM_ENC_TRUE@am__append_5 = uniconv/u8-strconv-from-enc.c
+@LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_FROM_LOCALE_TRUE@am__append_6 = uniconv/u8-strconv-from-locale.c
+@LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_TO_ENC_TRUE@am__append_7 = uniconv/u8-strconv-to-enc.c
+@LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_TO_LOCALE_TRUE@am__append_8 = uniconv/u8-strconv-to-locale.c
+@LIBUNISTRING_COMPILE_UNICTYPE_BIDICLASS_OF_TRUE@am__append_9 = unictype/bidi_of.c
+@LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_M_TRUE@am__append_10 = unictype/categ_M.c
+@LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_OF_TRUE@am__append_11 = unictype/categ_of.c
+@LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_TEST_TRUE@am__append_12 = unictype/categ_test.c
+@LIBUNISTRING_COMPILE_UNICTYPE_COMBINING_CLASS_TRUE@am__append_13 = unictype/combiningclass.c
+@LIBUNISTRING_COMPILE_UNICTYPE_JOININGTYPE_OF_TRUE@am__append_14 = unictype/joiningtype_of.c
+@LIBUNISTRING_COMPILE_UNICTYPE_SCRIPTS_TRUE@am__append_15 = unictype/scripts.c
+@LIBUNISTRING_COMPILE_UNINORM_CANONICAL_DECOMPOSITION_TRUE@am__append_16 = uninorm/canonical-decomposition.c
+@LIBUNISTRING_COMPILE_UNINORM_COMPOSITION_TRUE@am__append_17 = uninorm/composition.c
+@LIBUNISTRING_COMPILE_UNINORM_NFC_TRUE@am__append_18 = uninorm/nfc.c
+@LIBUNISTRING_COMPILE_UNINORM_NFD_TRUE@am__append_19 = uninorm/nfd.c
+@LIBUNISTRING_COMPILE_UNINORM_U32_NORMALIZE_TRUE@am__append_20 = uninorm/u32-normalize.c
+@LIBUNISTRING_COMPILE_UNISTR_U32_CMP_TRUE@am__append_21 = unistr/u32-cmp.c
+@LIBUNISTRING_COMPILE_UNISTR_U32_CPY_TRUE@am__append_22 = unistr/u32-cpy.c
+@LIBUNISTRING_COMPILE_UNISTR_U32_CPY_ALLOC_TRUE@am__append_23 = unistr/u32-cpy-alloc.c
+@LIBUNISTRING_COMPILE_UNISTR_U32_MBTOUC_UNSAFE_TRUE@am__append_24 = unistr/u32-mbtouc-unsafe.c
+@LIBUNISTRING_COMPILE_UNISTR_U32_STRLEN_TRUE@am__append_25 = unistr/u32-strlen.c
+@LIBUNISTRING_COMPILE_UNISTR_U32_TO_U8_TRUE@am__append_26 = unistr/u32-to-u8.c
+@LIBUNISTRING_COMPILE_UNISTR_U32_UCTOMB_TRUE@am__append_27 = unistr/u32-uctomb.c
+@LIBUNISTRING_COMPILE_UNISTR_U8_CHECK_TRUE@am__append_28 = unistr/u8-check.c
+@LIBUNISTRING_COMPILE_UNISTR_U8_MBLEN_TRUE@am__append_29 = unistr/u8-mblen.c
+@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_TRUE@am__append_30 = unistr/u8-mbtouc.c unistr/u8-mbtouc-aux.c
+@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_TRUE@am__append_31 = unistr/u8-mbtouc-unsafe.c unistr/u8-mbtouc-unsafe-aux.c
+@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__append_32 = unistr/u8-mbtoucr.c
+@LIBUNISTRING_COMPILE_UNISTR_U8_PREV_TRUE@am__append_33 = unistr/u8-prev.c
+@LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN_TRUE@am__append_34 = unistr/u8-strlen.c
+@LIBUNISTRING_COMPILE_UNISTR_U8_TO_U32_TRUE@am__append_35 = unistr/u8-to-u32.c
+@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__append_36 = unistr/u8-uctomb.c unistr/u8-uctomb-aux.c
 subdir = unistring
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/unistring/m4/codeset.m4 \
-	$(top_srcdir)/unistring/m4/free.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/unistring/m4/free.m4 \
 	$(top_srcdir)/unistring/m4/gnulib-comp.m4 \
 	$(top_srcdir)/unistring/m4/host-cpu-c-abi.m4 \
 	$(top_srcdir)/unistring/m4/iconv.m4 \
@@ -199,15 +196,19 @@
 	$(top_srcdir)/unistring/m4/libunistring-optional.m4 \
 	$(top_srcdir)/unistring/m4/libunistring.m4 \
 	$(top_srcdir)/unistring/m4/localcharset.m4 \
+	$(top_srcdir)/unistring/m4/unictype_h.m4 \
+	$(top_srcdir)/unistring/m4/uninorm_h.m4 \
 	$(top_srcdir)/unistring/m4/wchar_h.m4 \
 	$(top_srcdir)/gl/m4/00gnulib.m4 \
 	$(top_srcdir)/gl/m4/__inline.m4 \
 	$(top_srcdir)/gl/m4/absolute-header.m4 \
 	$(top_srcdir)/gl/m4/alloca.m4 $(top_srcdir)/gl/m4/assert_h.m4 \
 	$(top_srcdir)/gl/m4/c-bool.m4 $(top_srcdir)/gl/m4/close.m4 \
+	$(top_srcdir)/gl/m4/codeset.m4 \
 	$(top_srcdir)/gl/m4/double-slash-root.m4 \
 	$(top_srcdir)/gl/m4/dup2.m4 $(top_srcdir)/gl/m4/eealloc.m4 \
 	$(top_srcdir)/gl/m4/errno_h.m4 $(top_srcdir)/gl/m4/error.m4 \
+	$(top_srcdir)/gl/m4/error_h.m4 \
 	$(top_srcdir)/gl/m4/extensions.m4 \
 	$(top_srcdir)/gl/m4/extern-inline.m4 \
 	$(top_srcdir)/gl/m4/fcntl-o.m4 $(top_srcdir)/gl/m4/fcntl.m4 \
@@ -222,12 +223,14 @@
 	$(top_srcdir)/gl/m4/inline.m4 $(top_srcdir)/gl/m4/largefile.m4 \
 	$(top_srcdir)/gl/m4/ld-output-def.m4 \
 	$(top_srcdir)/gl/m4/ld-version-script.m4 \
-	$(top_srcdir)/gl/m4/limits-h.m4 $(top_srcdir)/gl/m4/malloca.m4 \
+	$(top_srcdir)/gl/m4/limits-h.m4 \
+	$(top_srcdir)/gl/m4/locale-fr.m4 \
+	$(top_srcdir)/gl/m4/malloca.m4 \
 	$(top_srcdir)/gl/m4/manywarnings.m4 \
 	$(top_srcdir)/gl/m4/mode_t.m4 \
 	$(top_srcdir)/gl/m4/msvc-inval.m4 \
 	$(top_srcdir)/gl/m4/msvc-nothrow.m4 \
-	$(top_srcdir)/gl/m4/multiarch.m4 \
+	$(top_srcdir)/gl/m4/multiarch.m4 $(top_srcdir)/gl/m4/musl.m4 \
 	$(top_srcdir)/gl/m4/nocrash.m4 $(top_srcdir)/gl/m4/off_t.m4 \
 	$(top_srcdir)/gl/m4/open-cloexec.m4 \
 	$(top_srcdir)/gl/m4/open-slash.m4 $(top_srcdir)/gl/m4/open.m4 \
@@ -235,9 +238,9 @@
 	$(top_srcdir)/gl/m4/rawmemchr.m4 \
 	$(top_srcdir)/gl/m4/ssize_t.m4 \
 	$(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \
-	$(top_srcdir)/gl/m4/stdalign.m4 $(top_srcdir)/gl/m4/stdarg.m4 \
-	$(top_srcdir)/gl/m4/stddef_h.m4 $(top_srcdir)/gl/m4/stdint.m4 \
-	$(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \
+	$(top_srcdir)/gl/m4/stdarg.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \
+	$(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdio_h.m4 \
+	$(top_srcdir)/gl/m4/stdlib_h.m4 \
 	$(top_srcdir)/gl/m4/strchrnul.m4 \
 	$(top_srcdir)/gl/m4/strerror.m4 \
 	$(top_srcdir)/gl/m4/string_h.m4 \
@@ -251,8 +254,7 @@
 	$(top_srcdir)/gl/m4/visibility.m4 \
 	$(top_srcdir)/gl/m4/warn-on-use.m4 \
 	$(top_srcdir)/gl/m4/warnings.m4 $(top_srcdir)/gl/m4/wchar_t.m4 \
-	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/year2038.m4 \
-	$(top_srcdir)/gl/m4/zzgnulib.m4 \
+	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/zzgnulib.m4 \
 	$(top_srcdir)/m4/ax_ac_append_to_file.m4 \
 	$(top_srcdir)/m4/ax_ac_print_to_file.m4 \
 	$(top_srcdir)/m4/ax_add_am_macro_static.m4 \
@@ -311,35 +313,34 @@
 @LIBUNISTRING_COMPILE_UNICONV_U8_STRCONV_TO_LOCALE_TRUE@am__objects_8 = uniconv/libunistring_la-u8-strconv-to-locale.lo
 @LIBUNISTRING_COMPILE_UNICTYPE_BIDICLASS_OF_TRUE@am__objects_9 = unictype/libunistring_la-bidi_of.lo
 @LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_M_TRUE@am__objects_10 = unictype/libunistring_la-categ_M.lo
-@LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NONE_TRUE@am__objects_11 = unictype/libunistring_la-categ_none.lo
-@LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_OF_TRUE@am__objects_12 = unictype/libunistring_la-categ_of.lo
-@LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_TEST_TRUE@am__objects_13 = unictype/libunistring_la-categ_test.lo
-@LIBUNISTRING_COMPILE_UNICTYPE_COMBINING_CLASS_TRUE@am__objects_14 = unictype/libunistring_la-combiningclass.lo
-@LIBUNISTRING_COMPILE_UNICTYPE_JOININGTYPE_OF_TRUE@am__objects_15 = unictype/libunistring_la-joiningtype_of.lo
-@LIBUNISTRING_COMPILE_UNICTYPE_SCRIPTS_TRUE@am__objects_16 = unictype/libunistring_la-scripts.lo
-@LIBUNISTRING_COMPILE_UNINORM_CANONICAL_DECOMPOSITION_TRUE@am__objects_17 = uninorm/libunistring_la-canonical-decomposition.lo
-@LIBUNISTRING_COMPILE_UNINORM_COMPOSITION_TRUE@am__objects_18 = uninorm/libunistring_la-composition.lo
-@LIBUNISTRING_COMPILE_UNINORM_NFC_TRUE@am__objects_19 = uninorm/libunistring_la-nfc.lo
-@LIBUNISTRING_COMPILE_UNINORM_NFD_TRUE@am__objects_20 = uninorm/libunistring_la-nfd.lo
-@LIBUNISTRING_COMPILE_UNINORM_U32_NORMALIZE_TRUE@am__objects_21 = uninorm/libunistring_la-u32-normalize.lo
-@LIBUNISTRING_COMPILE_UNISTR_U32_CMP_TRUE@am__objects_22 = unistr/libunistring_la-u32-cmp.lo
-@LIBUNISTRING_COMPILE_UNISTR_U32_CPY_TRUE@am__objects_23 = unistr/libunistring_la-u32-cpy.lo
-@LIBUNISTRING_COMPILE_UNISTR_U32_CPY_ALLOC_TRUE@am__objects_24 = unistr/libunistring_la-u32-cpy-alloc.lo
-@LIBUNISTRING_COMPILE_UNISTR_U32_MBTOUC_UNSAFE_TRUE@am__objects_25 = unistr/libunistring_la-u32-mbtouc-unsafe.lo
-@LIBUNISTRING_COMPILE_UNISTR_U32_STRLEN_TRUE@am__objects_26 = unistr/libunistring_la-u32-strlen.lo
-@LIBUNISTRING_COMPILE_UNISTR_U32_TO_U8_TRUE@am__objects_27 = unistr/libunistring_la-u32-to-u8.lo
-@LIBUNISTRING_COMPILE_UNISTR_U32_UCTOMB_TRUE@am__objects_28 = unistr/libunistring_la-u32-uctomb.lo
-@LIBUNISTRING_COMPILE_UNISTR_U8_CHECK_TRUE@am__objects_29 = unistr/libunistring_la-u8-check.lo
-@LIBUNISTRING_COMPILE_UNISTR_U8_MBLEN_TRUE@am__objects_30 = unistr/libunistring_la-u8-mblen.lo
-@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_TRUE@am__objects_31 = unistr/libunistring_la-u8-mbtouc.lo \
+@LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_OF_TRUE@am__objects_11 = unictype/libunistring_la-categ_of.lo
+@LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_TEST_TRUE@am__objects_12 = unictype/libunistring_la-categ_test.lo
+@LIBUNISTRING_COMPILE_UNICTYPE_COMBINING_CLASS_TRUE@am__objects_13 = unictype/libunistring_la-combiningclass.lo
+@LIBUNISTRING_COMPILE_UNICTYPE_JOININGTYPE_OF_TRUE@am__objects_14 = unictype/libunistring_la-joiningtype_of.lo
+@LIBUNISTRING_COMPILE_UNICTYPE_SCRIPTS_TRUE@am__objects_15 = unictype/libunistring_la-scripts.lo
+@LIBUNISTRING_COMPILE_UNINORM_CANONICAL_DECOMPOSITION_TRUE@am__objects_16 = uninorm/libunistring_la-canonical-decomposition.lo
+@LIBUNISTRING_COMPILE_UNINORM_COMPOSITION_TRUE@am__objects_17 = uninorm/libunistring_la-composition.lo
+@LIBUNISTRING_COMPILE_UNINORM_NFC_TRUE@am__objects_18 = uninorm/libunistring_la-nfc.lo
+@LIBUNISTRING_COMPILE_UNINORM_NFD_TRUE@am__objects_19 = uninorm/libunistring_la-nfd.lo
+@LIBUNISTRING_COMPILE_UNINORM_U32_NORMALIZE_TRUE@am__objects_20 = uninorm/libunistring_la-u32-normalize.lo
+@LIBUNISTRING_COMPILE_UNISTR_U32_CMP_TRUE@am__objects_21 = unistr/libunistring_la-u32-cmp.lo
+@LIBUNISTRING_COMPILE_UNISTR_U32_CPY_TRUE@am__objects_22 = unistr/libunistring_la-u32-cpy.lo
+@LIBUNISTRING_COMPILE_UNISTR_U32_CPY_ALLOC_TRUE@am__objects_23 = unistr/libunistring_la-u32-cpy-alloc.lo
+@LIBUNISTRING_COMPILE_UNISTR_U32_MBTOUC_UNSAFE_TRUE@am__objects_24 = unistr/libunistring_la-u32-mbtouc-unsafe.lo
+@LIBUNISTRING_COMPILE_UNISTR_U32_STRLEN_TRUE@am__objects_25 = unistr/libunistring_la-u32-strlen.lo
+@LIBUNISTRING_COMPILE_UNISTR_U32_TO_U8_TRUE@am__objects_26 = unistr/libunistring_la-u32-to-u8.lo
+@LIBUNISTRING_COMPILE_UNISTR_U32_UCTOMB_TRUE@am__objects_27 = unistr/libunistring_la-u32-uctomb.lo
+@LIBUNISTRING_COMPILE_UNISTR_U8_CHECK_TRUE@am__objects_28 = unistr/libunistring_la-u8-check.lo
+@LIBUNISTRING_COMPILE_UNISTR_U8_MBLEN_TRUE@am__objects_29 = unistr/libunistring_la-u8-mblen.lo
+@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_TRUE@am__objects_30 = unistr/libunistring_la-u8-mbtouc.lo \
 @LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_TRUE@	unistr/libunistring_la-u8-mbtouc-aux.lo
-@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_TRUE@am__objects_32 = unistr/libunistring_la-u8-mbtouc-unsafe.lo \
+@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_TRUE@am__objects_31 = unistr/libunistring_la-u8-mbtouc-unsafe.lo \
 @LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUC_UNSAFE_TRUE@	unistr/libunistring_la-u8-mbtouc-unsafe-aux.lo
-@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__objects_33 = unistr/libunistring_la-u8-mbtoucr.lo
-@LIBUNISTRING_COMPILE_UNISTR_U8_PREV_TRUE@am__objects_34 = unistr/libunistring_la-u8-prev.lo
-@LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN_TRUE@am__objects_35 = unistr/libunistring_la-u8-strlen.lo
-@LIBUNISTRING_COMPILE_UNISTR_U8_TO_U32_TRUE@am__objects_36 = unistr/libunistring_la-u8-to-u32.lo
-@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__objects_37 = unistr/libunistring_la-u8-uctomb.lo \
+@LIBUNISTRING_COMPILE_UNISTR_U8_MBTOUCR_TRUE@am__objects_32 = unistr/libunistring_la-u8-mbtoucr.lo
+@LIBUNISTRING_COMPILE_UNISTR_U8_PREV_TRUE@am__objects_33 = unistr/libunistring_la-u8-prev.lo
+@LIBUNISTRING_COMPILE_UNISTR_U8_STRLEN_TRUE@am__objects_34 = unistr/libunistring_la-u8-strlen.lo
+@LIBUNISTRING_COMPILE_UNISTR_U8_TO_U32_TRUE@am__objects_35 = unistr/libunistring_la-u8-to-u32.lo
+@LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@am__objects_36 = unistr/libunistring_la-u8-uctomb.lo \
 @LIBUNISTRING_COMPILE_UNISTR_U8_UCTOMB_TRUE@	unistr/libunistring_la-u8-uctomb-aux.lo
 am_libunistring_la_OBJECTS = libunistring_la-c-ctype.lo \
 	libunistring_la-c-strcasecmp.lo \
@@ -349,18 +350,18 @@
 	libunistring_la-striconveha.lo $(am__objects_4) \
 	$(am__objects_5) $(am__objects_6) $(am__objects_7) \
 	$(am__objects_8) $(am__objects_9) $(am__objects_10) \
-	$(am__objects_11) $(am__objects_12) $(am__objects_13) \
-	$(am__objects_14) $(am__objects_15) $(am__objects_16) \
-	$(am__objects_17) $(am__objects_18) \
+	unictype/libunistring_la-categ_none.lo $(am__objects_11) \
+	$(am__objects_12) $(am__objects_13) $(am__objects_14) \
+	$(am__objects_15) $(am__objects_16) $(am__objects_17) \
 	uninorm/libunistring_la-decompose-internal.lo \
 	uninorm/libunistring_la-decomposition-table.lo \
-	$(am__objects_19) $(am__objects_20) $(am__objects_21) \
-	libunistring_la-unistd.lo $(am__objects_22) $(am__objects_23) \
-	$(am__objects_24) $(am__objects_25) $(am__objects_26) \
-	$(am__objects_27) $(am__objects_28) $(am__objects_29) \
-	$(am__objects_30) $(am__objects_31) $(am__objects_32) \
-	$(am__objects_33) $(am__objects_34) $(am__objects_35) \
-	$(am__objects_36) $(am__objects_37)
+	$(am__objects_18) $(am__objects_19) $(am__objects_20) \
+	libunistring_la-unistd.lo $(am__objects_21) $(am__objects_22) \
+	$(am__objects_23) $(am__objects_24) $(am__objects_25) \
+	$(am__objects_26) $(am__objects_27) $(am__objects_28) \
+	$(am__objects_29) $(am__objects_30) $(am__objects_31) \
+	$(am__objects_32) $(am__objects_33) $(am__objects_34) \
+	$(am__objects_35) $(am__objects_36)
 libunistring_la_OBJECTS = $(am_libunistring_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -625,6 +626,7 @@
 GL_GNULIB_GETPAGESIZE = @GL_GNULIB_GETPAGESIZE@
 GL_GNULIB_GETPASS = @GL_GNULIB_GETPASS@
 GL_GNULIB_GETPASS_GNU = @GL_GNULIB_GETPASS_GNU@
+GL_GNULIB_GETPROGNAME = @GL_GNULIB_GETPROGNAME@
 GL_GNULIB_GETSUBOPT = @GL_GNULIB_GETSUBOPT@
 GL_GNULIB_GETUMASK = @GL_GNULIB_GETUMASK@
 GL_GNULIB_GETUSERSHELL = @GL_GNULIB_GETUSERSHELL@
@@ -654,6 +656,7 @@
 GL_GNULIB_MBSSPN = @GL_GNULIB_MBSSPN@
 GL_GNULIB_MBSSTR = @GL_GNULIB_MBSSTR@
 GL_GNULIB_MBSTOK_R = @GL_GNULIB_MBSTOK_R@
+GL_GNULIB_MBSTOWCS = @GL_GNULIB_MBSTOWCS@
 GL_GNULIB_MBTOWC = @GL_GNULIB_MBTOWC@
 GL_GNULIB_MDA_ACCESS = @GL_GNULIB_MDA_ACCESS@
 GL_GNULIB_MDA_CHDIR = @GL_GNULIB_MDA_CHDIR@
@@ -699,6 +702,7 @@
 GL_GNULIB_MEMMEM = @GL_GNULIB_MEMMEM@
 GL_GNULIB_MEMPCPY = @GL_GNULIB_MEMPCPY@
 GL_GNULIB_MEMRCHR = @GL_GNULIB_MEMRCHR@
+GL_GNULIB_MEMSET_EXPLICIT = @GL_GNULIB_MEMSET_EXPLICIT@
 GL_GNULIB_MKDIR = @GL_GNULIB_MKDIR@
 GL_GNULIB_MKDIRAT = @GL_GNULIB_MKDIRAT@
 GL_GNULIB_MKDTEMP = @GL_GNULIB_MKDTEMP@
@@ -736,6 +740,7 @@
 GL_GNULIB_PUTS = @GL_GNULIB_PUTS@
 GL_GNULIB_PWRITE = @GL_GNULIB_PWRITE@
 GL_GNULIB_QSORT_R = @GL_GNULIB_QSORT_R@
+GL_GNULIB_RAND = @GL_GNULIB_RAND@
 GL_GNULIB_RANDOM = @GL_GNULIB_RANDOM@
 GL_GNULIB_RANDOM_R = @GL_GNULIB_RANDOM_R@
 GL_GNULIB_RAWMEMCHR = @GL_GNULIB_RAWMEMCHR@
@@ -791,6 +796,7 @@
 GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@
 GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@
 GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@
+GL_GNULIB_TIME = @GL_GNULIB_TIME@
 GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@
 GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@
 GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@
@@ -868,6 +874,7 @@
 GL_UNISTRING_GNULIB_GETPAGESIZE = @GL_UNISTRING_GNULIB_GETPAGESIZE@
 GL_UNISTRING_GNULIB_GETPASS = @GL_UNISTRING_GNULIB_GETPASS@
 GL_UNISTRING_GNULIB_GETPASS_GNU = @GL_UNISTRING_GNULIB_GETPASS_GNU@
+GL_UNISTRING_GNULIB_GETPROGNAME = @GL_UNISTRING_GNULIB_GETPROGNAME@
 GL_UNISTRING_GNULIB_GETSUBOPT = @GL_UNISTRING_GNULIB_GETSUBOPT@
 GL_UNISTRING_GNULIB_GETUSERSHELL = @GL_UNISTRING_GNULIB_GETUSERSHELL@
 GL_UNISTRING_GNULIB_GRANTPT = @GL_UNISTRING_GNULIB_GRANTPT@
@@ -901,6 +908,8 @@
 GL_UNISTRING_GNULIB_MBSSPN = @GL_UNISTRING_GNULIB_MBSSPN@
 GL_UNISTRING_GNULIB_MBSSTR = @GL_UNISTRING_GNULIB_MBSSTR@
 GL_UNISTRING_GNULIB_MBSTOK_R = @GL_UNISTRING_GNULIB_MBSTOK_R@
+GL_UNISTRING_GNULIB_MBSTOWCS = @GL_UNISTRING_GNULIB_MBSTOWCS@
+GL_UNISTRING_GNULIB_MBSZERO = @GL_UNISTRING_GNULIB_MBSZERO@
 GL_UNISTRING_GNULIB_MBTOWC = @GL_UNISTRING_GNULIB_MBTOWC@
 GL_UNISTRING_GNULIB_MDA_ACCESS = @GL_UNISTRING_GNULIB_MDA_ACCESS@
 GL_UNISTRING_GNULIB_MDA_CHDIR = @GL_UNISTRING_GNULIB_MDA_CHDIR@
@@ -935,6 +944,7 @@
 GL_UNISTRING_GNULIB_MEMMEM = @GL_UNISTRING_GNULIB_MEMMEM@
 GL_UNISTRING_GNULIB_MEMPCPY = @GL_UNISTRING_GNULIB_MEMPCPY@
 GL_UNISTRING_GNULIB_MEMRCHR = @GL_UNISTRING_GNULIB_MEMRCHR@
+GL_UNISTRING_GNULIB_MEMSET_EXPLICIT = @GL_UNISTRING_GNULIB_MEMSET_EXPLICIT@
 GL_UNISTRING_GNULIB_MKDTEMP = @GL_UNISTRING_GNULIB_MKDTEMP@
 GL_UNISTRING_GNULIB_MKOSTEMP = @GL_UNISTRING_GNULIB_MKOSTEMP@
 GL_UNISTRING_GNULIB_MKOSTEMPS = @GL_UNISTRING_GNULIB_MKOSTEMPS@
@@ -950,6 +960,7 @@
 GL_UNISTRING_GNULIB_PUTENV = @GL_UNISTRING_GNULIB_PUTENV@
 GL_UNISTRING_GNULIB_PWRITE = @GL_UNISTRING_GNULIB_PWRITE@
 GL_UNISTRING_GNULIB_QSORT_R = @GL_UNISTRING_GNULIB_QSORT_R@
+GL_UNISTRING_GNULIB_RAND = @GL_UNISTRING_GNULIB_RAND@
 GL_UNISTRING_GNULIB_RANDOM = @GL_UNISTRING_GNULIB_RANDOM@
 GL_UNISTRING_GNULIB_RANDOM_R = @GL_UNISTRING_GNULIB_RANDOM_R@
 GL_UNISTRING_GNULIB_RAWMEMCHR = @GL_UNISTRING_GNULIB_RAWMEMCHR@
@@ -998,6 +1009,141 @@
 GL_UNISTRING_GNULIB_SYSTEM_POSIX = @GL_UNISTRING_GNULIB_SYSTEM_POSIX@
 GL_UNISTRING_GNULIB_TRUNCATE = @GL_UNISTRING_GNULIB_TRUNCATE@
 GL_UNISTRING_GNULIB_TTYNAME_R = @GL_UNISTRING_GNULIB_TTYNAME_R@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE@
+GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE = @GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE@
 GL_UNISTRING_GNULIB_UNISTD_H_GETOPT = @GL_UNISTRING_GNULIB_UNISTD_H_GETOPT@
 GL_UNISTRING_GNULIB_UNISTD_H_NONBLOCKING = @GL_UNISTRING_GNULIB_UNISTD_H_NONBLOCKING@
 GL_UNISTRING_GNULIB_UNISTD_H_SIGPIPE = @GL_UNISTRING_GNULIB_UNISTD_H_SIGPIPE@
@@ -1036,6 +1182,7 @@
 GL_UNISTRING_GNULIB_WCTOB = @GL_UNISTRING_GNULIB_WCTOB@
 GL_UNISTRING_GNULIB_WCTOMB = @GL_UNISTRING_GNULIB_WCTOMB@
 GL_UNISTRING_GNULIB_WCWIDTH = @GL_UNISTRING_GNULIB_WCWIDTH@
+GL_UNISTRING_GNULIB_WGETCWD = @GL_UNISTRING_GNULIB_WGETCWD@
 GL_UNISTRING_GNULIB_WMEMCHR = @GL_UNISTRING_GNULIB_WMEMCHR@
 GL_UNISTRING_GNULIB_WMEMCMP = @GL_UNISTRING_GNULIB_WMEMCMP@
 GL_UNISTRING_GNULIB_WMEMCPY = @GL_UNISTRING_GNULIB_WMEMCPY@
@@ -1047,7 +1194,6 @@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNULIBHEADERS_OVERRIDE_WINT_T = @GNULIBHEADERS_OVERRIDE_WINT_T@
-GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
 GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
@@ -1083,6 +1229,7 @@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
+HAVE_DECL_GETW = @HAVE_DECL_GETW@
 HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
 HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
 HAVE_DECL_INITSTATE = @HAVE_DECL_INITSTATE@
@@ -1090,6 +1237,8 @@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
+HAVE_DECL_PROGRAM_INVOCATION_NAME = @HAVE_DECL_PROGRAM_INVOCATION_NAME@
+HAVE_DECL_PUTW = @HAVE_DECL_PUTW@
 HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
 HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
 HAVE_DECL_SETSTATE = @HAVE_DECL_SETSTATE@
@@ -1111,6 +1260,9 @@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP3 = @HAVE_DUP3@
+HAVE_ERROR = @HAVE_ERROR@
+HAVE_ERROR_AT_LINE = @HAVE_ERROR_AT_LINE@
+HAVE_ERROR_H = @HAVE_ERROR_H@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
 HAVE_EXECVPE = @HAVE_EXECVPE@
 HAVE_EXPLICIT_BZERO = @HAVE_EXPLICIT_BZERO@
@@ -1137,10 +1289,13 @@
 HAVE_GETOPT_H = @HAVE_GETOPT_H@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETPASS = @HAVE_GETPASS@
+HAVE_GETPROGNAME = @HAVE_GETPROGNAME@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
 HAVE_GETUMASK = @HAVE_GETUMASK@
 HAVE_GRANTPT = @HAVE_GRANTPT@
 HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_IMAXABS = @HAVE_IMAXABS@
+HAVE_IMAXDIV = @HAVE_IMAXDIV@
 HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@
 HAVE_INITSTATE = @HAVE_INITSTATE@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
@@ -1159,6 +1314,7 @@
 HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
 HAVE_MBTOWC = @HAVE_MBTOWC@
 HAVE_MEMPCPY = @HAVE_MEMPCPY@
+HAVE_MEMSET_EXPLICIT = @HAVE_MEMSET_EXPLICIT@
 HAVE_MKDIRAT = @HAVE_MKDIRAT@
 HAVE_MKDTEMP = @HAVE_MKDTEMP@
 HAVE_MKFIFO = @HAVE_MKFIFO@
@@ -1234,6 +1390,7 @@
 HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@
 HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
+HAVE_UNISTRING_WOE32DLL_H = @HAVE_UNISTRING_WOE32DLL_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
 HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
 HAVE_USLEEP = @HAVE_USLEEP@
@@ -1295,6 +1452,10 @@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LCOV = @LCOV@
+LC_COLLATE_IMPLEMENTED = @LC_COLLATE_IMPLEMENTED@
+LC_MONETARY_IMPLEMENTED = @LC_MONETARY_IMPLEMENTED@
+LC_NUMERIC_IMPLEMENTED = @LC_NUMERIC_IMPLEMENTED@
+LC_TIME_IMPLEMENTED = @LC_TIME_IMPLEMENTED@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
@@ -1314,6 +1475,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
+LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
 LOG_VALGRIND = @LOG_VALGRIND@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
@@ -1334,6 +1496,7 @@
 NEXT_ASSERT_H = @NEXT_ASSERT_H@
 NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
+NEXT_AS_FIRST_DIRECTIVE_ERROR_H = @NEXT_AS_FIRST_DIRECTIVE_ERROR_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
@@ -1351,6 +1514,7 @@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
+NEXT_ERROR_H = @NEXT_ERROR_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_GETOPT_H = @NEXT_GETOPT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
@@ -1406,6 +1570,9 @@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
+REPLACE_DUP3 = @REPLACE_DUP3@
+REPLACE_ERROR = @REPLACE_ERROR@
+REPLACE_ERROR_AT_LINE = @REPLACE_ERROR_AT_LINE@
 REPLACE_EXECL = @REPLACE_EXECL@
 REPLACE_EXECLE = @REPLACE_EXECLE@
 REPLACE_EXECLP = @REPLACE_EXECLP@
@@ -1414,10 +1581,12 @@
 REPLACE_EXECVP = @REPLACE_EXECVP@
 REPLACE_EXECVPE = @REPLACE_EXECVPE@
 REPLACE_FACCESSAT = @REPLACE_FACCESSAT@
+REPLACE_FCHDIR = @REPLACE_FCHDIR@
 REPLACE_FCHMODAT = @REPLACE_FCHMODAT@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
+REPLACE_FDATASYNC = @REPLACE_FDATASYNC@
 REPLACE_FDOPEN = @REPLACE_FDOPEN@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FFSLL = @REPLACE_FFSLL@
@@ -1439,16 +1608,22 @@
 REPLACE_GETDELIM = @REPLACE_GETDELIM@
 REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
 REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@
+REPLACE_GETENTROPY = @REPLACE_GETENTROPY@
 REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
 REPLACE_GETLINE = @REPLACE_GETLINE@
+REPLACE_GETLOADAVG = @REPLACE_GETLOADAVG@
 REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETPASS = @REPLACE_GETPASS@
 REPLACE_GETPASS_FOR_GETPASS_GNU = @REPLACE_GETPASS_FOR_GETPASS_GNU@
+REPLACE_GETPROGNAME = @REPLACE_GETPROGNAME@
+REPLACE_GETSUBOPT = @REPLACE_GETSUBOPT@
 REPLACE_GMTIME = @REPLACE_GMTIME@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
+REPLACE_IMAXABS = @REPLACE_IMAXABS@
+REPLACE_IMAXDIV = @REPLACE_IMAXDIV@
 REPLACE_INITSTATE = @REPLACE_INITSTATE@
 REPLACE_ISATTY = @REPLACE_ISATTY@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
@@ -1466,14 +1641,20 @@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
+REPLACE_MBSTOWCS = @REPLACE_MBSTOWCS@
 REPLACE_MBTOWC = @REPLACE_MBTOWC@
+REPLACE_MB_CUR_MAX = @REPLACE_MB_CUR_MAX@
 REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
+REPLACE_MEMPCPY = @REPLACE_MEMPCPY@
+REPLACE_MEMSET_EXPLICIT = @REPLACE_MEMSET_EXPLICIT@
 REPLACE_MKDIR = @REPLACE_MKDIR@
 REPLACE_MKFIFO = @REPLACE_MKFIFO@
 REPLACE_MKFIFOAT = @REPLACE_MKFIFOAT@
 REPLACE_MKNOD = @REPLACE_MKNOD@
 REPLACE_MKNODAT = @REPLACE_MKNODAT@
+REPLACE_MKOSTEMP = @REPLACE_MKOSTEMP@
+REPLACE_MKOSTEMPS = @REPLACE_MKOSTEMPS@
 REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
 REPLACE_MKTIME = @REPLACE_MKTIME@
 REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
@@ -1482,8 +1663,10 @@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_OPENAT = @REPLACE_OPENAT@
 REPLACE_PERROR = @REPLACE_PERROR@
+REPLACE_PIPE2 = @REPLACE_PIPE2@
 REPLACE_POPEN = @REPLACE_POPEN@
 REPLACE_POSIX_MEMALIGN = @REPLACE_POSIX_MEMALIGN@
+REPLACE_POSIX_OPENPT = @REPLACE_POSIX_OPENPT@
 REPLACE_PREAD = @REPLACE_PREAD@
 REPLACE_PRINTF = @REPLACE_PRINTF@
 REPLACE_PTSNAME = @REPLACE_PTSNAME@
@@ -1491,6 +1674,7 @@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_PWRITE = @REPLACE_PWRITE@
 REPLACE_QSORT_R = @REPLACE_QSORT_R@
+REPLACE_RAND = @REPLACE_RAND@
 REPLACE_RANDOM = @REPLACE_RANDOM@
 REPLACE_RANDOM_R = @REPLACE_RANDOM_R@
 REPLACE_READ = @REPLACE_READ@
@@ -1505,6 +1689,7 @@
 REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
 REPLACE_RMDIR = @REPLACE_RMDIR@
 REPLACE_SETENV = @REPLACE_SETENV@
+REPLACE_SETHOSTNAME = @REPLACE_SETHOSTNAME@
 REPLACE_SETSTATE = @REPLACE_SETSTATE@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
@@ -1512,6 +1697,7 @@
 REPLACE_STAT = @REPLACE_STAT@
 REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
+REPLACE_STPCPY = @REPLACE_STPCPY@
 REPLACE_STPNCPY = @REPLACE_STPNCPY@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
 REPLACE_STRCHRNUL = @REPLACE_STRCHRNUL@
@@ -1534,9 +1720,13 @@
 REPLACE_STRTOUL = @REPLACE_STRTOUL@
 REPLACE_STRTOULL = @REPLACE_STRTOULL@
 REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@
+REPLACE_STRVERSCMP = @REPLACE_STRVERSCMP@
 REPLACE_SYMLINK = @REPLACE_SYMLINK@
 REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
+REPLACE_TIME = @REPLACE_TIME@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
+REPLACE_TIMESPEC_GET = @REPLACE_TIMESPEC_GET@
+REPLACE_TIMESPEC_GETRES = @REPLACE_TIMESPEC_GETRES@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
 REPLACE_TRUNCATE = @REPLACE_TRUNCATE@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
@@ -1553,21 +1743,26 @@
 REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@
 REPLACE_VSPRINTF = @REPLACE_VSPRINTF@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
+REPLACE_WCSCMP = @REPLACE_WCSCMP@
 REPLACE_WCSFTIME = @REPLACE_WCSFTIME@
+REPLACE_WCSNCMP = @REPLACE_WCSNCMP@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
+REPLACE_WCSSTR = @REPLACE_WCSSTR@
 REPLACE_WCSTOK = @REPLACE_WCSTOK@
 REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
 REPLACE_WCTOB = @REPLACE_WCTOB@
 REPLACE_WCTOMB = @REPLACE_WCTOMB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
+REPLACE_WMEMCMP = @REPLACE_WMEMCMP@
+REPLACE_WMEMPCPY = @REPLACE_WMEMPCPY@
 REPLACE_WRITE = @REPLACE_WRITE@
+REPLACE__EXIT = @REPLACE__EXIT@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
-STDALIGN_H = @STDALIGN_H@
 STDARG_H = @STDARG_H@
 STDCKDINT_H = @STDCKDINT_H@
 STDDEF_H = @STDDEF_H@
@@ -1590,6 +1785,8 @@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
+WERROR_CFLAGS = @WERROR_CFLAGS@
+WERROR_TESTS_CFLAGS = @WERROR_TESTS_CFLAGS@
 WINDOWS_64_BIT_OFF_T = @WINDOWS_64_BIT_OFF_T@
 WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@
 WINDOWS_STAT_INODES = @WINDOWS_STAT_INODES@
@@ -1708,13 +1905,16 @@
 	iconv_open-aix.h-t iconv_open-hpux.h-t iconv_open-irix.h-t \
 	iconv_open-osf.h-t iconv_open-solaris.h-t iconv_open-zos.h-t \
 	inttypes.h inttypes.h-t limits.h limits.h-t stddef.h \
-	stddef.h-t stdint.h stdint.h-t stdlib.h stdlib.h-t string.h \
-	string.h-t sys/types.h sys/types.h-t uniconv.h uniconv.h-t \
-	unictype.h unictype.h-t unictype/scripts_byname.h-t1 \
-	unictype/scripts_byname.h-t2 uninorm.h uninorm.h-t \
-	uninorm/composition-table.h-t1 uninorm/composition-table.h-t2 \
-	unistd.h unistd.h-t unistr.h unistr.h-t unitypes.h \
-	unitypes.h-t wchar.h wchar.h-t
+	stddef.h-t stdint.h stdint.h-t stdlib.h stdlib.h-t1 \
+	stdlib.h-t2 stdlib.h-t3 string.h string.h-t1 string.h-t2 \
+	sys/types.h sys/types.h-t uniconv.h uniconv.h-t unictype.h \
+	unictype.h-t1 unictype.h-t2 unictype.h-t3 unictype.h-t4 \
+	unictype/scripts_byname.h-t1 unictype/scripts_byname.h-t2 \
+	uninorm.h uninorm.h-t uninorm/composition-table.h-t1 \
+	uninorm/composition-table.h-t2 unistd.h unistd.h-t1 \
+	unistd.h-t2 unistd.h-t3 unistd.h-t4 unistr.h unistr.h-t \
+	unitypes.h unitypes.h-t wchar.h wchar.h-t1 wchar.h-t2 \
+	wchar.h-t3
 MOSTLYCLEANDIRS = 
 CLEANFILES = 
 DISTCLEANFILES = 
@@ -1726,25 +1926,25 @@
 libunistring_la_SOURCES = c-ctype.h c-ctype.c c-strcase.h \
 	c-strcasecmp.c c-strncasecmp.c $(am__append_1) $(am__append_2) \
 	$(am__append_3) localcharset.c striconveh.h striconveh.c \
-	striconveha.h striconveha.c $(am__append_5) $(am__append_6) \
-	$(am__append_7) $(am__append_8) $(am__append_9) \
-	$(am__append_10) $(am__append_11) $(am__append_12) \
-	$(am__append_13) $(am__append_14) $(am__append_15) \
-	$(am__append_16) $(am__append_17) $(am__append_18) \
-	$(am__append_19) uninorm/decompose-internal.c \
-	uninorm/decomposition-table.c $(am__append_20) \
-	$(am__append_21) $(am__append_22) unistd.c $(am__append_23) \
-	$(am__append_24) $(am__append_25) $(am__append_26) \
-	$(am__append_27) $(am__append_28) $(am__append_29) \
-	$(am__append_30) $(am__append_31) $(am__append_32) \
-	$(am__append_33) $(am__append_34) $(am__append_35) \
-	$(am__append_36) $(am__append_37) $(am__append_38)
+	striconveha.h striconveha.c $(am__append_4) $(am__append_5) \
+	$(am__append_6) $(am__append_7) $(am__append_8) \
+	$(am__append_9) $(am__append_10) unictype/categ_none.c \
+	$(am__append_11) $(am__append_12) $(am__append_13) \
+	$(am__append_14) $(am__append_15) $(am__append_16) \
+	$(am__append_17) uninorm/decompose-internal.c \
+	uninorm/decomposition-table.c $(am__append_18) \
+	$(am__append_19) $(am__append_20) unistd.c $(am__append_21) \
+	$(am__append_22) $(am__append_23) $(am__append_24) \
+	$(am__append_25) $(am__append_26) $(am__append_27) \
+	$(am__append_28) $(am__append_29) $(am__append_30) \
+	$(am__append_31) $(am__append_32) $(am__append_33) \
+	$(am__append_34) $(am__append_35) $(am__append_36)
 libunistring_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAG_GNULIB_WARNINGS)
 libunistring_la_LIBADD = $(unistring_LTLIBOBJS)
 libunistring_la_DEPENDENCIES = $(unistring_LTLIBOBJS)
 EXTRA_libunistring_la_SOURCES = 
 libunistring_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(LTLIBICONV) \
-	$(LTLIBUNISTRING) $(am__append_4)
+	$(LTLIBUNISTRING) $(LTLIBICONV)
 
 # Use this preprocessor expression to decide whether #include_next works.
 # Do not rely on a 'configure'-time test for this, since the expression
@@ -2784,6 +2984,8 @@
 	      -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \
 	      -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \
 	      -e 's/@''HAVE_IMAXDIV_T''@/$(HAVE_IMAXDIV_T)/g' \
+	      -e 's/@''REPLACE_IMAXABS''@/$(REPLACE_IMAXABS)/g' \
+	      -e 's/@''REPLACE_IMAXDIV''@/$(REPLACE_IMAXDIV)/g' \
 	      -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \
 	      -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \
 	      -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \
@@ -2881,10 +3083,12 @@
 	      -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GL_UNISTRING_GNULIB_CANONICALIZE_FILE_NAME)/g' \
 	      -e 's/@''GNULIB_FREE_POSIX''@/$(GL_UNISTRING_GNULIB_FREE_POSIX)/g' \
 	      -e 's/@''GNULIB_GETLOADAVG''@/$(GL_UNISTRING_GNULIB_GETLOADAVG)/g' \
+	      -e 's/@''GNULIB_GETPROGNAME''@/$(GL_UNISTRING_GNULIB_GETPROGNAME)/g' \
 	      -e 's/@''GNULIB_GETSUBOPT''@/$(GL_UNISTRING_GNULIB_GETSUBOPT)/g' \
 	      -e 's/@''GNULIB_GRANTPT''@/$(GL_UNISTRING_GNULIB_GRANTPT)/g' \
 	      -e 's/@''GNULIB_MALLOC_GNU''@/$(GL_UNISTRING_GNULIB_MALLOC_GNU)/g' \
 	      -e 's/@''GNULIB_MALLOC_POSIX''@/$(GL_UNISTRING_GNULIB_MALLOC_POSIX)/g' \
+	      -e 's/@''GNULIB_MBSTOWCS''@/$(GL_UNISTRING_GNULIB_MBSTOWCS)/g' \
 	      -e 's/@''GNULIB_MBTOWC''@/$(GL_UNISTRING_GNULIB_MBTOWC)/g' \
 	      -e 's/@''GNULIB_MKDTEMP''@/$(GL_UNISTRING_GNULIB_MKDTEMP)/g' \
 	      -e 's/@''GNULIB_MKOSTEMP''@/$(GL_UNISTRING_GNULIB_MKOSTEMP)/g' \
@@ -2897,6 +3101,7 @@
 	      -e 's/@''GNULIB_PTSNAME_R''@/$(GL_UNISTRING_GNULIB_PTSNAME_R)/g' \
 	      -e 's/@''GNULIB_PUTENV''@/$(GL_UNISTRING_GNULIB_PUTENV)/g' \
 	      -e 's/@''GNULIB_QSORT_R''@/$(GL_UNISTRING_GNULIB_QSORT_R)/g' \
+	      -e 's/@''GNULIB_RAND''@/$(GL_UNISTRING_GNULIB_RAND)/g' \
 	      -e 's/@''GNULIB_RANDOM''@/$(GL_UNISTRING_GNULIB_RANDOM)/g' \
 	      -e 's/@''GNULIB_RANDOM_R''@/$(GL_UNISTRING_GNULIB_RANDOM_R)/g' \
 	      -e 's/@''GNULIB_REALLOC_GNU''@/$(GL_UNISTRING_GNULIB_REALLOC_GNU)/g' \
@@ -2921,8 +3126,9 @@
 	      -e 's/@''GNULIB_MDA_GCVT''@/$(GL_UNISTRING_GNULIB_MDA_GCVT)/g' \
 	      -e 's/@''GNULIB_MDA_MKTEMP''@/$(GL_UNISTRING_GNULIB_MDA_MKTEMP)/g' \
 	      -e 's/@''GNULIB_MDA_PUTENV''@/$(GL_UNISTRING_GNULIB_MDA_PUTENV)/g' \
-	      < $(srcdir)/stdlib.in.h | \
-	  sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
+	      < $(srcdir)/stdlib.in.h > $@-t1
+	$(AM_V_at)sed \
+	      -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
 	      -e 's|@''HAVE_ALIGNED_ALLOC''@|$(HAVE_ALIGNED_ALLOC)|g' \
 	      -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
 	      -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
@@ -2930,6 +3136,8 @@
 	      -e 's|@''HAVE_DECL_FCVT''@|$(HAVE_DECL_FCVT)|g' \
 	      -e 's|@''HAVE_DECL_GCVT''@|$(HAVE_DECL_GCVT)|g' \
 	      -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
+	      -e 's|@''HAVE_DECL_PROGRAM_INVOCATION_NAME''@|$(HAVE_DECL_PROGRAM_INVOCATION_NAME)|g' \
+	      -e 's|@''HAVE_GETPROGNAME''@|$(HAVE_GETPROGNAME)|g' \
 	      -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
 	      -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \
 	      -e 's|@''HAVE_INITSTATE''@|$(HAVE_INITSTATE)|g' \
@@ -2965,21 +3173,33 @@
 	      -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
 	      -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
 	      -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \
+	      < $@-t1 > $@-t2
+	$(AM_V_at)sed \
+	      -e 's|@''REPLACE__EXIT''@|$(REPLACE__EXIT)|g' \
 	      -e 's|@''REPLACE_ALIGNED_ALLOC''@|$(REPLACE_ALIGNED_ALLOC)|g' \
 	      -e 's|@''REPLACE_CALLOC_FOR_CALLOC_GNU''@|$(REPLACE_CALLOC_FOR_CALLOC_GNU)|g' \
 	      -e 's|@''REPLACE_CALLOC_FOR_CALLOC_POSIX''@|$(REPLACE_CALLOC_FOR_CALLOC_POSIX)|g' \
 	      -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \
 	      -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \
+	      -e 's|@''REPLACE_GETLOADAVG''@|$(REPLACE_GETLOADAVG)|g' \
+	      -e 's|@''REPLACE_GETPROGNAME''@|$(REPLACE_GETPROGNAME)|g' \
+	      -e 's|@''REPLACE_GETSUBOPT''@|$(REPLACE_GETSUBOPT)|g' \
 	      -e 's|@''REPLACE_INITSTATE''@|$(REPLACE_INITSTATE)|g' \
 	      -e 's|@''REPLACE_MALLOC_FOR_MALLOC_GNU''@|$(REPLACE_MALLOC_FOR_MALLOC_GNU)|g' \
 	      -e 's|@''REPLACE_MALLOC_FOR_MALLOC_POSIX''@|$(REPLACE_MALLOC_FOR_MALLOC_POSIX)|g' \
+	      -e 's|@''REPLACE_MB_CUR_MAX''@|$(REPLACE_MB_CUR_MAX)|g' \
+	      -e 's|@''REPLACE_MBSTOWCS''@|$(REPLACE_MBSTOWCS)|g' \
 	      -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
+	      -e 's|@''REPLACE_MKOSTEMP''@|$(REPLACE_MKOSTEMP)|g' \
+	      -e 's|@''REPLACE_MKOSTEMPS''@|$(REPLACE_MKOSTEMPS)|g' \
 	      -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
 	      -e 's|@''REPLACE_POSIX_MEMALIGN''@|$(REPLACE_POSIX_MEMALIGN)|g' \
+	      -e 's|@''REPLACE_POSIX_OPENPT''@|$(REPLACE_POSIX_OPENPT)|g' \
 	      -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
 	      -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
 	      -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
 	      -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \
+	      -e 's|@''REPLACE_RAND''@|$(REPLACE_RAND)|g' \
 	      -e 's|@''REPLACE_RANDOM''@|$(REPLACE_RANDOM)|g' \
 	      -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \
 	      -e 's|@''REPLACE_REALLOC_FOR_REALLOC_GNU''@|$(REPLACE_REALLOC_FOR_REALLOC_GNU)|g' \
@@ -3000,8 +3220,9 @@
 	      -e '/definition of _Noreturn/r $(_NORETURN_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      > $@-t
-	$(AM_V_at)mv $@-t $@
+	      < $@-t2 > $@-t3
+	$(AM_V_at)rm -f $@-t1 $@-t2
+	$(AM_V_at)mv $@-t3 $@
 
 # We need the following in order to create <string.h> when the system
 # doesn't have one that works with the given compiler.
@@ -3033,6 +3254,7 @@
 	      -e 's/@''GNULIB_MEMMEM''@/$(GL_UNISTRING_GNULIB_MEMMEM)/g' \
 	      -e 's/@''GNULIB_MEMPCPY''@/$(GL_UNISTRING_GNULIB_MEMPCPY)/g' \
 	      -e 's/@''GNULIB_MEMRCHR''@/$(GL_UNISTRING_GNULIB_MEMRCHR)/g' \
+	      -e 's/@''GNULIB_MEMSET_EXPLICIT''@/$(GL_UNISTRING_GNULIB_MEMSET_EXPLICIT)/g' \
 	      -e 's/@''GNULIB_RAWMEMCHR''@/$(GL_UNISTRING_GNULIB_RAWMEMCHR)/g' \
 	      -e 's/@''GNULIB_STPCPY''@/$(GL_UNISTRING_GNULIB_STPCPY)/g' \
 	      -e 's/@''GNULIB_STPNCPY''@/$(GL_UNISTRING_GNULIB_STPNCPY)/g' \
@@ -3056,14 +3278,16 @@
 	      -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GL_UNISTRING_GNULIB_MDA_MEMCCPY)/g' \
 	      -e 's/@''GNULIB_MDA_STRDUP''@/$(GL_UNISTRING_GNULIB_MDA_STRDUP)/g' \
 	      -e 's/@''GNULIB_FREE_POSIX''@/$(GL_UNISTRING_GNULIB_FREE_POSIX)/g' \
-	      < $(srcdir)/string.in.h | \
-	  sed -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \
+	      < $(srcdir)/string.in.h > $@-t1
+	$(AM_V_at)sed \
+	      -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \
 	      -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \
 	      -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \
 	      -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
 	      -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
 	      -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
 	      -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \
+	      -e 's|@''HAVE_MEMSET_EXPLICIT''@|$(HAVE_MEMSET_EXPLICIT)|g' \
 	      -e 's|@''HAVE_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \
 	      -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \
 	      -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \
@@ -3084,7 +3308,10 @@
 	      -e 's|@''REPLACE_FFSLL''@|$(REPLACE_FFSLL)|g' \
 	      -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \
 	      -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \
+	      -e 's|@''REPLACE_MEMPCPY''@|$(REPLACE_MEMPCPY)|g' \
+	      -e 's|@''REPLACE_MEMSET_EXPLICIT''@|$(REPLACE_MEMSET_EXPLICIT)|g' \
 	      -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \
+	      -e 's|@''REPLACE_STPCPY''@|$(REPLACE_STPCPY)|g' \
 	      -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \
 	      -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \
 	      -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \
@@ -3098,12 +3325,14 @@
 	      -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \
 	      -e 's|@''REPLACE_STRERRORNAME_NP''@|$(REPLACE_STRERRORNAME_NP)|g' \
 	      -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \
+	      -e 's|@''REPLACE_STRVERSCMP''@|$(REPLACE_STRVERSCMP)|g' \
 	      -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      > $@-t
-	$(AM_V_at)mv $@-t $@
+	      < $@-t1 > $@-t2
+	$(AM_V_at)rm -f $@-t1
+	$(AM_V_at)mv $@-t2 $@
 
 # We need the following in order to create <sys/types.h> when the system
 # doesn't have one that works with the given compiler.
@@ -3125,8 +3354,148 @@
 	$(AM_V_at)mv $@-t $@
 
 unictype.h: unictype.in.h
-	$(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unictype.in.h
-	$(AM_V_at)mv $@-t $@
+	$(gl_V_at)$(SED_HEADER_STDOUT) \
+	      -e 's|@''HAVE_UNISTRING_WOE32DLL_H''@|$(HAVE_UNISTRING_WOE32DLL_H)|g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE)/g' \
+	      < $(srcdir)/unictype.in.h > $@-t1
+	$(AM_V_at)sed \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE)/g' \
+	      < $@-t1 > $@-t2
+	$(AM_V_at)sed \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE)/g' \
+	      < $@-t2 > $@-t3
+	$(AM_V_at)sed \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE)/g' \
+	      < $@-t3 > $@-t4
+	$(AM_V_at)rm -f $@-t1 $@-t2 $@-t3
+	$(AM_V_at)mv $@-t4 $@
 
 $(srcdir)/unictype/scripts_byname.h: $(srcdir)/unictype/scripts_byname.gperf
 	$(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/scripts_byname.gperf > $(srcdir)/unictype/scripts_byname.h-t1 \
@@ -3134,7 +3503,13 @@
 	&& mv $(srcdir)/unictype/scripts_byname.h-t2 $(srcdir)/unictype/scripts_byname.h
 
 uninorm.h: uninorm.in.h
-	$(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/uninorm.in.h
+	$(gl_V_at)$(SED_HEADER_STDOUT) \
+	      -e 's|@''HAVE_UNISTRING_WOE32DLL_H''@|$(HAVE_UNISTRING_WOE32DLL_H)|g' \
+	      -e 's/@''GNULIB_UNINORM_NFD_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNINORM_NFC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNINORM_NFKD_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNINORM_NFKC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE)/g' \
+	      $(srcdir)/uninorm.in.h > $@-t
 	$(AM_V_at)mv $@-t $@
 
 $(srcdir)/uninorm/composition-table.h: $(srcdir)/uninorm/composition-table.gperf
@@ -3176,6 +3551,8 @@
 	      -e 's/@''GNULIB_FDATASYNC''@/$(GL_UNISTRING_GNULIB_FDATASYNC)/g' \
 	      -e 's/@''GNULIB_FSYNC''@/$(GL_UNISTRING_GNULIB_FSYNC)/g' \
 	      -e 's/@''GNULIB_FTRUNCATE''@/$(GL_UNISTRING_GNULIB_FTRUNCATE)/g' \
+	      < $(srcdir)/unistd.in.h > $@-t1
+	$(AM_V_at)sed \
 	      -e 's/@''GNULIB_GETCWD''@/$(GL_UNISTRING_GNULIB_GETCWD)/g' \
 	      -e 's/@''GNULIB_GETDOMAINNAME''@/$(GL_UNISTRING_GNULIB_GETDOMAINNAME)/g' \
 	      -e 's/@''GNULIB_GETDTABLESIZE''@/$(GL_UNISTRING_GNULIB_GETDTABLESIZE)/g' \
@@ -3237,8 +3614,9 @@
 	      -e 's/@''GNULIB_MDA_SWAB''@/$(GL_UNISTRING_GNULIB_MDA_SWAB)/g' \
 	      -e 's/@''GNULIB_MDA_UNLINK''@/$(GL_UNISTRING_GNULIB_MDA_UNLINK)/g' \
 	      -e 's/@''GNULIB_MDA_WRITE''@/$(GL_UNISTRING_GNULIB_MDA_WRITE)/g' \
-	      < $(srcdir)/unistd.in.h | \
-	  sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
+	      < $@-t1 > $@-t2
+	$(AM_V_at)sed \
+	      -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
 	      -e 's|@''HAVE_COPY_FILE_RANGE''@|$(HAVE_COPY_FILE_RANGE)|g' \
 	      -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \
 	      -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \
@@ -3285,13 +3663,15 @@
 	      -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
 	      -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
 	      -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
-	  | \
-	  sed -e 's|@''REPLACE_ACCESS''@|$(REPLACE_ACCESS)|g' \
+	      < $@-t2 > $@-t3
+	$(AM_V_at)sed \
+	      -e 's|@''REPLACE_ACCESS''@|$(REPLACE_ACCESS)|g' \
 	      -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
 	      -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \
 	      -e 's|@''REPLACE_COPY_FILE_RANGE''@|$(REPLACE_COPY_FILE_RANGE)|g' \
 	      -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \
 	      -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \
+	      -e 's|@''REPLACE_DUP3''@|$(REPLACE_DUP3)|g' \
 	      -e 's|@''REPLACE_EXECL''@|$(REPLACE_EXECL)|g' \
 	      -e 's|@''REPLACE_EXECLE''@|$(REPLACE_EXECLE)|g' \
 	      -e 's|@''REPLACE_EXECLP''@|$(REPLACE_EXECLP)|g' \
@@ -3300,11 +3680,14 @@
 	      -e 's|@''REPLACE_EXECVP''@|$(REPLACE_EXECVP)|g' \
 	      -e 's|@''REPLACE_EXECVPE''@|$(REPLACE_EXECVPE)|g' \
 	      -e 's|@''REPLACE_FACCESSAT''@|$(REPLACE_FACCESSAT)|g' \
+	      -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \
 	      -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \
+	      -e 's|@''REPLACE_FDATASYNC''@|$(REPLACE_FDATASYNC)|g' \
 	      -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \
 	      -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
 	      -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \
 	      -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \
+	      -e 's|@''REPLACE_GETENTROPY''@|$(REPLACE_GETENTROPY)|g' \
 	      -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
 	      -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
 	      -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
@@ -3315,12 +3698,14 @@
 	      -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
 	      -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \
 	      -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
+	      -e 's|@''REPLACE_PIPE2''@|$(REPLACE_PIPE2)|g' \
 	      -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \
 	      -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \
 	      -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \
 	      -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \
 	      -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \
 	      -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \
+	      -e 's|@''REPLACE_SETHOSTNAME''@|$(REPLACE_SETHOSTNAME)|g' \
 	      -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
 	      -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \
 	      -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \
@@ -3336,8 +3721,9 @@
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      > $@-t
-	$(AM_V_at)mv $@-t $@
+	      < $@-t3 > $@-t4
+	$(AM_V_at)rm -f $@-t1 $@-t2 $@-t3
+	$(AM_V_at)mv $@-t4 $@
 
 unistr.h: unistr.in.h
 	$(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unistr.in.h
@@ -3363,6 +3749,7 @@
 	      -e 's/@''GNULIB_BTOWC''@/$(GL_UNISTRING_GNULIB_BTOWC)/g' \
 	      -e 's/@''GNULIB_WCTOB''@/$(GL_UNISTRING_GNULIB_WCTOB)/g' \
 	      -e 's/@''GNULIB_MBSINIT''@/$(GL_UNISTRING_GNULIB_MBSINIT)/g' \
+	      -e 's/@''GNULIB_MBSZERO''@/$(GL_UNISTRING_GNULIB_MBSZERO)/g' \
 	      -e 's/@''GNULIB_MBRTOWC''@/$(GL_UNISTRING_GNULIB_MBRTOWC)/g' \
 	      -e 's/@''GNULIB_MBRLEN''@/$(GL_UNISTRING_GNULIB_MBRLEN)/g' \
 	      -e 's/@''GNULIB_MBSRTOWCS''@/$(GL_UNISTRING_GNULIB_MBSRTOWCS)/g' \
@@ -3401,10 +3788,12 @@
 	      -e 's/@''GNULIB_WCSTOK''@/$(GL_UNISTRING_GNULIB_WCSTOK)/g' \
 	      -e 's/@''GNULIB_WCSWIDTH''@/$(GL_UNISTRING_GNULIB_WCSWIDTH)/g' \
 	      -e 's/@''GNULIB_WCSFTIME''@/$(GL_UNISTRING_GNULIB_WCSFTIME)/g' \
+	      -e 's/@''GNULIB_WGETCWD''@/$(GL_UNISTRING_GNULIB_WGETCWD)/g' \
 	      -e 's/@''GNULIB_MDA_WCSDUP''@/$(GL_UNISTRING_GNULIB_MDA_WCSDUP)/g' \
 	      -e 's/@''GNULIB_FREE_POSIX''@/$(GL_UNISTRING_GNULIB_FREE_POSIX)/g' \
-	      < $(srcdir)/wchar.in.h | \
-	  sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
+	      < $(srcdir)/wchar.in.h > $@-t1
+	$(AM_V_at)sed \
+	      -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
 	      -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
 	      -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
 	      -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \
@@ -3447,8 +3836,9 @@
 	      -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
 	      -e 's|@''HAVE_DECL_WCSDUP''@|$(HAVE_DECL_WCSDUP)|g' \
 	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
-	  | \
-	  sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
+	      < $@-t1 > $@-t2
+	$(AM_V_at)sed \
+	      -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
 	      -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \
 	      -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
 	      -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \
@@ -3463,12 +3853,18 @@
 	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
 	      -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \
 	      -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \
+	      -e 's|@''REPLACE_WCSCMP''@|$(REPLACE_WCSCMP)|g' \
+	      -e 's|@''REPLACE_WCSNCMP''@|$(REPLACE_WCSNCMP)|g' \
+	      -e 's|@''REPLACE_WCSSTR''@|$(REPLACE_WCSSTR)|g' \
 	      -e 's|@''REPLACE_WCSTOK''@|$(REPLACE_WCSTOK)|g' \
+	      -e 's|@''REPLACE_WMEMCMP''@|$(REPLACE_WMEMCMP)|g' \
+	      -e 's|@''REPLACE_WMEMPCPY''@|$(REPLACE_WMEMPCPY)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      > $@-t
-	$(AM_V_at)mv $@-t $@
+	      < $@-t2 > $@-t3
+	$(AM_V_at)rm -f $@-t1 $@-t2
+	$(AM_V_at)mv $@-t3 $@
 
 mostlyclean-local: mostlyclean-generic
 	@for dir in '' $(MOSTLYCLEANDIRS); do \

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/_Noreturn.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/_Noreturn.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/arg-nonnull.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/arg-nonnull.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/array-mergesort.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/array-mergesort.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/attribute.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/attribute.h Changed

@@ -1,6 +1,6 @@
 /* ATTRIBUTE_* macros for using attributes in GCC and similar compilers
 
-   Copyright 2020-2022 Free Software Foundation, Inc.
+   Copyright 2020-2024 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -32,7 +32,7 @@
 
 
 /* This file defines two types of attributes:
-   * C2x standard attributes.  These have macro names that do not begin with
+   * C23 standard attributes.  These have macro names that do not begin with
      'ATTRIBUTE_'.
    * Selected GCC attributes; see:
      https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html
@@ -41,6 +41,21 @@
      These names begin with 'ATTRIBUTE_' to avoid name clashes.  */
 
 
+/* This file uses _GL_ATTRIBUTE_ALLOC_SIZE, _GL_ATTRIBUTE_ALWAYS_INLINE,
+   _GL_ATTRIBUTE_ARTIFICIAL, _GL_ATTRIBUTE_COLD, _GL_ATTRIBUTE_CONST,
+   _GL_ATTRIBUTE_DEALLOC, _GL_ATTRIBUTE_DEPRECATED, _GL_ATTRIBUTE_ERROR,
+   _GL_ATTRIBUTE_WARNING, _GL_ATTRIBUTE_EXTERNALLY_VISIBLE,
+   _GL_ATTRIBUTE_FALLTHROUGH, _GL_ATTRIBUTE_FORMAT, _GL_ATTRIBUTE_LEAF,
+   _GL_ATTRIBUTE_MALLOC, _GL_ATTRIBUTE_MAY_ALIAS, _GL_ATTRIBUTE_MAYBE_UNUSED,
+   _GL_ATTRIBUTE_NODISCARD, _GL_ATTRIBUTE_NOINLINE, _GL_ATTRIBUTE_NONNULL,
+   _GL_ATTRIBUTE_NONSTRING, _GL_ATTRIBUTE_NOTHROW, _GL_ATTRIBUTE_PACKED,
+   _GL_ATTRIBUTE_PURE, _GL_ATTRIBUTE_RETURNS_NONNULL,
+   _GL_ATTRIBUTE_SENTINEL.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
+
 /* =============== Attributes for specific kinds of functions =============== */
 
 /* Attributes for functions that should not be used.  */
@@ -167,6 +182,8 @@
 
 /* The function does not throw exceptions.  */
 /* Applies to: functions.  */
+/* After a function's parameter list, this attribute must come first, before
+   other attributes.  */
 #define ATTRIBUTE_NOTHROW _GL_ATTRIBUTE_NOTHROW
 
 /* Do not inline the function.  */

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/c++defs.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/c++defs.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/c-ctype.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/c-ctype.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/c-ctype.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/c-ctype.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/c-strcase.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/c-strcase.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/c-strcasecmp.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/c-strcasecmp.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/c-strcaseeq.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/c-strcaseeq.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/c-strncasecmp.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/c-strncasecmp.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/free.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/free.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/gnulib.mk -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/gnulib.mk Changed

@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2022 Free Software Foundation, Inc.
+# Copyright (C) 2002-2024 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
@@ -249,6 +249,8 @@
 	      -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \
 	      -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \
 	      -e 's/@''HAVE_IMAXDIV_T''@/$(HAVE_IMAXDIV_T)/g' \
+	      -e 's/@''REPLACE_IMAXABS''@/$(REPLACE_IMAXABS)/g' \
+	      -e 's/@''REPLACE_IMAXDIV''@/$(REPLACE_IMAXDIV)/g' \
 	      -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \
 	      -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \
 	      -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \
@@ -454,10 +456,12 @@
 	      -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GL_UNISTRING_GNULIB_CANONICALIZE_FILE_NAME)/g' \
 	      -e 's/@''GNULIB_FREE_POSIX''@/$(GL_UNISTRING_GNULIB_FREE_POSIX)/g' \
 	      -e 's/@''GNULIB_GETLOADAVG''@/$(GL_UNISTRING_GNULIB_GETLOADAVG)/g' \
+	      -e 's/@''GNULIB_GETPROGNAME''@/$(GL_UNISTRING_GNULIB_GETPROGNAME)/g' \
 	      -e 's/@''GNULIB_GETSUBOPT''@/$(GL_UNISTRING_GNULIB_GETSUBOPT)/g' \
 	      -e 's/@''GNULIB_GRANTPT''@/$(GL_UNISTRING_GNULIB_GRANTPT)/g' \
 	      -e 's/@''GNULIB_MALLOC_GNU''@/$(GL_UNISTRING_GNULIB_MALLOC_GNU)/g' \
 	      -e 's/@''GNULIB_MALLOC_POSIX''@/$(GL_UNISTRING_GNULIB_MALLOC_POSIX)/g' \
+	      -e 's/@''GNULIB_MBSTOWCS''@/$(GL_UNISTRING_GNULIB_MBSTOWCS)/g' \
 	      -e 's/@''GNULIB_MBTOWC''@/$(GL_UNISTRING_GNULIB_MBTOWC)/g' \
 	      -e 's/@''GNULIB_MKDTEMP''@/$(GL_UNISTRING_GNULIB_MKDTEMP)/g' \
 	      -e 's/@''GNULIB_MKOSTEMP''@/$(GL_UNISTRING_GNULIB_MKOSTEMP)/g' \
@@ -470,6 +474,7 @@
 	      -e 's/@''GNULIB_PTSNAME_R''@/$(GL_UNISTRING_GNULIB_PTSNAME_R)/g' \
 	      -e 's/@''GNULIB_PUTENV''@/$(GL_UNISTRING_GNULIB_PUTENV)/g' \
 	      -e 's/@''GNULIB_QSORT_R''@/$(GL_UNISTRING_GNULIB_QSORT_R)/g' \
+	      -e 's/@''GNULIB_RAND''@/$(GL_UNISTRING_GNULIB_RAND)/g' \
 	      -e 's/@''GNULIB_RANDOM''@/$(GL_UNISTRING_GNULIB_RANDOM)/g' \
 	      -e 's/@''GNULIB_RANDOM_R''@/$(GL_UNISTRING_GNULIB_RANDOM_R)/g' \
 	      -e 's/@''GNULIB_REALLOC_GNU''@/$(GL_UNISTRING_GNULIB_REALLOC_GNU)/g' \
@@ -494,8 +499,9 @@
 	      -e 's/@''GNULIB_MDA_GCVT''@/$(GL_UNISTRING_GNULIB_MDA_GCVT)/g' \
 	      -e 's/@''GNULIB_MDA_MKTEMP''@/$(GL_UNISTRING_GNULIB_MDA_MKTEMP)/g' \
 	      -e 's/@''GNULIB_MDA_PUTENV''@/$(GL_UNISTRING_GNULIB_MDA_PUTENV)/g' \
-	      < $(srcdir)/stdlib.in.h | \
-	  sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
+	      < $(srcdir)/stdlib.in.h > $@-t1
+	$(AM_V_at)sed \
+	      -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
 	      -e 's|@''HAVE_ALIGNED_ALLOC''@|$(HAVE_ALIGNED_ALLOC)|g' \
 	      -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
 	      -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
@@ -503,6 +509,8 @@
 	      -e 's|@''HAVE_DECL_FCVT''@|$(HAVE_DECL_FCVT)|g' \
 	      -e 's|@''HAVE_DECL_GCVT''@|$(HAVE_DECL_GCVT)|g' \
 	      -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
+	      -e 's|@''HAVE_DECL_PROGRAM_INVOCATION_NAME''@|$(HAVE_DECL_PROGRAM_INVOCATION_NAME)|g' \
+	      -e 's|@''HAVE_GETPROGNAME''@|$(HAVE_GETPROGNAME)|g' \
 	      -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
 	      -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \
 	      -e 's|@''HAVE_INITSTATE''@|$(HAVE_INITSTATE)|g' \
@@ -538,21 +546,33 @@
 	      -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
 	      -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
 	      -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \
+	      < $@-t1 > $@-t2
+	$(AM_V_at)sed \
+	      -e 's|@''REPLACE__EXIT''@|$(REPLACE__EXIT)|g' \
 	      -e 's|@''REPLACE_ALIGNED_ALLOC''@|$(REPLACE_ALIGNED_ALLOC)|g' \
 	      -e 's|@''REPLACE_CALLOC_FOR_CALLOC_GNU''@|$(REPLACE_CALLOC_FOR_CALLOC_GNU)|g' \
 	      -e 's|@''REPLACE_CALLOC_FOR_CALLOC_POSIX''@|$(REPLACE_CALLOC_FOR_CALLOC_POSIX)|g' \
 	      -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \
 	      -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \
+	      -e 's|@''REPLACE_GETLOADAVG''@|$(REPLACE_GETLOADAVG)|g' \
+	      -e 's|@''REPLACE_GETPROGNAME''@|$(REPLACE_GETPROGNAME)|g' \
+	      -e 's|@''REPLACE_GETSUBOPT''@|$(REPLACE_GETSUBOPT)|g' \
 	      -e 's|@''REPLACE_INITSTATE''@|$(REPLACE_INITSTATE)|g' \
 	      -e 's|@''REPLACE_MALLOC_FOR_MALLOC_GNU''@|$(REPLACE_MALLOC_FOR_MALLOC_GNU)|g' \
 	      -e 's|@''REPLACE_MALLOC_FOR_MALLOC_POSIX''@|$(REPLACE_MALLOC_FOR_MALLOC_POSIX)|g' \
+	      -e 's|@''REPLACE_MB_CUR_MAX''@|$(REPLACE_MB_CUR_MAX)|g' \
+	      -e 's|@''REPLACE_MBSTOWCS''@|$(REPLACE_MBSTOWCS)|g' \
 	      -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
+	      -e 's|@''REPLACE_MKOSTEMP''@|$(REPLACE_MKOSTEMP)|g' \
+	      -e 's|@''REPLACE_MKOSTEMPS''@|$(REPLACE_MKOSTEMPS)|g' \
 	      -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
 	      -e 's|@''REPLACE_POSIX_MEMALIGN''@|$(REPLACE_POSIX_MEMALIGN)|g' \
+	      -e 's|@''REPLACE_POSIX_OPENPT''@|$(REPLACE_POSIX_OPENPT)|g' \
 	      -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
 	      -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
 	      -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
 	      -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \
+	      -e 's|@''REPLACE_RAND''@|$(REPLACE_RAND)|g' \
 	      -e 's|@''REPLACE_RANDOM''@|$(REPLACE_RANDOM)|g' \
 	      -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \
 	      -e 's|@''REPLACE_REALLOC_FOR_REALLOC_GNU''@|$(REPLACE_REALLOC_FOR_REALLOC_GNU)|g' \
@@ -573,9 +593,10 @@
 	      -e '/definition of _Noreturn/r $(_NORETURN_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      > $@-t
-	$(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += stdlib.h stdlib.h-t
+	      < $@-t2 > $@-t3
+	$(AM_V_at)rm -f $@-t1 $@-t2
+	$(AM_V_at)mv $@-t3 $@
+MOSTLYCLEANFILES += stdlib.h stdlib.h-t1 stdlib.h-t2 stdlib.h-t3
 
 EXTRA_DIST += stdlib.in.h
 
@@ -584,9 +605,7 @@
 ## begin gnulib module striconveh
 
 libunistring_la_SOURCES += striconveh.h striconveh.c
-if GL_COND_LIBTOOL
 libunistring_la_LDFLAGS += $(LTLIBICONV)
-endif
 
 EXTRA_DIST += iconveh.h
 
@@ -632,6 +651,7 @@
 	      -e 's/@''GNULIB_MEMMEM''@/$(GL_UNISTRING_GNULIB_MEMMEM)/g' \
 	      -e 's/@''GNULIB_MEMPCPY''@/$(GL_UNISTRING_GNULIB_MEMPCPY)/g' \
 	      -e 's/@''GNULIB_MEMRCHR''@/$(GL_UNISTRING_GNULIB_MEMRCHR)/g' \
+	      -e 's/@''GNULIB_MEMSET_EXPLICIT''@/$(GL_UNISTRING_GNULIB_MEMSET_EXPLICIT)/g' \
 	      -e 's/@''GNULIB_RAWMEMCHR''@/$(GL_UNISTRING_GNULIB_RAWMEMCHR)/g' \
 	      -e 's/@''GNULIB_STPCPY''@/$(GL_UNISTRING_GNULIB_STPCPY)/g' \
 	      -e 's/@''GNULIB_STPNCPY''@/$(GL_UNISTRING_GNULIB_STPNCPY)/g' \
@@ -655,14 +675,16 @@
 	      -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GL_UNISTRING_GNULIB_MDA_MEMCCPY)/g' \
 	      -e 's/@''GNULIB_MDA_STRDUP''@/$(GL_UNISTRING_GNULIB_MDA_STRDUP)/g' \
 	      -e 's/@''GNULIB_FREE_POSIX''@/$(GL_UNISTRING_GNULIB_FREE_POSIX)/g' \
-	      < $(srcdir)/string.in.h | \
-	  sed -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \
+	      < $(srcdir)/string.in.h > $@-t1
+	$(AM_V_at)sed \
+	      -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \
 	      -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \
 	      -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \
 	      -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
 	      -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
 	      -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
 	      -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \
+	      -e 's|@''HAVE_MEMSET_EXPLICIT''@|$(HAVE_MEMSET_EXPLICIT)|g' \
 	      -e 's|@''HAVE_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \
 	      -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \
 	      -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \
@@ -683,7 +705,10 @@
 	      -e 's|@''REPLACE_FFSLL''@|$(REPLACE_FFSLL)|g' \
 	      -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \
 	      -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \
+	      -e 's|@''REPLACE_MEMPCPY''@|$(REPLACE_MEMPCPY)|g' \
+	      -e 's|@''REPLACE_MEMSET_EXPLICIT''@|$(REPLACE_MEMSET_EXPLICIT)|g' \
 	      -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \
+	      -e 's|@''REPLACE_STPCPY''@|$(REPLACE_STPCPY)|g' \
 	      -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \
 	      -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \
 	      -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \
@@ -697,13 +722,15 @@
 	      -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \
 	      -e 's|@''REPLACE_STRERRORNAME_NP''@|$(REPLACE_STRERRORNAME_NP)|g' \
 	      -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \
+	      -e 's|@''REPLACE_STRVERSCMP''@|$(REPLACE_STRVERSCMP)|g' \
 	      -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      > $@-t
-	$(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += string.h string.h-t
+	      < $@-t1 > $@-t2
+	$(AM_V_at)rm -f $@-t1
+	$(AM_V_at)mv $@-t2 $@
+MOSTLYCLEANFILES += string.h string.h-t1 string.h-t2
 
 EXTRA_DIST += string.in.h
 
@@ -793,9 +820,149 @@
 BUILT_SOURCES += $(LIBUNISTRING_UNICTYPE_H)
 
 unictype.h: unictype.in.h
-	$(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unictype.in.h
-	$(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += unictype.h unictype.h-t
+	$(gl_V_at)$(SED_HEADER_STDOUT) \
+	      -e 's|@''HAVE_UNISTRING_WOE32DLL_H''@|$(HAVE_UNISTRING_WOE32DLL_H)|g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE)/g' \
+	      < $(srcdir)/unictype.in.h > $@-t1
+	$(AM_V_at)sed \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE)/g' \
+	      < $@-t1 > $@-t2
+	$(AM_V_at)sed \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE)/g' \
+	      < $@-t2 > $@-t3
+	$(AM_V_at)sed \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE)/g' \
+	      < $@-t3 > $@-t4
+	$(AM_V_at)rm -f $@-t1 $@-t2 $@-t3
+	$(AM_V_at)mv $@-t4 $@
+MOSTLYCLEANFILES += unictype.h unictype.h-t1 unictype.h-t2 unictype.h-t3 unictype.h-t4
 
 EXTRA_DIST += unictype.in.h
 
@@ -823,9 +990,7 @@
 
 ## begin gnulib module unictype/category-none
 
-if LIBUNISTRING_COMPILE_UNICTYPE_CATEGORY_NONE
 libunistring_la_SOURCES += unictype/categ_none.c
-endif
 
 ## end   gnulib module unictype/category-none
 
@@ -893,7 +1058,13 @@
 BUILT_SOURCES += $(LIBUNISTRING_UNINORM_H)
 
 uninorm.h: uninorm.in.h
-	$(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/uninorm.in.h
+	$(gl_V_at)$(SED_HEADER_STDOUT) \
+	      -e 's|@''HAVE_UNISTRING_WOE32DLL_H''@|$(HAVE_UNISTRING_WOE32DLL_H)|g' \
+	      -e 's/@''GNULIB_UNINORM_NFD_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNINORM_NFD_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNINORM_NFC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNINORM_NFC_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNINORM_NFKD_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNINORM_NFKD_DLL_VARIABLE)/g' \
+	      -e 's/@''GNULIB_UNINORM_NFKC_DLL_VARIABLE''@/$(GL_UNISTRING_GNULIB_UNINORM_NFKC_DLL_VARIABLE)/g' \
+	      $(srcdir)/uninorm.in.h > $@-t
 	$(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += uninorm.h uninorm.h-t
 
@@ -1013,6 +1184,8 @@
 	      -e 's/@''GNULIB_FDATASYNC''@/$(GL_UNISTRING_GNULIB_FDATASYNC)/g' \
 	      -e 's/@''GNULIB_FSYNC''@/$(GL_UNISTRING_GNULIB_FSYNC)/g' \
 	      -e 's/@''GNULIB_FTRUNCATE''@/$(GL_UNISTRING_GNULIB_FTRUNCATE)/g' \
+	      < $(srcdir)/unistd.in.h > $@-t1
+	$(AM_V_at)sed \
 	      -e 's/@''GNULIB_GETCWD''@/$(GL_UNISTRING_GNULIB_GETCWD)/g' \
 	      -e 's/@''GNULIB_GETDOMAINNAME''@/$(GL_UNISTRING_GNULIB_GETDOMAINNAME)/g' \
 	      -e 's/@''GNULIB_GETDTABLESIZE''@/$(GL_UNISTRING_GNULIB_GETDTABLESIZE)/g' \
@@ -1074,8 +1247,9 @@
 	      -e 's/@''GNULIB_MDA_SWAB''@/$(GL_UNISTRING_GNULIB_MDA_SWAB)/g' \
 	      -e 's/@''GNULIB_MDA_UNLINK''@/$(GL_UNISTRING_GNULIB_MDA_UNLINK)/g' \
 	      -e 's/@''GNULIB_MDA_WRITE''@/$(GL_UNISTRING_GNULIB_MDA_WRITE)/g' \
-	      < $(srcdir)/unistd.in.h | \
-	  sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
+	      < $@-t1 > $@-t2
+	$(AM_V_at)sed \
+	      -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
 	      -e 's|@''HAVE_COPY_FILE_RANGE''@|$(HAVE_COPY_FILE_RANGE)|g' \
 	      -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \
 	      -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \
@@ -1122,13 +1296,15 @@
 	      -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
 	      -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
 	      -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
-	  | \
-	  sed -e 's|@''REPLACE_ACCESS''@|$(REPLACE_ACCESS)|g' \
+	      < $@-t2 > $@-t3
+	$(AM_V_at)sed \
+	      -e 's|@''REPLACE_ACCESS''@|$(REPLACE_ACCESS)|g' \
 	      -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
 	      -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \
 	      -e 's|@''REPLACE_COPY_FILE_RANGE''@|$(REPLACE_COPY_FILE_RANGE)|g' \
 	      -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \
 	      -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \
+	      -e 's|@''REPLACE_DUP3''@|$(REPLACE_DUP3)|g' \
 	      -e 's|@''REPLACE_EXECL''@|$(REPLACE_EXECL)|g' \
 	      -e 's|@''REPLACE_EXECLE''@|$(REPLACE_EXECLE)|g' \
 	      -e 's|@''REPLACE_EXECLP''@|$(REPLACE_EXECLP)|g' \
@@ -1137,11 +1313,14 @@
 	      -e 's|@''REPLACE_EXECVP''@|$(REPLACE_EXECVP)|g' \
 	      -e 's|@''REPLACE_EXECVPE''@|$(REPLACE_EXECVPE)|g' \
 	      -e 's|@''REPLACE_FACCESSAT''@|$(REPLACE_FACCESSAT)|g' \
+	      -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \
 	      -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \
+	      -e 's|@''REPLACE_FDATASYNC''@|$(REPLACE_FDATASYNC)|g' \
 	      -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \
 	      -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
 	      -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \
 	      -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \
+	      -e 's|@''REPLACE_GETENTROPY''@|$(REPLACE_GETENTROPY)|g' \
 	      -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
 	      -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
 	      -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
@@ -1152,12 +1331,14 @@
 	      -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
 	      -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \
 	      -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
+	      -e 's|@''REPLACE_PIPE2''@|$(REPLACE_PIPE2)|g' \
 	      -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \
 	      -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \
 	      -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \
 	      -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \
 	      -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \
 	      -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \
+	      -e 's|@''REPLACE_SETHOSTNAME''@|$(REPLACE_SETHOSTNAME)|g' \
 	      -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
 	      -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \
 	      -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \
@@ -1173,9 +1354,10 @@
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      > $@-t
-	$(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += unistd.h unistd.h-t
+	      < $@-t3 > $@-t4
+	$(AM_V_at)rm -f $@-t1 $@-t2 $@-t3
+	$(AM_V_at)mv $@-t4 $@
+MOSTLYCLEANFILES += unistd.h unistd.h-t1 unistd.h-t2 unistd.h-t3 unistd.h-t4
 
 EXTRA_DIST += unistd.in.h
 
@@ -1361,6 +1543,7 @@
 	      -e 's/@''GNULIB_BTOWC''@/$(GL_UNISTRING_GNULIB_BTOWC)/g' \
 	      -e 's/@''GNULIB_WCTOB''@/$(GL_UNISTRING_GNULIB_WCTOB)/g' \
 	      -e 's/@''GNULIB_MBSINIT''@/$(GL_UNISTRING_GNULIB_MBSINIT)/g' \
+	      -e 's/@''GNULIB_MBSZERO''@/$(GL_UNISTRING_GNULIB_MBSZERO)/g' \
 	      -e 's/@''GNULIB_MBRTOWC''@/$(GL_UNISTRING_GNULIB_MBRTOWC)/g' \
 	      -e 's/@''GNULIB_MBRLEN''@/$(GL_UNISTRING_GNULIB_MBRLEN)/g' \
 	      -e 's/@''GNULIB_MBSRTOWCS''@/$(GL_UNISTRING_GNULIB_MBSRTOWCS)/g' \
@@ -1399,10 +1582,12 @@
 	      -e 's/@''GNULIB_WCSTOK''@/$(GL_UNISTRING_GNULIB_WCSTOK)/g' \
 	      -e 's/@''GNULIB_WCSWIDTH''@/$(GL_UNISTRING_GNULIB_WCSWIDTH)/g' \
 	      -e 's/@''GNULIB_WCSFTIME''@/$(GL_UNISTRING_GNULIB_WCSFTIME)/g' \
+	      -e 's/@''GNULIB_WGETCWD''@/$(GL_UNISTRING_GNULIB_WGETCWD)/g' \
 	      -e 's/@''GNULIB_MDA_WCSDUP''@/$(GL_UNISTRING_GNULIB_MDA_WCSDUP)/g' \
 	      -e 's/@''GNULIB_FREE_POSIX''@/$(GL_UNISTRING_GNULIB_FREE_POSIX)/g' \
-	      < $(srcdir)/wchar.in.h | \
-	  sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
+	      < $(srcdir)/wchar.in.h > $@-t1
+	$(AM_V_at)sed \
+	      -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
 	      -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
 	      -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
 	      -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \
@@ -1445,8 +1630,9 @@
 	      -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
 	      -e 's|@''HAVE_DECL_WCSDUP''@|$(HAVE_DECL_WCSDUP)|g' \
 	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
-	  | \
-	  sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
+	      < $@-t1 > $@-t2
+	$(AM_V_at)sed \
+	      -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
 	      -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \
 	      -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
 	      -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \
@@ -1461,13 +1647,19 @@
 	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
 	      -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \
 	      -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \
+	      -e 's|@''REPLACE_WCSCMP''@|$(REPLACE_WCSCMP)|g' \
+	      -e 's|@''REPLACE_WCSNCMP''@|$(REPLACE_WCSNCMP)|g' \
+	      -e 's|@''REPLACE_WCSSTR''@|$(REPLACE_WCSSTR)|g' \
 	      -e 's|@''REPLACE_WCSTOK''@|$(REPLACE_WCSTOK)|g' \
+	      -e 's|@''REPLACE_WMEMCMP''@|$(REPLACE_WMEMCMP)|g' \
+	      -e 's|@''REPLACE_WMEMPCPY''@|$(REPLACE_WMEMPCPY)|g' \
 	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      > $@-t
-	$(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += wchar.h wchar.h-t
+	      < $@-t2 > $@-t3
+	$(AM_V_at)rm -f $@-t1 $@-t2
+	$(AM_V_at)mv $@-t3 $@
+MOSTLYCLEANFILES += wchar.h wchar.h-t1 wchar.h-t2 wchar.h-t3
 
 EXTRA_DIST += wchar.in.h

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/iconv.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/iconv.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/iconv.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/iconv.in.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/iconv_close.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/iconv_close.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/iconv_open-aix.gperf -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/iconv_open-aix.gperf Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/iconv_open-hpux.gperf -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/iconv_open-hpux.gperf Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/iconv_open-irix.gperf -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/iconv_open-irix.gperf Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/iconv_open-osf.gperf -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/iconv_open-osf.gperf Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/iconv_open-solaris.gperf -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/iconv_open-solaris.gperf Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/iconv_open-zos.gperf -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/iconv_open-zos.gperf Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/iconv_open.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/iconv_open.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/iconveh.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/iconveh.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/inttypes.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/inttypes.in.h Changed

@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2022 Free Software Foundation, Inc.
+/* Copyright (C) 2006-2024 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Derek Price.
    This file is part of gnulib.
 
@@ -46,6 +46,11 @@
 #if ! defined INTTYPES_H && ! defined _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
 #define INTTYPES_H
 
+/* This file uses GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* Include <stdint.h> or the gnulib replacement.
    But avoid namespace pollution on glibc systems.  */
 #ifndef __GLIBC__
@@ -903,8 +908,21 @@
 #endif
 
 #if @GNULIB_IMAXABS@
-# if !@HAVE_DECL_IMAXABS@
-extern intmax_t imaxabs (intmax_t);
+# if @REPLACE_IMAXABS@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef imaxabs
+#   define imaxabs rpl_imaxabs
+#  endif
+_GL_FUNCDECL_RPL (imaxabs, intmax_t, (intmax_t x));
+_GL_CXXALIAS_RPL (imaxabs, intmax_t, (intmax_t x));
+# else
+#  if !@HAVE_DECL_IMAXABS@
+_GL_FUNCDECL_SYS (imaxabs, intmax_t, (intmax_t x));
+#  endif
+_GL_CXXALIAS_SYS (imaxabs, intmax_t, (intmax_t x));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (imaxabs);
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef imaxabs
@@ -921,8 +939,21 @@
 #   define GNULIB_defined_imaxdiv_t 1
 #  endif
 # endif
-# if !@HAVE_DECL_IMAXDIV@
-extern imaxdiv_t imaxdiv (intmax_t, intmax_t);
+# if @REPLACE_IMAXDIV@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef imaxdiv
+#   define imaxdiv rpl_imaxdiv
+#  endif
+_GL_FUNCDECL_RPL (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom));
+_GL_CXXALIAS_RPL (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom));
+# else
+#  if !@HAVE_DECL_IMAXDIV@
+_GL_FUNCDECL_SYS (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom));
+#  endif
+_GL_CXXALIAS_SYS (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (imaxdiv);
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef imaxdiv

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/libunistring.valgrind -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/libunistring.valgrind Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/limits.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/limits.in.h Changed

@@ -1,6 +1,6 @@
 /* A GNU-like <limits.h>.
 
-   Copyright 2016-2022 Free Software Foundation, Inc.
+   Copyright 2016-2024 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -99,7 +99,12 @@
 # endif
 #endif
 
-/* Macros specified by C2x and by ISO/IEC TS 18661-1:2014.  */
+/* Assume no multibyte character is longer than 16 bytes.  */
+#ifndef MB_LEN_MAX
+# define MB_LEN_MAX 16
+#endif
+
+/* Macros specified by C23 and by ISO/IEC TS 18661-1:2014.  */
 
 #if (! defined ULLONG_WIDTH                                             \
      && (defined _GNU_SOURCE || defined __STDC_WANT_IEC_60559_BFP_EXT__ \
@@ -117,13 +122,28 @@
 # define ULLONG_WIDTH _GL_INTEGER_WIDTH (0, ULLONG_MAX)
 #endif
 
-/* Macros specified by C2x.  */
+/* Macros specified by C23.  */
 
-#if (! defined BOOL_WIDTH \
-     && (defined _GNU_SOURCE \
-         || (defined __STDC_VERSION__ && 201710 < __STDC_VERSION__)))
-# define BOOL_MAX 1
-# define BOOL_WIDTH 1
+#if (defined _GNU_SOURCE \
+     || (defined __STDC_VERSION__ && 201710 < __STDC_VERSION__))
+# if ! defined BOOL_WIDTH
+#  define BOOL_WIDTH 1
+#  define BOOL_MAX 1
+# elif ! defined BOOL_MAX
+#  define BOOL_MAX ((((1U << (BOOL_WIDTH - 1)) - 1) << 1) + 1)
+# endif
+#endif
+
+/* Macro specified by POSIX.  */
+
+/* The maximum ssize_t value.  Although it might not be of ssize_t type
+   as it should be, it's too much trouble to fix this minor detail.  */
+#ifndef SSIZE_MAX
+# ifdef _WIN64
+#  define SSIZE_MAX LLONG_MAX
+# else
+#  define SSIZE_MAX LONG_MAX
+# endif
 #endif
 
 #endif /* _@GUARD_PREFIX@_LIMITS_H */

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/localcharset.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/localcharset.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/localcharset.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/localcharset.h Changed

@@ -1,5 +1,5 @@
 /* Determine a canonical name for the current locale's character encoding.
-   Copyright (C) 2000-2003, 2009-2022 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2009-2024 Free Software Foundation, Inc.
    This file is part of the GNU CHARSET Library.
 
    This file is free software: you can redistribute it and/or modify
@@ -104,10 +104,8 @@
    GBK                         glibc aix osf solaris freebsd darwin cygwin windows dos
    GB18030                     glibc hpux solaris freebsd netbsd darwin
    SHIFT_JIS               Y   hpux osf solaris freebsd netbsd darwin
-   JOHAB                       glibc solaris windows
+   JOHAB                       solaris windows
    TIS-620                     glibc aix hpux osf solaris cygwin zos
-   VISCII                  Y   glibc
-   TCVN5712-1                  glibc
    ARMSCII-8                   glibc freebsd netbsd darwin
    GEORGIAN-PS                 glibc cygwin
    PT154                       glibc netbsd cygwin

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/m4/free.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/m4/free.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/m4/gnulib-cache.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/m4/gnulib-cache.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/m4/gnulib-comp.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/m4/gnulib-comp.m4 Changed

@@ -1,5 +1,5 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2022 Free Software Foundation, Inc.
+# Copyright (C) 2002-2024 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
@@ -206,11 +206,15 @@
   gl_LIBUNISTRING_MODULE(0.9, uniconv/u8-strconv-from-locale)
   gl_LIBUNISTRING_MODULE(0.9, uniconv/u8-strconv-to-enc)
   gl_LIBUNISTRING_MODULE(0.9, uniconv/u8-strconv-to-locale)
-  gl_LIBUNISTRING_LIBHEADER(0.9.11, unictype.h)
+  gl_LIBUNISTRING_LIBHEADER(1.2, unictype.h)
+  gl_UNICTYPE_H
+  gl_UNICTYPE_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
   gl_LIBUNISTRING_MODULE(1.1, unictype/bidiclass-of)
-  gl_LIBUNISTRING_MODULE(1.1, unictype/category-M)
-  gl_LIBUNISTRING_MODULE(0.9.8, unictype/category-none)
+  gl_UNICTYPE_H_REQUIRE_DEFAULTS
+  gl_LIBUNISTRING_MODULE_WITH_VARIABLE(1.1, unictype/category-M)
+  dnl Since _UC_CATEGORY_NONE is not exported from an installed libunistring,
+  dnl don't use gl_LIBUNISTRING_MODULE here.
   AC_REQUIRE(AC_C_INLINE)
   gl_LIBUNISTRING_MODULE(1.1, unictype/category-of)
   AC_REQUIRE(AC_C_INLINE)
@@ -218,19 +222,23 @@
   gl_LIBUNISTRING_MODULE(1.1, unictype/combining-class)
   gl_LIBUNISTRING_MODULE(1.1, unictype/joiningtype-of)
   gl_LIBUNISTRING_MODULE(1.1, unictype/scripts)
-  gl_LIBUNISTRING_LIBHEADER(0.9.11, uninorm.h)
+  gl_LIBUNISTRING_LIBHEADER(1.2, uninorm.h)
+  gl_UNINORM_H
+  gl_UNINORM_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
   gl_LIBUNISTRING_MODULE(1.1, uninorm/canonical-decomposition)
   gl_LIBUNISTRING_MODULE(0.9.11, uninorm/composition)
   AC_REQUIRE(AC_C_INLINE)
-  gl_LIBUNISTRING_MODULE(1.1, uninorm/nfc)
-  gl_LIBUNISTRING_MODULE(1.1, uninorm/nfd)
+  gl_UNINORM_H_REQUIRE_DEFAULTS
+  gl_LIBUNISTRING_MODULE_WITH_VARIABLE(1.1, uninorm/nfc)
+  gl_UNINORM_H_REQUIRE_DEFAULTS
+  gl_LIBUNISTRING_MODULE_WITH_VARIABLE(1.1, uninorm/nfd)
   gl_MODULE_INDICATOR_FOR_TESTS(uninorm/u32-normalize)
   gl_LIBUNISTRING_MODULE(1.1, uninorm/u32-normalize)
   gl_UNISTD_H
   gl_UNISTD_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
-  gl_LIBUNISTRING_LIBHEADER(0.9.11, unistr.h)
+  gl_LIBUNISTRING_LIBHEADER(1.2, unistr.h)
   AC_PROG_MKDIR_P
   gl_LIBUNISTRING_MODULE(0.9, unistr/u32-cmp)
   gl_LIBUNISTRING_MODULE(0.9, unistr/u32-cpy)
@@ -244,7 +252,7 @@
   gl_LIBUNISTRING_MODULE(0.9, unistr/u8-check)
   gl_LIBUNISTRING_MODULE(0.9, unistr/u8-mblen)
   gl_MODULE_INDICATOR(unistr/u8-mbtouc)
-  gl_LIBUNISTRING_MODULE(0.9.4, unistr/u8-mbtouc)
+  gl_LIBUNISTRING_MODULE(1.2, unistr/u8-mbtouc)
   gl_MODULE_INDICATOR(unistr/u8-mbtouc-unsafe)
   gl_LIBUNISTRING_MODULE(0.9.4, unistr/u8-mbtouc-unsafe)
   gl_MODULE_INDICATOR(unistr/u8-mbtoucr)
@@ -570,6 +578,7 @@
   m4/libunistring.m4
   m4/limits-h.m4
   m4/localcharset.m4
+  m4/locale-fr.m4
   m4/multiarch.m4
   m4/off_t.m4
   m4/pid_t.m4
@@ -580,6 +589,8 @@
   m4/stdlib_h.m4
   m4/string_h.m4
   m4/sys_types_h.m4
+  m4/unictype_h.m4
+  m4/uninorm_h.m4
   m4/unistd_h.m4
   m4/warn-on-use.m4
   m4/wchar_h.m4

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/m4/host-cpu-c-abi.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/m4/host-cpu-c-abi.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/m4/iconv.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/m4/iconv.m4 Changed

@@ -1,5 +1,5 @@
-# iconv.m4 serial 26
-dnl Copyright (C) 2000-2002, 2007-2014, 2016-2022 Free Software Foundation,
+# iconv.m4 serial 27
+dnl Copyright (C) 2000-2002, 2007-2014, 2016-2024 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -38,7 +38,7 @@
   dnl because if the user has installed libiconv and not disabled its use
   dnl via --without-libiconv-prefix, he wants to use it. The first
   dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
-  am_save_CPPFLAGS="$CPPFLAGS"
+  gl_saved_CPPFLAGS="$CPPFLAGS"
   AC_LIB_APPENDTOVAR(CPPFLAGS, $INCICONV)
 
   AC_CACHE_CHECK(for iconv, am_cv_func_iconv, 
@@ -55,7 +55,7 @@
            iconv_close(cd);),
       am_cv_func_iconv=yes)
     if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
+      gl_saved_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
       AC_LINK_IFELSE(
         AC_LANG_PROGRAM(
@@ -68,14 +68,14 @@
              iconv_close(cd);),
         am_cv_lib_iconv=yes
         am_cv_func_iconv=yes)
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
     fi
   )
   if test "$am_cv_func_iconv" = yes; then
     AC_CACHE_CHECK(for working iconv, am_cv_func_iconv_works, 
       dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
       dnl Solaris 10.
-      am_save_LIBS="$LIBS"
+      gl_saved_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
@@ -205,7 +205,7 @@
            esac)
         test "$am_cv_func_iconv_works" = no || break
       done
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
     )
     case "$am_cv_func_iconv_works" in
       *no) am_func_iconv=no am_cv_lib_iconv=no ;;
@@ -224,7 +224,7 @@
   else
     dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
     dnl either.
-    CPPFLAGS="$am_save_CPPFLAGS"
+    CPPFLAGS="$gl_saved_CPPFLAGS"
     LIBICONV=
     LTLIBICONV=
   fi

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/m4/iconv_h.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/m4/iconv_h.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/m4/iconv_open.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/m4/iconv_open.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/m4/inttypes.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/m4/inttypes.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/m4/lib-ld.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/m4/lib-ld.m4 Changed

@@ -1,5 +1,5 @@
-# lib-ld.m4 serial 10
-dnl Copyright (C) 1996-2003, 2009-2022 Free Software Foundation, Inc.
+# lib-ld.m4 serial 13
+dnl Copyright (C) 1996-2003, 2009-2024 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.
@@ -29,7 +29,7 @@
 AC_REQUIRE(AC_CANONICAL_HOST)dnl
 
 AC_ARG_WITH(gnu-ld,
-    AS_HELP_STRING(--with-gnu-ld,
+    AS_HELP_STRING(--with-gnu-ld,
         assume the C compiler uses GNU ld default=no),
     test "$withval" = no || with_gnu_ld=yes,
     with_gnu_ld=no)dnl
@@ -67,7 +67,7 @@
     if test "$GCC" = yes; then
       # Check if gcc -print-prog-name=ld gives a path.
       case $host in
-        *-*-mingw*)
+        *-*-mingw* | windows*)
           # gcc leaves a trailing carriage return which upsets mingw
           acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
         *)
@@ -97,9 +97,9 @@
     fi
     if test -n "$ac_prog"; then
       # Search for $ac_prog in $PATH.
-      acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+      acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
       for ac_dir in $PATH; do
-        IFS="$acl_save_ifs"
+        IFS="$acl_saved_IFS"
         test -z "$ac_dir" && ac_dir=.
         if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
           acl_cv_path_LD="$ac_dir/$ac_prog"
@@ -116,7 +116,7 @@
           esac
         fi
       done
-      IFS="$acl_save_ifs"
+      IFS="$acl_saved_IFS"
     fi
     case $host in
       *-*-aix*)

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/m4/lib-link.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/m4/lib-link.m4 Changed

@@ -1,5 +1,5 @@
-# lib-link.m4 serial 33
-dnl Copyright (C) 2001-2022 Free Software Foundation, Inc.
+# lib-link.m4 serial 34
+dnl Copyright (C) 2001-2024 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.
@@ -69,11 +69,11 @@
   dnl Add $INCNAME to CPPFLAGS before performing the following checks,
   dnl because if the user has installed libName and not disabled its use
   dnl via --without-libName-prefix, he wants to use it.
-  ac_save_CPPFLAGS="$CPPFLAGS"
+  acl_saved_CPPFLAGS="$CPPFLAGS"
   AC_LIB_APPENDTOVAR(CPPFLAGS, $INCNAME)
 
   AC_CACHE_CHECK(for lib$1, ac_cv_libName, 
-    ac_save_LIBS="$LIBS"
+    acl_saved_LIBS="$LIBS"
     dnl If $LIBNAME contains some -l options, add it to the end of LIBS,
     dnl because these -l options might require -L options that are present in
     dnl LIBS. -l options benefit only from the -L options listed before it.
@@ -89,7 +89,7 @@
       AC_LANG_PROGRAM($3, $4),
       ac_cv_libName=yes,
       ac_cv_libName='m4_if($5, , no, $5)')
-    LIBS="$ac_save_LIBS"
+    LIBS="$acl_saved_LIBS"
   )
   if test "$ac_cv_libName" = yes; then
     HAVE_LIBNAME=yes
@@ -100,7 +100,7 @@
     HAVE_LIBNAME=no
     dnl If $LIBNAME didn't lead to a usable library, we don't need
     dnl $INCNAME either.
-    CPPFLAGS="$ac_save_CPPFLAGS"
+    CPPFLAGS="$acl_saved_CPPFLAGS"
     LIBNAME=
     LTLIBNAME=
     LIBNAME_PREFIX=
@@ -224,7 +224,7 @@
     additional_libdir3=
   fi
   dnl Search the library and its dependencies in $additional_libdir and
-  dnl $LDFLAGS. Using breadth-first-seach.
+  dnl $LDFLAGS. Use breadth-first search.
   LIBNAME=
   LTLIBNAME=
   INCNAME=
@@ -537,12 +537,12 @@
               dnl Read the .la file. It defines the variables
               dnl dlname, library_names, old_library, dependency_libs, current,
               dnl age, revision, installed, dlopen, dlpreopen, libdir.
-              save_libdir="$libdir"
+              saved_libdir="$libdir"
               case "$found_la" in
                 */* | *\\*) . "$found_la" ;;
                 *) . "./$found_la" ;;
               esac
-              libdir="$save_libdir"
+              libdir="$saved_libdir"
               dnl We use only dependency_libs.
               for dep in $dependency_libs; do
                 case "$dep" in
@@ -682,18 +682,18 @@
         alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
       done
       dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
-      acl_save_libdir="$libdir"
+      acl_saved_libdir="$libdir"
       libdir="$alldirs"
       eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
+      libdir="$acl_saved_libdir"
       LIBNAME="${LIBNAME}${LIBNAME:+ }$flag"
     else
       dnl The -rpath options are cumulative.
       for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
+        acl_saved_libdir="$libdir"
         libdir="$found_dir"
         eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
+        libdir="$acl_saved_libdir"
         LIBNAME="${LIBNAME}${LIBNAME:+ }$flag"
       done
     fi
@@ -790,18 +790,18 @@
             for dir in $rpathdirs; do
               alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
             done
-            acl_save_libdir="$libdir"
+            acl_saved_libdir="$libdir"
             libdir="$alldirs"
             eval flag=\"$acl_hardcode_libdir_flag_spec\"
-            libdir="$acl_save_libdir"
+            libdir="$acl_saved_libdir"
             $1="$flag"
           else
             dnl The -rpath options are cumulative.
             for dir in $rpathdirs; do
-              acl_save_libdir="$libdir"
+              acl_saved_libdir="$libdir"
               libdir="$dir"
               eval flag=\"$acl_hardcode_libdir_flag_spec\"
-              libdir="$acl_save_libdir"
+              libdir="$acl_saved_libdir"
               $1="${$1}${$1:+ }$flag"
             done
           fi

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/m4/lib-prefix.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/m4/lib-prefix.m4 Changed

@@ -1,5 +1,5 @@
-# lib-prefix.m4 serial 20
-dnl Copyright (C) 2001-2005, 2008-2022 Free Software Foundation, Inc.
+# lib-prefix.m4 serial 21
+dnl Copyright (C) 2001-2005, 2008-2024 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.
@@ -126,10 +126,10 @@
   else
     acl_final_exec_prefix="$exec_prefix"
   fi
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
   eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
+  prefix="$acl_saved_prefix"
 )
 
 dnl AC_LIB_WITH_FINAL_PREFIX(statement) evaluates statement, with the
@@ -137,13 +137,13 @@
 dnl at the end of the configure script.
 AC_DEFUN(AC_LIB_WITH_FINAL_PREFIX,
 
-  acl_save_prefix="$prefix"
+  acl_saved_prefix="$prefix"
   prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
+  acl_saved_exec_prefix="$exec_prefix"
   exec_prefix="$acl_final_exec_prefix"
   $1
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
+  exec_prefix="$acl_saved_exec_prefix"
+  prefix="$acl_saved_prefix"
 )
 
 dnl AC_LIB_PREPARE_MULTILIB creates
@@ -280,7 +280,7 @@
            fi
          fi
          if test -n "$searchpath"; then
-           acl_save_IFS="${IFS= 	}"; IFS=":"
+           acl_saved_IFS="${IFS= 	}"; IFS=":"
            for searchdir in $searchpath; do
              if test -d "$searchdir"; then
                case "$searchdir" in
@@ -297,7 +297,7 @@
                esac
              fi
            done
-           IFS="$acl_save_IFS"
+           IFS="$acl_saved_IFS"
            if test $HOST_CPU_C_ABI_32BIT = yes; then
              # 32-bit ABI.
              acl_libdirstem3=

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/m4/libunistring-base.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/m4/libunistring-base.m4 Changed

@@ -1,5 +1,5 @@
-# libunistring-base.m4 serial 7
-dnl Copyright (C) 2010-2022 Free Software Foundation, Inc.
+# libunistring-base.m4 serial 8
+dnl Copyright (C) 2010-2024 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.
@@ -18,6 +18,8 @@
 dnl number each time you make a change that affects the behaviour of the
 dnl functions defined in Module (even if the sources of Module itself do not
 dnl change).
+dnl
+dnl This macro invocation must not occur in macros that are AC_REQUIREd.
 
 AC_DEFUN(gl_LIBUNISTRING_MODULE,
 
@@ -28,6 +30,35 @@
     gl_LIBUNISTRING_VERSION_CMP($1))
 )
 
+dnl gl_LIBUNISTRING_MODULE_WITH_VARIABLE(VERSION, Module)
+dnl is like gl_LIBUNISTRING_MODULE(VERSION, Module), except that it also
+dnl defines an AC_SUBSTed autoconf variable GNULIB_$MODULE_DLL_VARIABLE.
+dnl What's the expansion of this autoconf variable?
+dnl   - When building libunistring, it expands to LIBUNISTRING_DLL_VARIABLE.
+dnl     (This is necessary because this token must be present in the .h files
+dnl     when the .h files get installed.)
+dnl   - When building gnulib or application code it expands to
+dnl       - LIBUNISTRING_DLL_VARIABLE by default,
+dnl       - empty if the automake conditional LIBUNISTRING_COMPILE_$MODULE
+dnl         evaluates to true.
+dnl     (This is necessary because when the conditional evaluates to false,
+dnl     the application code expects to use the declared variable from the
+dnl     installed libunistring; it's in this case that the
+dnl     LIBUNISTRING_DLL_VARIABLE macro from the installed
+dnl     <unistring/woe32dll.h> must be used.)
+dnl
+dnl This macro invocation must not occur in macros that are AC_REQUIREd.
+
+AC_DEFUN(gl_LIBUNISTRING_MODULE_WITH_VARIABLE,
+
+  gl_LIBUNISTRING_MODULE($1, $2)
+  m4_ifndef(gl_IN_LIBUNISTRING,
+    if test -z "${AS_TR_CPP(LIBUNISTRING_COMPILE_$2)_TRUE}"; then
+       GL_MODULE_INDICATOR_PREFIX_GNULIB_AS_TR_CPP($2_DLL_VARIABLE)=
+     fi
+    )
+)
+
 dnl gl_LIBUNISTRING_LIBHEADER(VERSION, HeaderFile)
 dnl Declares that HeaderFile should be created, unless we are linking
 dnl with libunistring and its version is >= the given VERSION.
@@ -95,6 +126,26 @@
     LIBUNISTRING_VERSION_MINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_minor"`
     LIBUNISTRING_VERSION_SUBMINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_subminor"`
   fi
+
+  dnl Determine whether <unistring/woe32dll.h> from an installed libunistring
+  dnl is available.
+  m4_ifdef(gl_IN_LIBUNISTRING,
+    dnl In libunistring, all .h files that declare variables need to
+     dnl #include <unistring/woe32dll.h>.  This references the file
+     dnl unistring/woe32dll.h in libunistring.
+     HAVE_UNISTRING_WOE32DLL_H=1
+    ,
+    dnl In gnulib or in applications, we need a #include <unistring/woe32dll.h>
+     dnl if and only if an installed libunistring is available.
+     if test "$HAVE_LIBUNISTRING" = yes; then
+       AC_CHECK_HEADERS(unistring/woe32dll.h,
+         HAVE_UNISTRING_WOE32DLL_H=1,
+         HAVE_UNISTRING_WOE32DLL_H=0)
+     else
+       HAVE_UNISTRING_WOE32DLL_H=0
+     fi
+    )
+  AC_SUBST(HAVE_UNISTRING_WOE32DLL_H)
 )
 
 dnl gl_LIBUNISTRING_VERSION_CMP(VERSION)

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/m4/libunistring-optional.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/m4/libunistring-optional.m4 Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/m4/libunistring.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/m4/libunistring.m4 Changed

@@ -1,5 +1,5 @@
-# libunistring.m4 serial 12
-dnl Copyright (C) 2009-2022 Free Software Foundation, Inc.
+# libunistring.m4 serial 13
+dnl Copyright (C) 2009-2024 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.
@@ -73,7 +73,7 @@
       dnl We have to erase the cached result of the first AC_LIB_HAVE_LINKFLAGS
       dnl invocation, otherwise the second one will not be run.
       unset ac_cv_libunistring
-      glus_save_LIBS="$LIBS"
+      glus_saved_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
       AC_LIB_HAVE_LINKFLAGS(unistring, ,
         #include <uniconv.h>, u8_strconv_from_locale((char*)0);,
@@ -82,7 +82,7 @@
         LIBUNISTRING="$LIBUNISTRING $LIBICONV"
         LTLIBUNISTRING="$LTLIBUNISTRING $LTLIBICONV"
       fi
-      LIBS="$glus_save_LIBS"
+      LIBS="$glus_saved_LIBS"
     fi
   else
     AC_LIB_HAVE_LINKFLAGS(unistring, ,

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/m4/localcharset.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/m4/localcharset.m4 Changed

_service:tar_scm:libidn2-2.3.7.tar.gz/unistring/m4/unictype_h.m4 Added

@@ -0,0 +1,172 @@
+# unictype_h.m4 serial 1
+dnl Copyright (C) 2023-2024 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_ONCE(gl_UNICTYPE_H,
+
+  dnl Ensure to expand the default settings once only, before all statements
+  dnl that occur in other macros.
+  AC_REQUIRE(gl_UNICTYPE_H_DEFAULTS)
+)
+
+# gl_UNICTYPE_MODULE_INDICATOR(modulename)
+# sets the shell variable that indicates the presence of the given module
+# to a C preprocessor expression that will evaluate to 1.
+# This macro invocation must not occur in macros that are AC_REQUIREd.
+AC_DEFUN(gl_UNICTYPE_MODULE_INDICATOR,
+
+  dnl Ensure to expand the default settings once only.
+  gl_UNICTYPE_H_REQUIRE_DEFAULTS
+  gl_MODULE_INDICATOR_SET_VARIABLE($1)
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS($1)
+)
+
+# Initializes the default values for AC_SUBSTed shell variables.
+# This macro must not be AC_REQUIREd.  It must only be invoked, and only
+# outside of macros or in macros that are not AC_REQUIREd.
+AC_DEFUN(gl_UNICTYPE_H_REQUIRE_DEFAULTS,
+
+  m4_defun(GL_MODULE_INDICATOR_PREFIX_UNICTYPE_H_MODULE_INDICATOR_DEFAULTS, 
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+  )
+  m4_require(GL_MODULE_INDICATOR_PREFIX_UNICTYPE_H_MODULE_INDICATOR_DEFAULTS)
+  AC_REQUIRE(gl_UNICTYPE_H_DEFAULTS)
+)
+
+AC_DEFUN(gl_UNICTYPE_H_DEFAULTS,
+
+  dnl Assume proper GNU behavior unless another module says otherwise.
+)

_service:tar_scm:libidn2-2.3.7.tar.gz/unistring/m4/uninorm_h.m4 Added

@@ -0,0 +1,45 @@
+# uninorm_h.m4 serial 1
+dnl Copyright (C) 2023-2024 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_ONCE(gl_UNINORM_H,
+
+  dnl Ensure to expand the default settings once only, before all statements
+  dnl that occur in other macros.
+  AC_REQUIRE(gl_UNINORM_H_DEFAULTS)
+)
+
+# gl_UNINORM_MODULE_INDICATOR(modulename)
+# sets the shell variable that indicates the presence of the given module
+# to a C preprocessor expression that will evaluate to 1.
+# This macro invocation must not occur in macros that are AC_REQUIREd.
+AC_DEFUN(gl_UNINORM_MODULE_INDICATOR,
+
+  dnl Ensure to expand the default settings once only.
+  gl_UNINORM_H_REQUIRE_DEFAULTS
+  gl_MODULE_INDICATOR_SET_VARIABLE($1)
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS($1)
+)
+
+# Initializes the default values for AC_SUBSTed shell variables.
+# This macro must not be AC_REQUIREd.  It must only be invoked, and only
+# outside of macros or in macros that are not AC_REQUIREd.
+AC_DEFUN(gl_UNINORM_H_REQUIRE_DEFAULTS,
+
+  m4_defun(GL_MODULE_INDICATOR_PREFIX_UNINORM_H_MODULE_INDICATOR_DEFAULTS, 
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNINORM_NFD_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNINORM_NFC_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNINORM_NFKD_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_UNINORM_NFKC_DLL_VARIABLE, 'LIBUNISTRING_DLL_VARIABLE')
+  )
+  m4_require(GL_MODULE_INDICATOR_PREFIX_UNINORM_H_MODULE_INDICATOR_DEFAULTS)
+  AC_REQUIRE(gl_UNINORM_H_DEFAULTS)
+)
+
+AC_DEFUN(gl_UNINORM_H_DEFAULTS,
+
+  dnl Assume proper GNU behavior unless another module says otherwise.
+)

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/m4/wchar_h.m4 -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/m4/wchar_h.m4 Changed

@@ -1,13 +1,13 @@
 dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
 
-dnl Copyright (C) 2007-2022 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2024 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_h.m4 serial 55
+# wchar_h.m4 serial 63
 
 AC_DEFUN_ONCE(gl_WCHAR_H,
 
@@ -86,8 +86,8 @@
          dnl z/OS when using the XPLINK object format (due to duplicate
          dnl CSECT names). Instead, temporarily redefine $ac_compile so
          dnl that the object file has the latter name from the start.
-         save_ac_compile="$ac_compile"
-         ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/`
+         saved_ac_compile="$ac_compile"
+         ac_compile=`echo "$saved_ac_compile" | sed s/conftest/conftest1/`
          if echo '#include "conftest.c"' >conftest1.c \
             && AC_TRY_EVAL(ac_compile); then
            AC_LANG_CONFTEST(
@@ -97,7 +97,7 @@
                int zero (void) { return 0; }
              ))
            dnl See note above about renaming object files.
-           ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/`
+           ac_compile=`echo "$saved_ac_compile" | sed s/conftest/conftest2/`
            if echo '#include "conftest.c"' >conftest2.c \
               && AC_TRY_EVAL(ac_compile); then
              if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then
@@ -107,7 +107,7 @@
              fi
            fi
          fi
-         ac_compile="$save_ac_compile"
+         ac_compile="$saved_ac_compile"
          rm -f conftest12.c conftest12.$ac_objext conftest$ac_exeext
          ;;
      esac
@@ -147,6 +147,7 @@
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_BTOWC)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_WCTOB)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_MBSINIT)
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_MBSZERO)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_MBRTOWC)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_MBRLEN)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_MBSRTOWCS)
@@ -185,6 +186,7 @@
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_WCSTOK)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_WCSWIDTH)
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_WCSFTIME)
+    gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_WGETCWD)
     dnl Support Microsoft deprecated alias function names by default.
     gl_MODULE_INDICATOR_INIT_VARIABLE(GNULIB_MDA_WCSDUP, 1)
   )
@@ -253,5 +255,10 @@
   REPLACE_WCWIDTH=0;    AC_SUBST(REPLACE_WCWIDTH)
   REPLACE_WCSWIDTH=0;   AC_SUBST(REPLACE_WCSWIDTH)
   REPLACE_WCSFTIME=0;   AC_SUBST(REPLACE_WCSFTIME)
+  REPLACE_WCSCMP=0;     AC_SUBST(REPLACE_WCSCMP)
+  REPLACE_WCSNCMP=0;    AC_SUBST(REPLACE_WCSNCMP)
+  REPLACE_WCSSTR=0;     AC_SUBST(REPLACE_WCSSTR)
   REPLACE_WCSTOK=0;     AC_SUBST(REPLACE_WCSTOK)
+  REPLACE_WMEMCMP=0;    AC_SUBST(REPLACE_WMEMCMP)
+  REPLACE_WMEMPCPY=0;   AC_SUBST(REPLACE_WMEMPCPY)
 )

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/stddef.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/stddef.in.h Changed

@@ -1,6 +1,6 @@
 /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
 
-   Copyright (C) 2009-2022 Free Software Foundation, Inc.
+   Copyright (C) 2009-2024 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -18,7 +18,7 @@
 /* Written by Eric Blake.  */
 
 /*
- * POSIX 2008 <stddef.h> for platforms that have issues.
+ * POSIX 2008 and ISO C 23 <stddef.h> for platforms that have issues.
  * <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/stddef.h.html>
  */
 
@@ -37,9 +37,9 @@
    remember if special invocation has ever been used to obtain wint_t,
    in which case we need to clean up NULL yet again.  */
 
-# if !(defined _@GUARD_PREFIX@_STDDEF_H && defined _GL_STDDEF_WINT_T)
+# if !(defined _@GUARD_PREFIX@_STDDEF_H && defined _@GUARD_PREFIX@_STDDEF_WINT_T)
 #  ifdef __need_wint_t
-#   define _GL_STDDEF_WINT_T
+#   define _@GUARD_PREFIX@_STDDEF_WINT_T
 #  endif
 #  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
    /* On TinyCC, make sure that the macros that indicate the special invocation
@@ -58,7 +58,7 @@
 
 /* On AIX 7.2, with xlc in 64-bit mode, <stddef.h> defines max_align_t to a
    type with alignment 4, but 'long' has alignment 8.  */
-#  if defined _AIX && defined __LP64__
+#  if defined _AIX && defined __LP64__ && !@HAVE_MAX_ALIGN_T@
 #   if !GNULIB_defined_max_align_t
 #    ifdef _MAX_ALIGN_T
 /* /usr/include/stddef.h has already defined max_align_t.  Override it.  */
@@ -69,6 +69,7 @@
 typedef long max_align_t;
 #     define _MAX_ALIGN_T
 #    endif
+#    define __CLANG_MAX_ALIGN_T_DEFINED
 #    define GNULIB_defined_max_align_t 1
 #   endif
 #  endif
@@ -79,7 +80,7 @@
 
 /* On NetBSD 5.0, the definition of NULL lacks proper parentheses.  */
 #  if (@REPLACE_NULL@ \
-       && (!defined _@GUARD_PREFIX@_STDDEF_H || defined _GL_STDDEF_WINT_T))
+       && (!defined _@GUARD_PREFIX@_STDDEF_H || defined _@GUARD_PREFIX@_STDDEF_WINT_T))
 #   undef NULL
 #   ifdef __cplusplus
    /* ISO C++ says that the macro NULL must expand to an integer constant
@@ -100,6 +101,33 @@
 #  ifndef _@GUARD_PREFIX@_STDDEF_H
 #   define _@GUARD_PREFIX@_STDDEF_H
 
+/* This file uses _Noreturn, _GL_ATTRIBUTE_NOTHROW.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
+/* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions.
+ */
+#ifndef _GL_ATTRIBUTE_NOTHROW
+# if defined __cplusplus
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major >= 4
+#   if __cplusplus >= 201103L
+#    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
+#   else
+#    define _GL_ATTRIBUTE_NOTHROW throw ()
+#   endif
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# else
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__
+#   define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__))
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# endif
+#endif
+
 /* Some platforms lack wchar_t.  */
 #if !@HAVE_WCHAR_T@
 # define wchar_t int
@@ -137,11 +165,49 @@
   long int __i _GL_STDDEF_ALIGNAS (long int);
 } rpl_max_align_t;
 #   define max_align_t rpl_max_align_t
+#   define __CLANG_MAX_ALIGN_T_DEFINED
 #   define GNULIB_defined_max_align_t 1
 #  endif
 # endif
 #endif
 
+/* ISO C 23 § 7.21.1 The unreachable macro  */
+#ifndef unreachable
+
+/* Code borrowed from verify.h.  */
+# ifndef _GL_HAS_BUILTIN_UNREACHABLE
+#  if defined __clang_major__ && __clang_major__ < 5
+#   define _GL_HAS_BUILTIN_UNREACHABLE 0
+#  elif 4 < __GNUC__ + (5 <= __GNUC_MINOR__)
+#   define _GL_HAS_BUILTIN_UNREACHABLE 1
+#  elif defined __has_builtin
+#   define _GL_HAS_BUILTIN_UNREACHABLE __has_builtin (__builtin_unreachable)
+#  else
+#   define _GL_HAS_BUILTIN_UNREACHABLE 0
+#  endif
+# endif
+
+# if _GL_HAS_BUILTIN_UNREACHABLE
+#  define unreachable() __builtin_unreachable ()
+# elif 1200 <= _MSC_VER
+#  define unreachable() __assume (0)
+# else
+/* Declare abort(), without including <stdlib.h>.  */
+extern
+#  if defined __cplusplus
+"C"
+#  endif
+_Noreturn
+void abort (void)
+#  if defined __cplusplus && (__GLIBC__ >= 2)
+_GL_ATTRIBUTE_NOTHROW
+#  endif
+;
+#  define unreachable() abort ()
+# endif
+
+#endif
+
 #  endif /* _@GUARD_PREFIX@_STDDEF_H */
 # endif /* _@GUARD_PREFIX@_STDDEF_H */
 #endif /* __need_XXX */

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/stdint.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/stdint.in.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/stdlib.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/stdlib.in.h Changed

@@ -1,6 +1,6 @@
 /* A GNU-like <stdlib.h>.
 
-   Copyright (C) 1995, 2001-2004, 2006-2022 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2004, 2006-2024 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -37,6 +37,13 @@
 #ifndef _@GUARD_PREFIX@_STDLIB_H
 #define _@GUARD_PREFIX@_STDLIB_H
 
+/* This file uses _Noreturn, _GL_ATTRIBUTE_DEALLOC, _GL_ATTRIBUTE_MALLOC,
+   _GL_ATTRIBUTE_NOTHROW, _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK,
+   HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* NetBSD 5.0 mis-defines NULL.  */
 #include <stddef.h>
 
@@ -67,9 +74,7 @@
 #  include <random.h>
 # endif
 
-# if !@HAVE_STRUCT_RANDOM_DATA@ || @REPLACE_RANDOM_R@ || !@HAVE_RANDOM_R@
-#  include <stdint.h>
-# endif
+# include <stdint.h>
 
 # if !@HAVE_STRUCT_RANDOM_DATA@
 /* Define 'struct random_data'.
@@ -128,6 +133,28 @@
 # endif
 #endif
 
+/* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions.
+ */
+#ifndef _GL_ATTRIBUTE_NOTHROW
+# if defined __cplusplus
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major >= 4
+#   if __cplusplus >= 201103L
+#    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
+#   else
+#    define _GL_ATTRIBUTE_NOTHROW throw ()
+#   endif
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# else
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__
+#   define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__))
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# endif
+#endif
+
 /* The __attribute__ feature is available in gcc versions 2.5 and later.
    The attribute __pure__ was added in gcc 2.96.  */
 #ifndef _GL_ATTRIBUTE_PURE
@@ -164,11 +191,22 @@
 #if @GNULIB__EXIT@
 /* Terminate the current process with the given return code, without running
    the 'atexit' handlers.  */
-# if !@HAVE__EXIT@
+# if @REPLACE__EXIT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef _Exit
+#   define _Exit rpl__Exit
+#  endif
+_GL_FUNCDECL_RPL (_Exit, _Noreturn void, (int status));
+_GL_CXXALIAS_RPL (_Exit, void, (int status));
+# else
+#  if !@HAVE__EXIT@
 _GL_FUNCDECL_SYS (_Exit, _Noreturn void, (int status));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (_Exit, void, (int status));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (_Exit);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef _Exit
 # if HAVE_RAW_DECL__EXIT
@@ -185,7 +223,7 @@
 #   define free rpl_free
 #  endif
 #  if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
-_GL_FUNCDECL_RPL (free, void, (void *ptr) throw ());
+_GL_FUNCDECL_RPL (free, void, (void *ptr) _GL_ATTRIBUTE_NOTHROW);
 #  else
 _GL_FUNCDECL_RPL (free, void, (void *ptr));
 #  endif
@@ -219,9 +257,16 @@
 #  if @HAVE_ALIGNED_ALLOC@
 #   if __GNUC__ >= 11
 /* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free.  */
+#    if __GLIBC__ + (__GLIBC_MINOR__ >= 16) > 2
 _GL_FUNCDECL_SYS (aligned_alloc, void *,
                   (size_t alignment, size_t size)
+                  _GL_ATTRIBUTE_NOTHROW
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#    else
+_GL_FUNCDECL_SYS (aligned_alloc, void *,
+                  (size_t alignment, size_t size)
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#    endif
 #   endif
 _GL_CXXALIAS_SYS (aligned_alloc, void *, (size_t alignment, size_t size));
 #  endif
@@ -232,9 +277,16 @@
 #else
 # if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined aligned_alloc
 /* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free.  */
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 16) > 2
+_GL_FUNCDECL_SYS (aligned_alloc, void *,
+                  (size_t alignment, size_t size)
+                  _GL_ATTRIBUTE_NOTHROW
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  else
 _GL_FUNCDECL_SYS (aligned_alloc, void *,
                   (size_t alignment, size_t size)
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef aligned_alloc
@@ -277,9 +329,16 @@
 # else
 #  if __GNUC__ >= 11
 /* For -Wmismatched-dealloc: Associate calloc with free or rpl_free.  */
+#   if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2
+_GL_FUNCDECL_SYS (calloc, void *,
+                  (size_t nmemb, size_t size)
+                  _GL_ATTRIBUTE_NOTHROW
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   else
 _GL_FUNCDECL_SYS (calloc, void *,
                   (size_t nmemb, size_t size)
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   endif
 #  endif
 _GL_CXXALIAS_SYS (calloc, void *, (size_t nmemb, size_t size));
 # endif
@@ -289,9 +348,16 @@
 #else
 # if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined calloc
 /* For -Wmismatched-dealloc: Associate calloc with free or rpl_free.  */
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2
+_GL_FUNCDECL_SYS (calloc, void *,
+                  (size_t nmemb, size_t size)
+                  _GL_ATTRIBUTE_NOTHROW
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  else
 _GL_FUNCDECL_SYS (calloc, void *,
                   (size_t nmemb, size_t size)
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef calloc
@@ -313,10 +379,18 @@
 _GL_CXXALIAS_RPL (canonicalize_file_name, char *, (const char *name));
 # else
 #  if !@HAVE_CANONICALIZE_FILE_NAME@ || __GNUC__ >= 11
+#   if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+_GL_FUNCDECL_SYS (canonicalize_file_name, char *,
+                  (const char *name)
+                  _GL_ATTRIBUTE_NOTHROW
+                  _GL_ARG_NONNULL ((1))
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   else
 _GL_FUNCDECL_SYS (canonicalize_file_name, char *,
                   (const char *name)
                   _GL_ARG_NONNULL ((1))
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   endif
 #  endif
 _GL_CXXALIAS_SYS (canonicalize_file_name, char *, (const char *name));
 # endif
@@ -329,10 +403,18 @@
 # if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined canonicalize_file_name
 /* For -Wmismatched-dealloc: Associate canonicalize_file_name with free or
    rpl_free.  */
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+_GL_FUNCDECL_SYS (canonicalize_file_name, char *,
+                  (const char *name)
+                  _GL_ATTRIBUTE_NOTHROW
+                  _GL_ARG_NONNULL ((1))
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  else
 _GL_FUNCDECL_SYS (canonicalize_file_name, char *,
                   (const char *name)
                   _GL_ARG_NONNULL ((1))
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef canonicalize_file_name
@@ -416,12 +498,24 @@
    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.  */
-# if !@HAVE_DECL_GETLOADAVG@
+# if @REPLACE_GETLOADAVG@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getloadavg
+#   define getloadavg rpl_getloadavg
+#  endif
+_GL_FUNCDECL_RPL (getloadavg, int, (double loadavg, int nelem)
+                                   _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (getloadavg, int, (double loadavg, int nelem));
+# else
+#  if !@HAVE_DECL_GETLOADAVG@
 _GL_FUNCDECL_SYS (getloadavg, int, (double loadavg, int nelem)
                                    _GL_ARG_NONNULL ((1)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (getloadavg, int, (double loadavg, int nelem));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (getloadavg);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef getloadavg
 # if HAVE_RAW_DECL_GETLOADAVG
@@ -430,6 +524,41 @@
 # endif
 #endif
 
+#if @GNULIB_GETPROGNAME@
+/* Return the base name of the executing program.
+   On native Windows this will usually end in ".exe" or ".EXE". */
+# if @REPLACE_GETPROGNAME@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getprogname
+#   define getprogname rpl_getprogname
+#  endif
+#  if @HAVE_DECL_PROGRAM_INVOCATION_NAME@
+_GL_FUNCDECL_RPL (getprogname, const char *, (void) _GL_ATTRIBUTE_PURE);
+#  else
+_GL_FUNCDECL_RPL (getprogname, const char *, (void));
+#  endif
+_GL_CXXALIAS_RPL (getprogname, const char *, (void));
+# else
+#  if !@HAVE_GETPROGNAME@
+#   if @HAVE_DECL_PROGRAM_INVOCATION_NAME@
+_GL_FUNCDECL_SYS (getprogname, const char *, (void) _GL_ATTRIBUTE_PURE);
+#   else
+_GL_FUNCDECL_SYS (getprogname, const char *, (void));
+#   endif
+#  endif
+_GL_CXXALIAS_SYS (getprogname, const char *, (void));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (getprogname);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef getprogname
+# if HAVE_RAW_DECL_GETPROGNAME
+_GL_WARN_ON_USE (getprogname, "getprogname is unportable - "
+                 "use gnulib module getprogname for portability");
+# endif
+#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.
@@ -442,14 +571,28 @@
    Otherwise it returns -1, and *OPTIONP and *VALUEP are undefined.
    For more details see the POSIX specification.
    https://pubs.opengroup.org/onlinepubs/9699919799/functions/getsubopt.html */
-# if !@HAVE_GETSUBOPT@
+# if @REPLACE_GETSUBOPT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getsubopt
+#   define getsubopt rpl_getsubopt
+#  endif
+_GL_FUNCDECL_RPL (getsubopt, int,
+                  (char **optionp, char *const *tokens, char **valuep)
+                  _GL_ARG_NONNULL ((1, 2, 3)));
+_GL_CXXALIAS_RPL (getsubopt, int,
+                  (char **optionp, char *const *tokens, char **valuep));
+# else
+#  if !@HAVE_GETSUBOPT@
 _GL_FUNCDECL_SYS (getsubopt, int,
                   (char **optionp, char *const *tokens, char **valuep)
                   _GL_ARG_NONNULL ((1, 2, 3)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (getsubopt, int,
                   (char **optionp, char *const *tokens, char **valuep));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (getsubopt);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef getsubopt
 # if HAVE_RAW_DECL_GETSUBOPT
@@ -493,9 +636,16 @@
 # else
 #  if __GNUC__ >= 11
 /* For -Wmismatched-dealloc: Associate malloc with free or rpl_free.  */
+#   if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2
 _GL_FUNCDECL_SYS (malloc, void *,
                   (size_t size)
+                  _GL_ATTRIBUTE_NOTHROW
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   else
+_GL_FUNCDECL_SYS (malloc, void *,
+                  (size_t size)
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   endif
 #  endif
 _GL_CXXALIAS_SYS (malloc, void *, (size_t size));
 # endif
@@ -505,9 +655,16 @@
 #else
 # if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined malloc
 /* For -Wmismatched-dealloc: Associate malloc with free or rpl_free.  */
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2
 _GL_FUNCDECL_SYS (malloc, void *,
                   (size_t size)
+                  _GL_ATTRIBUTE_NOTHROW
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  else
+_GL_FUNCDECL_SYS (malloc, void *,
+                  (size_t size)
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC
 #  undef malloc
@@ -517,6 +674,51 @@
 # endif
 #endif
 
+/* Return maximum number of bytes of a multibyte character.  */
+#if @REPLACE_MB_CUR_MAX@
+# if !GNULIB_defined_MB_CUR_MAX
+static inline
+int gl_MB_CUR_MAX (void)
+{
+  /* Turn the value 3 to the value 4, as needed for the UTF-8 encoding.  */
+  return MB_CUR_MAX + (MB_CUR_MAX == 3);
+}
+#  undef MB_CUR_MAX
+#  define MB_CUR_MAX gl_MB_CUR_MAX ()
+#  define GNULIB_defined_MB_CUR_MAX 1
+# endif
+#endif
+
+/* Convert a string to a wide string.  */
+#if @GNULIB_MBSTOWCS@
+# if @REPLACE_MBSTOWCS@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mbstowcs
+#   define mbstowcs rpl_mbstowcs
+#  endif
+_GL_FUNCDECL_RPL (mbstowcs, size_t,
+                  (wchar_t *restrict dest, const char *restrict src,
+                   size_t len)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (mbstowcs, size_t,
+                  (wchar_t *restrict dest, const char *restrict src,
+                   size_t len));
+# else
+_GL_CXXALIAS_SYS (mbstowcs, size_t,
+                  (wchar_t *restrict dest, const char *restrict src,
+                   size_t len));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (mbstowcs);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef mbstowcs
+# if HAVE_RAW_DECL_MBSTOWCS
+_GL_WARN_ON_USE (mbstowcs, "mbstowcs is unportable - "
+                 "use gnulib module mbstowcs for portability");
+# endif
+#endif
+
 /* Convert a multibyte character to a wide character.  */
 #if @GNULIB_MBTOWC@
 # if @REPLACE_MBTOWC@
@@ -579,12 +781,24 @@
    implementation.
    Returns the open file descriptor if successful, otherwise -1 and errno
    set.  */
-# if !@HAVE_MKOSTEMP@
+# if @REPLACE_MKOSTEMP@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mkostemp
+#   define mkostemp rpl_mkostemp
+#  endif
+_GL_FUNCDECL_RPL (mkostemp, int, (char * /*template*/, int /*flags*/)
+                                 _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (mkostemp, int, (char * /*template*/, int /*flags*/));
+# else
+#  if !@HAVE_MKOSTEMP@
 _GL_FUNCDECL_SYS (mkostemp, int, (char * /*template*/, int /*flags*/)
                                  _GL_ARG_NONNULL ((1)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (mkostemp, int, (char * /*template*/, int /*flags*/));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (mkostemp);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef mkostemp
 # if HAVE_RAW_DECL_MKOSTEMP
@@ -607,14 +821,28 @@
    implementation.
    Returns the open file descriptor if successful, otherwise -1 and errno
    set.  */
-# if !@HAVE_MKOSTEMPS@
+# if @REPLACE_MKOSTEMPS@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mkostemps
+#   define mkostemps rpl_mkostemps
+#  endif
+_GL_FUNCDECL_RPL (mkostemps, int,
+                  (char * /*template*/, int /*suffixlen*/, int /*flags*/)
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (mkostemps, int,
+                  (char * /*template*/, int /*suffixlen*/, int /*flags*/));
+# else
+#  if !@HAVE_MKOSTEMPS@
 _GL_FUNCDECL_SYS (mkostemps, int,
                   (char * /*template*/, int /*suffixlen*/, int /*flags*/)
                   _GL_ARG_NONNULL ((1)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (mkostemps, int,
                   (char * /*template*/, int /*suffixlen*/, int /*flags*/));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (mkostemps);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef mkostemps
 # if HAVE_RAW_DECL_MKOSTEMPS
@@ -713,7 +941,7 @@
                   (void **memptr, size_t alignment, size_t size));
 #  endif
 # endif
-# if @HAVE_POSIX_MEMALIGN@
+# if __GLIBC__ >= 2 && @HAVE_POSIX_MEMALIGN@
 _GL_CXXALIASWARN (posix_memalign);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -727,11 +955,22 @@
 #if @GNULIB_POSIX_OPENPT@
 /* Return an FD open to the master side of a pseudo-terminal.  Flags should
    include O_RDWR, and may also include O_NOCTTY.  */
-# if !@HAVE_POSIX_OPENPT@
+# if @REPLACE_POSIX_OPENPT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef posix_openpt
+#   define posix_openpt rpl_posix_openpt
+#  endif
+_GL_FUNCDECL_RPL (posix_openpt, int, (int flags));
+_GL_CXXALIAS_RPL (posix_openpt, int, (int flags));
+# else
+#  if !@HAVE_POSIX_OPENPT@
 _GL_FUNCDECL_SYS (posix_openpt, int, (int flags));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (posix_openpt, int, (int flags));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (posix_openpt);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef posix_openpt
 # if HAVE_RAW_DECL_POSIX_OPENPT
@@ -808,6 +1047,10 @@
 #   define putenv _putenv
 #  endif
 _GL_CXXALIAS_MDA (putenv, int, (char *string));
+# elif defined __KLIBC__
+/* Need to cast, because on OS/2 kLIBC, the first parameter is
+                                     const char *string.  */
+_GL_CXXALIAS_SYS_CAST (putenv, int, (char *string));
 # else
 _GL_CXXALIAS_SYS (putenv, int, (char *string));
 # endif
@@ -824,6 +1067,10 @@
 /* Need to cast, because on mingw, the parameter is either
    'const char *string' or 'char *string'.  */
 _GL_CXXALIAS_MDA_CAST (putenv, int, (char *string));
+# elif defined __KLIBC__
+/* Need to cast, because on OS/2 kLIBC, the first parameter is
+                                     const char *string.  */
+_GL_CXXALIAS_SYS_CAST (putenv, int, (char *string));
 # else
 _GL_CXXALIAS_SYS (putenv, int, (char *string));
 # endif
@@ -865,7 +1112,9 @@
                                   _gl_qsort_r_compar_fn compare,
                                   void *arg));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (qsort_r);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef qsort_r
 # if HAVE_RAW_DECL_QSORT_R
@@ -875,11 +1124,26 @@
 #endif
 
 
-#if @GNULIB_RANDOM_R@
-# if !@HAVE_RANDOM_R@
-#  ifndef RAND_MAX
-#   define RAND_MAX 2147483647
+#if @GNULIB_RAND@ || (@GNULIB_RANDOM_R@ && !@HAVE_RANDOM_R@)
+# ifndef RAND_MAX
+#  define RAND_MAX 2147483647
+# endif
+#endif
+
+
+#if @GNULIB_RAND@
+# if @REPLACE_RAND@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef rand
+#   define rand rpl_rand
 #  endif
+_GL_FUNCDECL_RPL (rand, int, (void));
+_GL_CXXALIAS_RPL (rand, int, (void));
+# else
+_GL_CXXALIAS_SYS (rand, int, (void));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (rand);
 # endif
 #endif
 
@@ -900,7 +1164,9 @@
                                int.  */
 _GL_CXXALIAS_SYS_CAST (random, long, (void));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (random);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef random
 # if HAVE_RAW_DECL_RANDOM
@@ -925,7 +1191,9 @@
                                        unsigned long seed.  */
 _GL_CXXALIAS_SYS_CAST (srandom, void, (unsigned int seed));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (srandom);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef srandom
 # if HAVE_RAW_DECL_SRANDOM
@@ -956,7 +1224,9 @@
 _GL_CXXALIAS_SYS_CAST (initstate, char *,
                        (unsigned int seed, char *buf, size_t buf_size));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (initstate);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef initstate
 # if HAVE_RAW_DECL_INITSTATE
@@ -981,7 +1251,9 @@
    is                                     const char *arg_state.  */
 _GL_CXXALIAS_SYS_CAST (setstate, char *, (char *arg_state));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (setstate);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef setstate
 # if HAVE_RAW_DECL_SETSTATE
@@ -1126,8 +1398,16 @@
 # else
 #  if __GNUC__ >= 11
 /* For -Wmismatched-dealloc: Associate realloc with free or rpl_free.  */
-_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size)
-                                   _GL_ATTRIBUTE_DEALLOC_FREE);
+#   if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2
+_GL_FUNCDECL_SYS (realloc, void *,
+                  (void *ptr, size_t size)
+                  _GL_ATTRIBUTE_NOTHROW
+                  _GL_ATTRIBUTE_DEALLOC_FREE);
+#   else
+_GL_FUNCDECL_SYS (realloc, void *,
+                  (void *ptr, size_t size)
+                  _GL_ATTRIBUTE_DEALLOC_FREE);
+#   endif
 #  endif
 _GL_CXXALIAS_SYS (realloc, void *, (void *ptr, size_t size));
 # endif
@@ -1137,8 +1417,16 @@
 #else
 # if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined realloc
 /* For -Wmismatched-dealloc: Associate realloc with free or rpl_free.  */
-_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size)
-                                   _GL_ATTRIBUTE_DEALLOC_FREE);
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2
+_GL_FUNCDECL_SYS (realloc, void *,
+                  (void *ptr, size_t size)
+                  _GL_ATTRIBUTE_NOTHROW
+                  _GL_ATTRIBUTE_DEALLOC_FREE);
+#  else
+_GL_FUNCDECL_SYS (realloc, void *,
+                  (void *ptr, size_t size)
+                  _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC
 #  undef realloc
@@ -1167,7 +1455,9 @@
 _GL_CXXALIAS_SYS (reallocarray, void *,
                   (void *ptr, size_t nmemb, size_t size));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (reallocarray);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef reallocarray
 # if HAVE_RAW_DECL_REALLOCARRAY

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/striconveh.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/striconveh.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/striconveh.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/striconveh.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/striconveha.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/striconveha.c Changed

@@ -1,5 +1,5 @@
 /* Character set conversion with error handling and autodetection.
-   Copyright (C) 2002, 2005, 2007, 2009-2022 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2007, 2009-2024 Free Software Foundation, Inc.
    Written by Bruno Haible.
 
    This file is free software: you can redistribute it and/or modify
@@ -88,10 +88,6 @@
   size_t listlen;
   size_t memneed;
   size_t i;
-  char *memory;
-  struct autodetect_alias *new_alias;
-  char *new_name;
-  const char **new_try_in_order;
 
   /* The TRY_IN_ORDER list must not be empty.  */
   if (try_in_order0 == NULL)
@@ -108,25 +104,24 @@
     memneed += sizeof (char *) + strlen (try_in_orderi) + 1;
   listlen = i;
 
-  memory = (char *) malloc (memneed);
+  void *memory = malloc (memneed);
   if (memory != NULL)
     {
-      new_alias = (struct autodetect_alias *) memory;
-      memory += sizeof (struct autodetect_alias);
+      struct autodetect_alias *new_alias = memory;
+      memory = new_alias + 1;
 
-      new_try_in_order = (const char **) memory;
-      memory += (listlen + 1) * sizeof (char *);
+      char const **new_try_in_order = memory;
+      memory = new_try_in_order + listlen + 1;
 
-      new_name = (char *) memory;
-      memcpy (new_name, name, namelen);
-      memory += namelen;
+      char *new_name = memcpy (memory, name, namelen);
+      memory = new_name + namelen;
 
       for (i = 0; i < listlen; i++)
         {
           size_t len = strlen (try_in_orderi) + 1;
-          memcpy (memory, try_in_orderi, len);
-          new_try_in_orderi = (const char *) memory;
-          memory += len;
+          char *copy = memcpy (memory, try_in_orderi, len);
+          new_try_in_orderi = copy;
+          memory = copy + len;
         }
       new_try_in_orderi = NULL;
 
@@ -234,6 +229,11 @@
       int retval;
       size_t len = strlen (to_codeset);
       char *to_codeset_suffixed = (char *) malloca (len + 10 + 1);
+      if (to_codeset_suffixed == NULL)
+        {
+          errno = ENOMEM;
+          return -1;
+        }
       memcpy (to_codeset_suffixed, to_codeset, len);
       memcpy (to_codeset_suffixed + len, "//TRANSLIT", 10 + 1);
 
@@ -336,6 +336,11 @@
       char *result;
       size_t len = strlen (to_codeset);
       char *to_codeset_suffixed = (char *) malloca (len + 10 + 1);
+      if (to_codeset_suffixed == NULL)
+        {
+          errno = ENOMEM;
+          return NULL;
+        }
       memcpy (to_codeset_suffixed, to_codeset, len);
       memcpy (to_codeset_suffixed + len, "//TRANSLIT", 10 + 1);

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/striconveha.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/striconveha.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/string.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/string.in.h Changed

@@ -1,6 +1,6 @@
 /* A GNU-like <string.h>.
 
-   Copyright (C) 1995-1996, 2001-2022 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 2001-2024 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -44,6 +44,13 @@
 #ifndef _@GUARD_PREFIX@_STRING_H
 #define _@GUARD_PREFIX@_STRING_H
 
+/* This file uses _GL_ATTRIBUTE_DEALLOC, _GL_ATTRIBUTE_MALLOC,
+   _GL_ATTRIBUTE_NOTHROW, _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK,
+   HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* NetBSD 5.0 mis-defines NULL.  */
 #include <stddef.h>
 
@@ -59,10 +66,11 @@
 # include <unistd.h>
 #endif
 
-/* AIX 7.2 declares ffsl and ffsll in <strings.h>, not in <string.h>.  */
+/* AIX 7.2 and Android 13 declare ffsl and ffsll in <strings.h>, not in
+   <string.h>.  */
 /* But in any case avoid namespace pollution on glibc systems.  */
 #if ((@GNULIB_FFSL@ || @GNULIB_FFSLL@ || defined GNULIB_POSIXCHECK) \
-     && defined _AIX) \
+     && (defined _AIX || defined __ANDROID__)) \
     && ! defined __GLIBC__
 # include <strings.h>
 #endif
@@ -82,7 +90,14 @@
    can be freed via 'free'; it can be used only after declaring 'free'.  */
 /* Applies to: functions.  Cannot be used on inline functions.  */
 #ifndef _GL_ATTRIBUTE_DEALLOC_FREE
-# define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (free, 1)
+# if defined __cplusplus && defined __GNUC__ && !defined __clang__
+/* Work around GCC bug <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108231> */
+#  define _GL_ATTRIBUTE_DEALLOC_FREE \
+     _GL_ATTRIBUTE_DEALLOC ((void (*) (void *)) free, 1)
+# else
+#  define _GL_ATTRIBUTE_DEALLOC_FREE \
+     _GL_ATTRIBUTE_DEALLOC (free, 1)
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_MALLOC declares that the function returns a pointer to freshly
@@ -96,6 +111,28 @@
 # endif
 #endif
 
+/* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions.
+ */
+#ifndef _GL_ATTRIBUTE_NOTHROW
+# if defined __cplusplus
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major >= 4
+#   if __cplusplus >= 201103L
+#    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
+#   else
+#    define _GL_ATTRIBUTE_NOTHROW throw ()
+#   endif
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# else
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__
+#   define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__))
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# endif
+#endif
+
 /* The __attribute__ feature is available in gcc versions 2.5 and later.
    The attribute __pure__ was added in gcc 2.96.  */
 #ifndef _GL_ATTRIBUTE_PURE
@@ -118,7 +155,11 @@
 # if (@REPLACE_FREE@ && !defined free \
       && !(defined __cplusplus && defined GNULIB_NAMESPACE))
 /* We can't do '#define free rpl_free' here.  */
+#  if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
+_GL_EXTERN_C void rpl_free (void *) _GL_ATTRIBUTE_NOTHROW;
+#  else
 _GL_EXTERN_C void rpl_free (void *);
+#  endif
 #  undef _GL_ATTRIBUTE_DEALLOC_FREE
 #  define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (rpl_free, 1)
 # else
@@ -130,7 +171,7 @@
      void __cdecl free (void *);
 #  else
 #   if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
-_GL_EXTERN_C void free (void *) throw ();
+_GL_EXTERN_C void free (void *) _GL_ATTRIBUTE_NOTHROW;
 #   else
 _GL_EXTERN_C void free (void *);
 #   endif
@@ -145,7 +186,7 @@
      void __cdecl free (void *);
 # else
 #  if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
-_GL_EXTERN_C void free (void *) throw ();
+_GL_EXTERN_C void free (void *) _GL_ATTRIBUTE_NOTHROW;
 #  else
 _GL_EXTERN_C void free (void *);
 #  endif
@@ -248,9 +289,12 @@
 # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
          || defined __clang__)
-_GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n) throw ());
+_GL_CXXALIASWARN1 (memchr, void *,
+                   (void *__s, int __c, size_t __n)
+                   _GL_ATTRIBUTE_NOTHROW);
 _GL_CXXALIASWARN1 (memchr, void const *,
-                   (void const *__s, int __c, size_t __n) throw ());
+                   (void const *__s, int __c, size_t __n)
+                   _GL_ATTRIBUTE_NOTHROW);
 # elif __GLIBC__ >= 2
 _GL_CXXALIASWARN (memchr);
 # endif
@@ -300,16 +344,32 @@
 /* Copy N bytes of SRC to DEST, return pointer to bytes after the
    last written byte.  */
 #if @GNULIB_MEMPCPY@
-# if ! @HAVE_MEMPCPY@
+# if @REPLACE_MEMPCPY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mempcpy
+#   define mempcpy rpl_mempcpy
+#  endif
+_GL_FUNCDECL_RPL (mempcpy, void *,
+                  (void *restrict __dest, void const *restrict __src,
+                   size_t __n)
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (mempcpy, void *,
+                  (void *restrict __dest, void const *restrict __src,
+                   size_t __n));
+# else
+#  if !@HAVE_MEMPCPY@
 _GL_FUNCDECL_SYS (mempcpy, void *,
                   (void *restrict __dest, void const *restrict __src,
                    size_t __n)
                   _GL_ARG_NONNULL ((1, 2)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (mempcpy, void *,
                   (void *restrict __dest, void const *restrict __src,
                    size_t __n));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (mempcpy);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef mempcpy
 # if HAVE_RAW_DECL_MEMPCPY
@@ -334,9 +394,13 @@
 # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
          || defined __clang__)
-_GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t) throw ());
-_GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t) throw ());
-# else
+_GL_CXXALIASWARN1 (memrchr, void *,
+                   (void *, int, size_t)
+                   _GL_ATTRIBUTE_NOTHROW);
+_GL_CXXALIASWARN1 (memrchr, void const *,
+                   (void const *, int, size_t)
+                   _GL_ATTRIBUTE_NOTHROW);
+# elif __GLIBC__ >= 2
 _GL_CXXALIASWARN (memrchr);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -347,6 +411,33 @@
 # endif
 #endif
 
+/* Overwrite a block of memory.  The compiler will not optimize
+   effects away, even if the block is dead after the call.  */
+#if @GNULIB_MEMSET_EXPLICIT@
+# if @REPLACE_MEMSET_EXPLICIT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef memset_explicit
+#   define memset_explicit rpl_memset_explicit
+#  endif
+_GL_FUNCDECL_RPL (memset_explicit, void *,
+                  (void *__dest, int __c, size_t __n) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (memset_explicit, void *, (void *__dest, int __c, size_t __n));
+# else
+#  if !@HAVE_MEMSET_EXPLICIT@
+_GL_FUNCDECL_SYS (memset_explicit, void *,
+                  (void *__dest, int __c, size_t __n) _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (memset_explicit, void *, (void *__dest, int __c, size_t __n));
+# endif
+_GL_CXXALIASWARN (memset_explicit);
+#elif defined GNULIB_POSIXCHECK
+# undef memset_explicit
+# if HAVE_RAW_DECL_MEMSET_EXPLICIT
+_GL_WARN_ON_USE (memset_explicit, "memset_explicit is unportable - "
+                 "use gnulib module memset_explicit for portability");
+# endif
+#endif
+
 /* Find the first occurrence of C in S.  More efficient than
    memchr(S,C,N), at the expense of undefined behavior if C does not
    occur within N bytes.  */
@@ -365,9 +456,12 @@
 # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
          || defined __clang__)
-_GL_CXXALIASWARN1 (rawmemchr, void *, (void *__s, int __c_in) throw ());
+_GL_CXXALIASWARN1 (rawmemchr, void *,
+                   (void *__s, int __c_in)
+                   _GL_ATTRIBUTE_NOTHROW);
 _GL_CXXALIASWARN1 (rawmemchr, void const *,
-                   (void const *__s, int __c_in) throw ());
+                   (void const *__s, int __c_in)
+                   _GL_ATTRIBUTE_NOTHROW);
 # else
 _GL_CXXALIASWARN (rawmemchr);
 # endif
@@ -381,14 +475,28 @@
 
 /* Copy SRC to DST, returning the address of the terminating '\0' in DST.  */
 #if @GNULIB_STPCPY@
-# if ! @HAVE_STPCPY@
+# if @REPLACE_STPCPY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef stpcpy
+#   define stpcpy rpl_stpcpy
+#  endif
+_GL_FUNCDECL_RPL (stpcpy, char *,
+                  (char *restrict __dst, char const *restrict __src)
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (stpcpy, char *,
+                  (char *restrict __dst, char const *restrict __src));
+# else
+#  if !@HAVE_STPCPY@
 _GL_FUNCDECL_SYS (stpcpy, char *,
                   (char *restrict __dst, char const *restrict __src)
                   _GL_ARG_NONNULL ((1, 2)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (stpcpy, char *,
                   (char *restrict __dst, char const *restrict __src));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (stpcpy);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef stpcpy
 # if HAVE_RAW_DECL_STPCPY
@@ -423,7 +531,9 @@
                   (char *restrict __dst, char const *restrict __src,
                    size_t __n));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (stpncpy);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef stpncpy
 # if HAVE_RAW_DECL_STPNCPY
@@ -471,10 +581,13 @@
 # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
          || defined __clang__)
-_GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in) throw ());
+_GL_CXXALIASWARN1 (strchrnul, char *,
+                   (char *__s, int __c_in)
+                   _GL_ATTRIBUTE_NOTHROW);
 _GL_CXXALIASWARN1 (strchrnul, char const *,
-                   (char const *__s, int __c_in) throw ());
-# else
+                   (char const *__s, int __c_in)
+                   _GL_ATTRIBUTE_NOTHROW);
+# elif __GLIBC__ >= 2
 _GL_CXXALIASWARN (strchrnul);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -509,10 +622,18 @@
 #   undef strdup
 #  endif
 #  if (!@HAVE_DECL_STRDUP@ || __GNUC__ >= 11) && !defined strdup
+#   if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
 _GL_FUNCDECL_SYS (strdup, char *,
                   (char const *__s)
+                  _GL_ATTRIBUTE_NOTHROW
                   _GL_ARG_NONNULL ((1))
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   else
+_GL_FUNCDECL_SYS (strdup, char *,
+                  (char const *__s)
+                  _GL_ARG_NONNULL ((1))
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   endif
 #  endif
 _GL_CXXALIAS_SYS (strdup, char *, (char const *__s));
 # endif
@@ -520,10 +641,18 @@
 #else
 # if __GNUC__ >= 11 && !defined strdup
 /* For -Wmismatched-dealloc: Associate strdup with free or rpl_free.  */
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
 _GL_FUNCDECL_SYS (strdup, char *,
                   (char const *__s)
+                  _GL_ATTRIBUTE_NOTHROW
                   _GL_ARG_NONNULL ((1))
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  else
+_GL_FUNCDECL_SYS (strdup, char *,
+                  (char const *__s)
+                  _GL_ARG_NONNULL ((1))
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef strdup
@@ -592,10 +721,18 @@
 _GL_CXXALIAS_RPL (strndup, char *, (char const *__s, size_t __n));
 # else
 #  if !@HAVE_DECL_STRNDUP@ || (__GNUC__ >= 11 && !defined strndup)
+#   if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
 _GL_FUNCDECL_SYS (strndup, char *,
                   (char const *__s, size_t __n)
+                  _GL_ATTRIBUTE_NOTHROW
                   _GL_ARG_NONNULL ((1))
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   else
+_GL_FUNCDECL_SYS (strndup, char *,
+                  (char const *__s, size_t __n)
+                  _GL_ARG_NONNULL ((1))
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   endif
 #  endif
 _GL_CXXALIAS_SYS (strndup, char *, (char const *__s, size_t __n));
 # endif
@@ -603,10 +740,18 @@
 #else
 # if __GNUC__ >= 11 && !defined strndup
 /* For -Wmismatched-dealloc: Associate strndup with free or rpl_free.  */
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+_GL_FUNCDECL_SYS (strndup, char *,
+                  (char const *__s, size_t __n)
+                  _GL_ATTRIBUTE_NOTHROW
+                  _GL_ARG_NONNULL ((1))
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  else
 _GL_FUNCDECL_SYS (strndup, char *,
                   (char const *__s, size_t __n)
                   _GL_ARG_NONNULL ((1))
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef strndup
@@ -675,9 +820,12 @@
 # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
          || defined __clang__)
-_GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept) throw ());
+_GL_CXXALIASWARN1 (strpbrk, char *,
+                   (char *__s, char const *__accept)
+                   _GL_ATTRIBUTE_NOTHROW);
 _GL_CXXALIASWARN1 (strpbrk, char const *,
-                   (char const *__s, char const *__accept) throw ());
+                   (char const *__s, char const *__accept)
+                   _GL_ATTRIBUTE_NOTHROW);
 # elif __GLIBC__ >= 2
 _GL_CXXALIASWARN (strpbrk);
 # endif
@@ -785,9 +933,11 @@
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
          || defined __clang__)
 _GL_CXXALIASWARN1 (strstr, char *,
-                   (char *haystack, const char *needle) throw ());
+                   (char *haystack, const char *needle)
+                   _GL_ATTRIBUTE_NOTHROW);
 _GL_CXXALIASWARN1 (strstr, const char *,
-                   (const char *haystack, const char *needle) throw ());
+                   (const char *haystack, const char *needle)
+                   _GL_ATTRIBUTE_NOTHROW);
 # elif __GLIBC__ >= 2
 _GL_CXXALIASWARN (strstr);
 # endif
@@ -836,10 +986,12 @@
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
          || defined __clang__)
 _GL_CXXALIASWARN1 (strcasestr, char *,
-                   (char *haystack, const char *needle) throw ());
+                   (char *haystack, const char *needle)
+                   _GL_ATTRIBUTE_NOTHROW);
 _GL_CXXALIASWARN1 (strcasestr, const char *,
-                   (const char *haystack, const char *needle) throw ());
-# else
+                   (const char *haystack, const char *needle)
+                   _GL_ATTRIBUTE_NOTHROW);
+# elif __GLIBC__ >= 2
 _GL_CXXALIASWARN (strcasestr);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -1187,7 +1339,7 @@
 #  endif
 _GL_CXXALIAS_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen));
 # endif
-# if @HAVE_DECL_STRERROR_R@
+# if __GLIBC__ >= 2 && @HAVE_DECL_STRERROR_R@
 _GL_CXXALIASWARN (strerror_r);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -1277,12 +1429,22 @@
 #endif
 
 #if @GNULIB_STRVERSCMP@
-# if !@HAVE_STRVERSCMP@
+# if @REPLACE_STRVERSCMP@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define strverscmp rpl_strverscmp
+#  endif
+_GL_FUNCDECL_RPL (strverscmp, int, (const char *, const char *)
+                                   _GL_ATTRIBUTE_PURE
+                                   _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (strverscmp, int, (const char *, const char *));
+# else
+#  if !@HAVE_STRVERSCMP@
 _GL_FUNCDECL_SYS (strverscmp, int, (const char *, const char *)
                                    _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1, 2)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (strverscmp, int, (const char *, const char *));
+# endif
 _GL_CXXALIASWARN (strverscmp);
 #elif defined GNULIB_POSIXCHECK
 # undef strverscmp

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/sys_types.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/sys_types.in.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/uniconv.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/uniconv.in.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/uniconv/u-strconv-from-enc.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/uniconv/u-strconv-from-enc.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/uniconv/u8-conv-from-enc.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/uniconv/u8-conv-from-enc.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/uniconv/u8-strconv-from-enc.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/uniconv/u8-strconv-from-enc.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/uniconv/u8-strconv-from-locale.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/uniconv/u8-strconv-from-locale.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/uniconv/u8-strconv-to-enc.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/uniconv/u8-strconv-to-enc.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/uniconv/u8-strconv-to-locale.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/uniconv/u8-strconv-to-locale.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unictype.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unictype.in.h Changed

@@ -1,5 +1,5 @@
 /* Unicode character classification and properties.
-   Copyright (C) 2002, 2005-2022 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2024 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -25,6 +25,12 @@
 /* Get size_t.  */
 #include <stddef.h>
 
+#if @HAVE_UNISTRING_WOE32DLL_H@
+# include <unistring/woe32dll.h>
+#else
+# define LIBUNISTRING_DLL_VARIABLE
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -101,44 +107,44 @@
 };
 
 /* Predefined General category values.  */
-extern const uc_general_category_t UC_CATEGORY_L;
-extern const uc_general_category_t UC_CATEGORY_LC;
-extern const uc_general_category_t UC_CATEGORY_Lu;
-extern const uc_general_category_t UC_CATEGORY_Ll;
-extern const uc_general_category_t UC_CATEGORY_Lt;
-extern const uc_general_category_t UC_CATEGORY_Lm;
-extern const uc_general_category_t UC_CATEGORY_Lo;
-extern const uc_general_category_t UC_CATEGORY_M;
-extern const uc_general_category_t UC_CATEGORY_Mn;
-extern const uc_general_category_t UC_CATEGORY_Mc;
-extern const uc_general_category_t UC_CATEGORY_Me;
-extern const uc_general_category_t UC_CATEGORY_N;
-extern const uc_general_category_t UC_CATEGORY_Nd;
-extern const uc_general_category_t UC_CATEGORY_Nl;
-extern const uc_general_category_t UC_CATEGORY_No;
-extern const uc_general_category_t UC_CATEGORY_P;
-extern const uc_general_category_t UC_CATEGORY_Pc;
-extern const uc_general_category_t UC_CATEGORY_Pd;
-extern const uc_general_category_t UC_CATEGORY_Ps;
-extern const uc_general_category_t UC_CATEGORY_Pe;
-extern const uc_general_category_t UC_CATEGORY_Pi;
-extern const uc_general_category_t UC_CATEGORY_Pf;
-extern const uc_general_category_t UC_CATEGORY_Po;
-extern const uc_general_category_t UC_CATEGORY_S;
-extern const uc_general_category_t UC_CATEGORY_Sm;
-extern const uc_general_category_t UC_CATEGORY_Sc;
-extern const uc_general_category_t UC_CATEGORY_Sk;
-extern const uc_general_category_t UC_CATEGORY_So;
-extern const uc_general_category_t UC_CATEGORY_Z;
-extern const uc_general_category_t UC_CATEGORY_Zs;
-extern const uc_general_category_t UC_CATEGORY_Zl;
-extern const uc_general_category_t UC_CATEGORY_Zp;
-extern const uc_general_category_t UC_CATEGORY_C;
-extern const uc_general_category_t UC_CATEGORY_Cc;
-extern const uc_general_category_t UC_CATEGORY_Cf;
-extern const uc_general_category_t UC_CATEGORY_Cs;
-extern const uc_general_category_t UC_CATEGORY_Co;
-extern const uc_general_category_t UC_CATEGORY_Cn;
+extern @GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_L;
+extern @GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_LC;
+extern @GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Lu;
+extern @GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Ll;
+extern @GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Lt;
+extern @GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Lm;
+extern @GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Lo;
+extern @GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_M;
+extern @GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Mn;
+extern @GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Mc;
+extern @GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Me;
+extern @GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_N;
+extern @GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Nd;
+extern @GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Nl;
+extern @GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_No;
+extern @GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_P;
+extern @GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Pc;
+extern @GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Pd;
+extern @GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Ps;
+extern @GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Pe;
+extern @GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Pi;
+extern @GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Pf;
+extern @GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Po;
+extern @GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_S;
+extern @GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Sm;
+extern @GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Sc;
+extern @GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Sk;
+extern @GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_So;
+extern @GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Z;
+extern @GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Zs;
+extern @GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Zl;
+extern @GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Zp;
+extern @GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_C;
+extern @GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Cc;
+extern @GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Cf;
+extern @GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Cs;
+extern @GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Co;
+extern @GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Cn;
 /* Non-public.  */
 extern const uc_general_category_t _UC_CATEGORY_NONE;
 
@@ -602,107 +608,107 @@
 
 /* Predefined properties.  */
 /* General.  */
-extern const uc_property_t UC_PROPERTY_WHITE_SPACE;
-extern const uc_property_t UC_PROPERTY_ALPHABETIC;
-extern const uc_property_t UC_PROPERTY_OTHER_ALPHABETIC;
-extern const uc_property_t UC_PROPERTY_NOT_A_CHARACTER;
-extern const uc_property_t UC_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT;
-extern const uc_property_t UC_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT;
-extern const uc_property_t UC_PROPERTY_DEPRECATED;
-extern const uc_property_t UC_PROPERTY_LOGICAL_ORDER_EXCEPTION;
-extern const uc_property_t UC_PROPERTY_VARIATION_SELECTOR;
-extern const uc_property_t UC_PROPERTY_PRIVATE_USE;
-extern const uc_property_t UC_PROPERTY_UNASSIGNED_CODE_VALUE;
+extern @GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_WHITE_SPACE;
+extern @GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ALPHABETIC;
+extern @GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_ALPHABETIC;
+extern @GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_NOT_A_CHARACTER;
+extern @GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT;
+extern @GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT;
+extern @GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_DEPRECATED;
+extern @GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_LOGICAL_ORDER_EXCEPTION;
+extern @GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_VARIATION_SELECTOR;
+extern @GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PRIVATE_USE;
+extern @GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_UNASSIGNED_CODE_VALUE;
 /* Case.  */
-extern const uc_property_t UC_PROPERTY_UPPERCASE;
-extern const uc_property_t UC_PROPERTY_OTHER_UPPERCASE;
-extern const uc_property_t UC_PROPERTY_LOWERCASE;
-extern const uc_property_t UC_PROPERTY_OTHER_LOWERCASE;
-extern const uc_property_t UC_PROPERTY_TITLECASE;
-extern const uc_property_t UC_PROPERTY_CASED;
-extern const uc_property_t UC_PROPERTY_CASE_IGNORABLE;
-extern const uc_property_t UC_PROPERTY_CHANGES_WHEN_LOWERCASED;
-extern const uc_property_t UC_PROPERTY_CHANGES_WHEN_UPPERCASED;
-extern const uc_property_t UC_PROPERTY_CHANGES_WHEN_TITLECASED;
-extern const uc_property_t UC_PROPERTY_CHANGES_WHEN_CASEFOLDED;
-extern const uc_property_t UC_PROPERTY_CHANGES_WHEN_CASEMAPPED;
-extern const uc_property_t UC_PROPERTY_SOFT_DOTTED;
+extern @GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_UPPERCASE;
+extern @GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_UPPERCASE;
+extern @GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_LOWERCASE;
+extern @GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_LOWERCASE;
+extern @GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_TITLECASE;
+extern @GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CASED;
+extern @GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CASE_IGNORABLE;
+extern @GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CHANGES_WHEN_LOWERCASED;
+extern @GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CHANGES_WHEN_UPPERCASED;
+extern @GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CHANGES_WHEN_TITLECASED;
+extern @GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CHANGES_WHEN_CASEFOLDED;
+extern @GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CHANGES_WHEN_CASEMAPPED;
+extern @GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_SOFT_DOTTED;
 /* Identifiers.  */
-extern const uc_property_t UC_PROPERTY_ID_START;
-extern const uc_property_t UC_PROPERTY_OTHER_ID_START;
-extern const uc_property_t UC_PROPERTY_ID_CONTINUE;
-extern const uc_property_t UC_PROPERTY_OTHER_ID_CONTINUE;
-extern const uc_property_t UC_PROPERTY_XID_START;
-extern const uc_property_t UC_PROPERTY_XID_CONTINUE;
-extern const uc_property_t UC_PROPERTY_PATTERN_WHITE_SPACE;
-extern const uc_property_t UC_PROPERTY_PATTERN_SYNTAX;
+extern @GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ID_START;
+extern @GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_ID_START;
+extern @GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ID_CONTINUE;
+extern @GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_ID_CONTINUE;
+extern @GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_XID_START;
+extern @GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_XID_CONTINUE;
+extern @GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PATTERN_WHITE_SPACE;
+extern @GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PATTERN_SYNTAX;
 /* Shaping and rendering.  */
-extern const uc_property_t UC_PROPERTY_JOIN_CONTROL;
-extern const uc_property_t UC_PROPERTY_GRAPHEME_BASE;
-extern const uc_property_t UC_PROPERTY_GRAPHEME_EXTEND;
-extern const uc_property_t UC_PROPERTY_OTHER_GRAPHEME_EXTEND;
-extern const uc_property_t UC_PROPERTY_GRAPHEME_LINK;
+extern @GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_JOIN_CONTROL;
+extern @GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_GRAPHEME_BASE;
+extern @GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_GRAPHEME_EXTEND;
+extern @GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_GRAPHEME_EXTEND;
+extern @GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_GRAPHEME_LINK;
 /* Bidi.  */
-extern const uc_property_t UC_PROPERTY_BIDI_CONTROL;
-extern const uc_property_t UC_PROPERTY_BIDI_LEFT_TO_RIGHT;
-extern const uc_property_t UC_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT;
-extern const uc_property_t UC_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT;
-extern const uc_property_t UC_PROPERTY_BIDI_EUROPEAN_DIGIT;
-extern const uc_property_t UC_PROPERTY_BIDI_EUR_NUM_SEPARATOR;
-extern const uc_property_t UC_PROPERTY_BIDI_EUR_NUM_TERMINATOR;
-extern const uc_property_t UC_PROPERTY_BIDI_ARABIC_DIGIT;
-extern const uc_property_t UC_PROPERTY_BIDI_COMMON_SEPARATOR;
-extern const uc_property_t UC_PROPERTY_BIDI_BLOCK_SEPARATOR;
-extern const uc_property_t UC_PROPERTY_BIDI_SEGMENT_SEPARATOR;
-extern const uc_property_t UC_PROPERTY_BIDI_WHITESPACE;
-extern const uc_property_t UC_PROPERTY_BIDI_NON_SPACING_MARK;
-extern const uc_property_t UC_PROPERTY_BIDI_BOUNDARY_NEUTRAL;
-extern const uc_property_t UC_PROPERTY_BIDI_PDF;
-extern const uc_property_t UC_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE;
-extern const uc_property_t UC_PROPERTY_BIDI_OTHER_NEUTRAL;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_CONTROL;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_LEFT_TO_RIGHT;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_EUROPEAN_DIGIT;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_EUR_NUM_SEPARATOR;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_EUR_NUM_TERMINATOR;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_ARABIC_DIGIT;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_COMMON_SEPARATOR;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_BLOCK_SEPARATOR;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_SEGMENT_SEPARATOR;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_WHITESPACE;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_NON_SPACING_MARK;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_BOUNDARY_NEUTRAL;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_PDF;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_OTHER_NEUTRAL;
 /* Numeric.  */
-extern const uc_property_t UC_PROPERTY_HEX_DIGIT;
-extern const uc_property_t UC_PROPERTY_ASCII_HEX_DIGIT;
+extern @GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_HEX_DIGIT;
+extern @GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ASCII_HEX_DIGIT;
 /* CJK.  */
-extern const uc_property_t UC_PROPERTY_IDEOGRAPHIC;
-extern const uc_property_t UC_PROPERTY_UNIFIED_IDEOGRAPH;
-extern const uc_property_t UC_PROPERTY_RADICAL;
-extern const uc_property_t UC_PROPERTY_IDS_BINARY_OPERATOR;
-extern const uc_property_t UC_PROPERTY_IDS_TRINARY_OPERATOR;
+extern @GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_IDEOGRAPHIC;
+extern @GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_UNIFIED_IDEOGRAPH;
+extern @GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_RADICAL;
+extern @GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_IDS_BINARY_OPERATOR;
+extern @GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_IDS_TRINARY_OPERATOR;
 /* Emoji.  */
-extern const uc_property_t UC_PROPERTY_EMOJI;
-extern const uc_property_t UC_PROPERTY_EMOJI_PRESENTATION;
-extern const uc_property_t UC_PROPERTY_EMOJI_MODIFIER;
-extern const uc_property_t UC_PROPERTY_EMOJI_MODIFIER_BASE;
-extern const uc_property_t UC_PROPERTY_EMOJI_COMPONENT;
-extern const uc_property_t UC_PROPERTY_EXTENDED_PICTOGRAPHIC;
+extern @GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_EMOJI;
+extern @GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_EMOJI_PRESENTATION;
+extern @GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_EMOJI_MODIFIER;
+extern @GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_EMOJI_MODIFIER_BASE;
+extern @GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_EMOJI_COMPONENT;
+extern @GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_EXTENDED_PICTOGRAPHIC;
 /* Misc.  */
-extern const uc_property_t UC_PROPERTY_ZERO_WIDTH;
-extern const uc_property_t UC_PROPERTY_SPACE;
-extern const uc_property_t UC_PROPERTY_NON_BREAK;
-extern const uc_property_t UC_PROPERTY_ISO_CONTROL;
-extern const uc_property_t UC_PROPERTY_FORMAT_CONTROL;
-extern const uc_property_t UC_PROPERTY_DASH;
-extern const uc_property_t UC_PROPERTY_HYPHEN;
-extern const uc_property_t UC_PROPERTY_PUNCTUATION;
-extern const uc_property_t UC_PROPERTY_LINE_SEPARATOR;
-extern const uc_property_t UC_PROPERTY_PARAGRAPH_SEPARATOR;
-extern const uc_property_t UC_PROPERTY_QUOTATION_MARK;
-extern const uc_property_t UC_PROPERTY_SENTENCE_TERMINAL;
-extern const uc_property_t UC_PROPERTY_TERMINAL_PUNCTUATION;
-extern const uc_property_t UC_PROPERTY_CURRENCY_SYMBOL;
-extern const uc_property_t UC_PROPERTY_MATH;
-extern const uc_property_t UC_PROPERTY_OTHER_MATH;
-extern const uc_property_t UC_PROPERTY_PAIRED_PUNCTUATION;
-extern const uc_property_t UC_PROPERTY_LEFT_OF_PAIR;
-extern const uc_property_t UC_PROPERTY_COMBINING;
-extern const uc_property_t UC_PROPERTY_COMPOSITE;
-extern const uc_property_t UC_PROPERTY_DECIMAL_DIGIT;
-extern const uc_property_t UC_PROPERTY_NUMERIC;
-extern const uc_property_t UC_PROPERTY_DIACRITIC;
-extern const uc_property_t UC_PROPERTY_EXTENDER;
-extern const uc_property_t UC_PROPERTY_IGNORABLE_CONTROL;
-extern const uc_property_t UC_PROPERTY_REGIONAL_INDICATOR;
+extern @GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ZERO_WIDTH;
+extern @GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_SPACE;
+extern @GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_NON_BREAK;
+extern @GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ISO_CONTROL;
+extern @GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_FORMAT_CONTROL;
+extern @GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_DASH;
+extern @GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_HYPHEN;
+extern @GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PUNCTUATION;
+extern @GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_LINE_SEPARATOR;
+extern @GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PARAGRAPH_SEPARATOR;
+extern @GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_QUOTATION_MARK;
+extern @GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_SENTENCE_TERMINAL;
+extern @GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_TERMINAL_PUNCTUATION;
+extern @GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CURRENCY_SYMBOL;
+extern @GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_MATH;
+extern @GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_MATH;
+extern @GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PAIRED_PUNCTUATION;
+extern @GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_LEFT_OF_PAIR;
+extern @GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_COMBINING;
+extern @GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_COMPOSITE;
+extern @GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_DECIMAL_DIGIT;
+extern @GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_NUMERIC;
+extern @GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_DIACRITIC;
+extern @GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_EXTENDER;
+extern @GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_IGNORABLE_CONTROL;
+extern @GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_REGIONAL_INDICATOR;
 
 /* Return the property given by name, e.g. "White space".  */
 extern uc_property_t

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unictype/bidi_of.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unictype/bidi_of.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unictype/bitmap.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unictype/bitmap.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unictype/categ_M.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unictype/categ_M.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unictype/categ_none.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unictype/categ_none.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unictype/categ_of.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unictype/categ_of.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unictype/categ_test.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unictype/categ_test.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unictype/combiningclass.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unictype/combiningclass.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unictype/joiningtype_of.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unictype/joiningtype_of.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unictype/scripts.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unictype/scripts.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/uninorm.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/uninorm.in.h Changed

@@ -1,5 +1,5 @@
 /* Normalization forms (composition and decomposition) of Unicode strings.
-   Copyright (C) 2001-2002, 2009-2022 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2009-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
    This file is free software: you can redistribute it and/or modify
@@ -23,6 +23,12 @@
 
 #include "unitypes.h"
 
+#if @HAVE_UNISTRING_WOE32DLL_H@
+# include <unistring/woe32dll.h>
+#else
+# define LIBUNISTRING_DLL_VARIABLE
+#endif
+
 
 #ifdef __cplusplus
 extern "C" {
@@ -108,21 +114,21 @@
 typedef const struct unicode_normalization_form *uninorm_t;
 
 /* UNINORM_NFD: Normalization form D: canonical decomposition.  */
-extern const struct unicode_normalization_form uninorm_nfd;
+extern @GNULIB_UNINORM_NFD_DLL_VARIABLE@ const struct unicode_normalization_form uninorm_nfd;
 #define UNINORM_NFD (&uninorm_nfd)
 
 /* UNINORM_NFC: Normalization form C: canonical decomposition, then
    canonical composition.  */
-extern const struct unicode_normalization_form uninorm_nfc;
+extern @GNULIB_UNINORM_NFC_DLL_VARIABLE@ const struct unicode_normalization_form uninorm_nfc;
 #define UNINORM_NFC (&uninorm_nfc)
 
 /* UNINORM_NFKD: Normalization form KD: compatibility decomposition.  */
-extern const struct unicode_normalization_form uninorm_nfkd;
+extern @GNULIB_UNINORM_NFKD_DLL_VARIABLE@ const struct unicode_normalization_form uninorm_nfkd;
 #define UNINORM_NFKD (&uninorm_nfkd)
 
 /* UNINORM_NFKC: Normalization form KC: compatibility decomposition, then
    canonical composition.  */
-extern const struct unicode_normalization_form uninorm_nfkc;
+extern @GNULIB_UNINORM_NFKC_DLL_VARIABLE@ const struct unicode_normalization_form uninorm_nfkc;
 #define UNINORM_NFKC (&uninorm_nfkc)
 
 /* Test whether a normalization form does compatibility decomposition.  */

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/uninorm/canonical-decomposition.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/uninorm/canonical-decomposition.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/uninorm/composition.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/uninorm/composition.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/uninorm/decompose-internal.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/uninorm/decompose-internal.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/uninorm/decompose-internal.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/uninorm/decompose-internal.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/uninorm/decomposition-table.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/uninorm/decomposition-table.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/uninorm/decomposition-table.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/uninorm/decomposition-table.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/uninorm/nfc.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/uninorm/nfc.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/uninorm/nfd.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/uninorm/nfd.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/uninorm/normalize-internal.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/uninorm/normalize-internal.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/uninorm/u-normalize-internal.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/uninorm/u-normalize-internal.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/uninorm/u32-normalize.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/uninorm/u32-normalize.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistd.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistd.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistd.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistd.in.h Changed

@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <unistd.h>.
-   Copyright (C) 2003-2022 Free Software Foundation, Inc.
+   Copyright (C) 2003-2024 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -40,6 +40,24 @@
 # undef _GL_INCLUDING_UNISTD_H
 #endif
 
+/* Avoid lseek bugs in FreeBSD, macOS <https://bugs.gnu.org/61386>.
+   This bug is fixed after FreeBSD 13; see <https://bugs.freebsd.org/256205>.
+   Use macOS "9999" to stand for a future fixed macOS version.  */
+#if defined __FreeBSD__ && __FreeBSD__ < 14
+# undef SEEK_DATA
+# undef SEEK_HOLE
+#elif defined __APPLE__ && defined __MACH__ && defined SEEK_DATA
+# ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
+#  include <AvailabilityMacros.h>
+# endif
+# if (!defined MAC_OS_X_VERSION_MIN_REQUIRED \
+      || MAC_OS_X_VERSION_MIN_REQUIRED < 99990000)
+#  include <sys/fcntl.h> /* It also defines the two macros.  */
+#  undef SEEK_DATA
+#  undef SEEK_HOLE
+# endif
+#endif
+
 /* Get all possible declarations of gethostname().  */
 #if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \
   && !defined _GL_INCLUDING_WINSOCK2_H
@@ -51,6 +69,12 @@
 #if !defined _@GUARD_PREFIX@_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H
 #define _@GUARD_PREFIX@_UNISTD_H
 
+/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, GNULIB_POSIXCHECK,
+   HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* NetBSD 5.0 mis-defines NULL.  Also get size_t.  */
 /* But avoid namespace pollution on glibc systems.  */
 #ifndef __GLIBC__
@@ -152,9 +176,6 @@
 # include <getopt-pfx-core.h>
 #endif
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef _GL_UNISTD_INLINE
 # define _GL_UNISTD_INLINE _GL_INLINE
@@ -541,17 +562,22 @@
    Return newfd if successful, otherwise -1 and errno set.
    See the Linux man page at
    <https://www.kernel.org/doc/man-pages/online/pages/man2/dup3.2.html>.  */
-# if @HAVE_DUP3@
+# if @REPLACE_DUP3@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef dup3
 #   define dup3 rpl_dup3
 #  endif
 _GL_FUNCDECL_RPL (dup3, int, (int oldfd, int newfd, int flags));
 _GL_CXXALIAS_RPL (dup3, int, (int oldfd, int newfd, int flags));
 # else
+#  if !@HAVE_DUP3@
 _GL_FUNCDECL_SYS (dup3, int, (int oldfd, int newfd, int flags));
+#  endif
 _GL_CXXALIAS_SYS (dup3, int, (int oldfd, int newfd, int flags));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (dup3);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef dup3
 # if HAVE_RAW_DECL_DUP3
@@ -870,7 +896,9 @@
 _GL_CXXALIAS_SYS (execvpe, int,
                   (const char *program, char * const *argv, char * const *env));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (execvpe);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef execvpe
 # if HAVE_RAW_DECL_EXECVPE
@@ -925,7 +953,9 @@
 _GL_CXXALIAS_SYS (faccessat, int,
                   (int fd, char const *file, int mode, int flag));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (faccessat);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef faccessat
 # if HAVE_RAW_DECL_FACCESSAT
@@ -941,23 +971,28 @@
    Return 0 if successful, otherwise -1 and errno set.
    See the POSIX:2008 specification
    <https://pubs.opengroup.org/onlinepubs/9699919799/functions/fchdir.html>.  */
-# if ! @HAVE_FCHDIR@
+# if @REPLACE_FCHDIR@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef fchdir
+#   define fchdir rpl_fchdir
+#  endif
+_GL_FUNCDECL_RPL (fchdir, int, (int /*fd*/));
+_GL_CXXALIAS_RPL (fchdir, int, (int /*fd*/));
+# else
+#  if !@HAVE_FCHDIR@ || !@HAVE_DECL_FCHDIR@
 _GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/));
-
+#  endif
+_GL_CXXALIAS_SYS (fchdir, int, (int /*fd*/));
+# endif
+_GL_CXXALIASWARN (fchdir);
+# if @REPLACE_FCHDIR@ || !@HAVE_FCHDIR@
 /* Gnulib internal hooks needed to maintain the fchdir metadata.  */
 _GL_EXTERN_C int _gl_register_fd (int fd, const char *filename)
      _GL_ARG_NONNULL ((2));
 _GL_EXTERN_C void _gl_unregister_fd (int fd);
 _GL_EXTERN_C int _gl_register_dup (int oldfd, int newfd);
 _GL_EXTERN_C const char *_gl_directory_name (int fd);
-
-# else
-#  if !@HAVE_DECL_FCHDIR@
-_GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/));
-#  endif
 # endif
-_GL_CXXALIAS_SYS (fchdir, int, (int /*fd*/));
-_GL_CXXALIASWARN (fchdir);
 #elif defined GNULIB_POSIXCHECK
 # undef fchdir
 # if HAVE_RAW_DECL_FCHDIR
@@ -1002,11 +1037,22 @@
    Return 0 if successful, otherwise -1 and errno set.
    See POSIX:2008 specification
    <https://pubs.opengroup.org/onlinepubs/9699919799/functions/fdatasync.html>.  */
-# if !@HAVE_FDATASYNC@ || !@HAVE_DECL_FDATASYNC@
+# if @REPLACE_FDATASYNC@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef fdatasync
+#   define fdatasync rpl_fdatasync
+#  endif
+_GL_FUNCDECL_RPL (fdatasync, int, (int fd));
+_GL_CXXALIAS_RPL (fdatasync, int, (int fd));
+# else
+#  if !@HAVE_FDATASYNC@|| !@HAVE_DECL_FDATASYNC@
 _GL_FUNCDECL_SYS (fdatasync, int, (int fd));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (fdatasync, int, (int fd));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (fdatasync);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef fdatasync
 # if HAVE_RAW_DECL_FDATASYNC
@@ -1053,7 +1099,9 @@
 #  endif
 _GL_CXXALIAS_SYS (ftruncate, int, (int fd, off_t length));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (ftruncate);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef ftruncate
 # if HAVE_RAW_DECL_FTRUNCATE
@@ -1070,10 +1118,10 @@
    or SIZE was too small.
    See the POSIX:2008 specification
    <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getcwd.html>.
-   Additionally, the gnulib module 'getcwd' guarantees the following GNU
-   extension: If BUF is NULL, an array is allocated with 'malloc'; the array
-   is SIZE bytes long, unless SIZE == 0, in which case it is as big as
-   necessary.  */
+   Additionally, the gnulib module 'getcwd' or 'getcwd-lgpl' guarantees the
+   following GNU extension: If BUF is NULL, an array is allocated with
+   'malloc'; the array is SIZE bytes long, unless SIZE == 0, in which case
+   it is as big as necessary.  */
 # if @REPLACE_GETCWD@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define getcwd rpl_getcwd
@@ -1185,11 +1233,22 @@
 
 #if @GNULIB_GETENTROPY@
 /* Fill a buffer with random bytes.  */
-# if !@HAVE_GETENTROPY@
+# if @REPLACE_GETENTROPY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getentropy
+#   define getentropy rpl_getentropy
+#  endif
+_GL_FUNCDECL_RPL (getentropy, int, (void *buffer, size_t length));
+_GL_CXXALIAS_RPL (getentropy, int, (void *buffer, size_t length));
+# else
+#  if !@HAVE_GETENTROPY@
 _GL_FUNCDECL_SYS (getentropy, int, (void *buffer, size_t length));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (getentropy, int, (void *buffer, size_t length));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (getentropy);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef getentropy
 # if HAVE_RAW_DECL_GETENTROPY
@@ -1323,7 +1382,9 @@
                                                      int size.  */
 _GL_CXXALIAS_SYS_CAST (getlogin_r, int, (char *name, size_t size));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (getlogin_r);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef getlogin_r
 # if HAVE_RAW_DECL_GETLOGIN_R
@@ -1661,7 +1722,9 @@
                   (int fd1, const char *path1, int fd2, const char *path2,
                    int flag));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (linkat);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef linkat
 # if HAVE_RAW_DECL_LINKAT
@@ -1742,8 +1805,9 @@
    Return 0 upon success, or -1 with errno set upon failure.
    See also the Linux man page at
    <https://www.kernel.org/doc/man-pages/online/pages/man2/pipe2.2.html>.  */
-# if @HAVE_PIPE2@
+# if @REPLACE_PIPE2@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pipe2
 #   define pipe2 rpl_pipe2
 #  endif
 _GL_FUNCDECL_RPL (pipe2, int, (int fd2, int flags) _GL_ARG_NONNULL ((1)));
@@ -1752,7 +1816,9 @@
 _GL_FUNCDECL_SYS (pipe2, int, (int fd2, int flags) _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_SYS (pipe2, int, (int fd2, int flags));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (pipe2);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef pipe2
 # if HAVE_RAW_DECL_PIPE2
@@ -1787,7 +1853,9 @@
 _GL_CXXALIAS_SYS (pread, ssize_t,
                   (int fd, void *buf, size_t bufsize, off_t offset));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (pread);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef pread
 # if HAVE_RAW_DECL_PREAD
@@ -1822,7 +1890,9 @@
 _GL_CXXALIAS_SYS (pwrite, ssize_t,
                   (int fd, const void *buf, size_t bufsize, off_t offset));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (pwrite);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef pwrite
 # if HAVE_RAW_DECL_PWRITE
@@ -1936,7 +2006,9 @@
                   (int fd, char const *restrict file,
                    char *restrict buf, size_t len));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (readlinkat);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef readlinkat
 # if HAVE_RAW_DECL_READLINKAT
@@ -1996,15 +2068,27 @@
 
    Platforms with no ability to set the hostname return -1 and set
    errno = ENOSYS.  */
-# if !@HAVE_SETHOSTNAME@ || !@HAVE_DECL_SETHOSTNAME@
+# if @REPLACE_SETHOSTNAME@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef sethostname
+#   define sethostname rpl_sethostname
+#  endif
+_GL_FUNCDECL_RPL (sethostname, int, (const char *name, size_t len)
+                                    _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (sethostname, int, (const char *name, size_t len));
+# else
+#  if !@HAVE_SETHOSTNAME@ || !@HAVE_DECL_SETHOSTNAME@
 _GL_FUNCDECL_SYS (sethostname, int, (const char *name, size_t len)
                                     _GL_ARG_NONNULL ((1)));
-# endif
+#  endif
 /* Need to cast, because on Solaris 11 2011-10, Mac OS X 10.5, IRIX 6.5
    and FreeBSD 6.4 the second parameter is int.  On Solaris 11
    2011-10, the first parameter is not const.  */
 _GL_CXXALIAS_SYS_CAST (sethostname, int, (const char *name, size_t len));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (sethostname);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef sethostname
 # if HAVE_RAW_DECL_SETHOSTNAME
@@ -2113,7 +2197,9 @@
 _GL_CXXALIAS_SYS (symlinkat, int,
                   (char const *contents, int fd, char const *file));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (symlinkat);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef symlinkat
 # if HAVE_RAW_DECL_SYMLINKAT
@@ -2143,7 +2229,9 @@
 #  endif
 _GL_CXXALIAS_SYS (truncate, int, (const char *filename, off_t length));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (truncate);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef truncate
 # if HAVE_RAW_DECL_TRUNCATE
@@ -2173,7 +2261,9 @@
 _GL_CXXALIAS_SYS (ttyname_r, int,
                   (int fd, char *buf, size_t buflen));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (ttyname_r);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef ttyname_r
 # if HAVE_RAW_DECL_TTYNAME_R

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr.in.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr/u-cpy-alloc.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr/u-cpy-alloc.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr/u-cpy.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr/u-cpy.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr/u-strlen.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr/u-strlen.h Changed

@@ -1,27 +1,19 @@
 /* Determine length of UTF-8/UTF-16/UTF-32 string.
-   Copyright (C) 1999, 2002, 2006, 2009-2022 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006, 2009-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
-   This file is free software.
-   It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+".
-   You can redistribute it and/or modify it under either
-     - the terms of the GNU Lesser General Public License as published
-       by the Free Software Foundation, either version 3, or (at your
-       option) any later version, or
-     - the terms of the GNU General Public License as published by the
-       Free Software Foundation; either version 2, or (at your option)
-       any later version, or
-     - the same dual license "the GNU LGPLv3+ or the GNU GPLv2+".
+   This file 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 file 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 and the GNU General Public License
-   for more details.
+   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 and of the GNU General Public License along with this
-   program.  If not, see <https://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 size_t
 FUNC (const UNIT *s)

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr/u32-cmp.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr/u32-cmp.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr/u32-cpy-alloc.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr/u32-cpy-alloc.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr/u32-cpy.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr/u32-cpy.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr/u32-mbtouc-unsafe.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr/u32-mbtouc-unsafe.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr/u32-strlen.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr/u32-strlen.c Changed

@@ -1,27 +1,19 @@
 /* Determine length of UTF-32 string.
-   Copyright (C) 1999, 2002, 2006, 2009-2022 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006, 2009-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
-   This file is free software.
-   It is dual-licensed under "the GNU LGPLv3+ or the GNU GPLv2+".
-   You can redistribute it and/or modify it under either
-     - the terms of the GNU Lesser General Public License as published
-       by the Free Software Foundation, either version 3, or (at your
-       option) any later version, or
-     - the terms of the GNU General Public License as published by the
-       Free Software Foundation; either version 2, or (at your option)
-       any later version, or
-     - the same dual license "the GNU LGPLv3+ or the GNU GPLv2+".
+   This file 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 file 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 and the GNU General Public License
-   for more details.
+   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 and of the GNU General Public License along with this
-   program.  If not, see <https://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr/u32-to-u8.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr/u32-to-u8.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr/u32-uctomb.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr/u32-uctomb.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr/u8-check.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr/u8-check.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr/u8-mblen.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr/u8-mblen.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr/u8-mbtouc-aux.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr/u8-mbtouc-aux.c Changed

@@ -1,5 +1,5 @@
 /* Conversion UTF-8 to UCS-4.
-   Copyright (C) 2001-2002, 2006-2007, 2009-2022 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2007, 2009-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This file is free software: you can redistribute it and/or modify
@@ -52,20 +52,15 @@
         {
           if (n >= 3)
             {
-              if ((s1 ^ 0x80) < 0x40)
+              if ((s1 ^ 0x80) < 0x40
+                  && (c >= 0xe1 || s1 >= 0xa0)
+                  && (c != 0xed || s1 < 0xa0))
                 {
                   if ((s2 ^ 0x80) < 0x40)
                     {
-                      if ((c >= 0xe1 || s1 >= 0xa0)
-                          && (c != 0xed || s1 < 0xa0))
-                        {
-                          *puc = ((unsigned int) (c & 0x0f) << 12)
-                                 | ((unsigned int) (s1 ^ 0x80) << 6)
-                                 | (unsigned int) (s2 ^ 0x80);
-                          return 3;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
+                      *puc = ((unsigned int) (c & 0x0f) << 12)
+                             | ((unsigned int) (s1 ^ 0x80) << 6)
+                             | (unsigned int) (s2 ^ 0x80);
                       return 3;
                     }
                   /* invalid multibyte character */
@@ -73,38 +68,50 @@
                   return 2;
                 }
               /* invalid multibyte character */
+              *puc = 0xfffd;
+              return 1;
             }
           else
             {
-              /* incomplete multibyte character */
               *puc = 0xfffd;
-              if (n == 1 || (s1 ^ 0x80) >= 0x40)
-                return 1;
+              if (n == 1)
+                {
+                  /* incomplete multibyte character */
+                  return 1;
+                }
               else
-                return 2;
+                {
+                  if ((s1 ^ 0x80) < 0x40
+                      && (c >= 0xe1 || s1 >= 0xa0)
+                      && (c != 0xed || s1 < 0xa0))
+                    {
+                      /* incomplete multibyte character */
+                      return 2;
+                    }
+                  else
+                    {
+                      /* invalid multibyte character */
+                      return 1;
+                    }
+                }
             }
         }
-      else if (c < 0xf8)
+      else if (c <= 0xf4)
         {
           if (n >= 4)
             {
-              if ((s1 ^ 0x80) < 0x40)
+              if ((s1 ^ 0x80) < 0x40
+                  && (c >= 0xf1 || s1 >= 0x90)
+                  && (c < 0xf4 || (/* c == 0xf4 && */ s1 < 0x90)))
                 {
                   if ((s2 ^ 0x80) < 0x40)
                     {
                       if ((s3 ^ 0x80) < 0x40)
                         {
-                          if ((c >= 0xf1 || s1 >= 0x90)
-                              && (c < 0xf4 || (c == 0xf4 && s1 < 0x90)))
-                            {
-                              *puc = ((unsigned int) (c & 0x07) << 18)
-                                     | ((unsigned int) (s1 ^ 0x80) << 12)
-                                     | ((unsigned int) (s2 ^ 0x80) << 6)
-                                     | (unsigned int) (s3 ^ 0x80);
-                              return 4;
-                            }
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
+                          *puc = ((unsigned int) (c & 0x07) << 18)
+                                 | ((unsigned int) (s1 ^ 0x80) << 12)
+                                 | ((unsigned int) (s2 ^ 0x80) << 6)
+                                 | (unsigned int) (s3 ^ 0x80);
                           return 4;
                         }
                       /* invalid multibyte character */
@@ -116,17 +123,48 @@
                   return 2;
                 }
               /* invalid multibyte character */
+              *puc = 0xfffd;
+              return 1;
             }
           else
             {
-              /* incomplete multibyte character */
               *puc = 0xfffd;
-              if (n == 1 || (s1 ^ 0x80) >= 0x40)
-                return 1;
-              else if (n == 2 || (s2 ^ 0x80) >= 0x40)
-                return 2;
+              if (n == 1)
+                {
+                  /* incomplete multibyte character */
+                  return 1;
+                }
               else
-                return 3;
+                {
+                  if ((s1 ^ 0x80) < 0x40
+                      && (c >= 0xf1 || s1 >= 0x90)
+                      && (c < 0xf4 || (/* c == 0xf4 && */ s1 < 0x90)))
+                    {
+                      if (n == 2)
+                        {
+                          /* incomplete multibyte character */
+                          return 2;
+                        }
+                      else
+                        {
+                          if ((s2 ^ 0x80) < 0x40)
+                            {
+                              /* incomplete multibyte character */
+                              return 3;
+                            }
+                          else
+                            {
+                              /* invalid multibyte character */
+                              return 2;
+                            }
+                        }
+                    }
+                  else
+                    {
+                      /* invalid multibyte character */
+                      return 1;
+                    }
+                }
             }
         }
     }

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr/u8-mbtouc-unsafe-aux.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr/u8-mbtouc-unsafe-aux.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr/u8-mbtouc-unsafe.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr/u8-mbtouc-unsafe.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr/u8-mbtouc.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr/u8-mbtouc.c Changed

@@ -1,5 +1,5 @@
 /* Look at first character in UTF-8 string.
-   Copyright (C) 1999-2002, 2006-2007, 2009-2022 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2006-2007, 2009-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This file is free software: you can redistribute it and/or modify
@@ -62,20 +62,15 @@
         {
           if (n >= 3)
             {
-              if ((s1 ^ 0x80) < 0x40)
+              if ((s1 ^ 0x80) < 0x40
+                  && (c >= 0xe1 || s1 >= 0xa0)
+                  && (c != 0xed || s1 < 0xa0))
                 {
                   if ((s2 ^ 0x80) < 0x40)
                     {
-                      if ((c >= 0xe1 || s1 >= 0xa0)
-                          && (c != 0xed || s1 < 0xa0))
-                        {
-                          *puc = ((unsigned int) (c & 0x0f) << 12)
-                                 | ((unsigned int) (s1 ^ 0x80) << 6)
-                                 | (unsigned int) (s2 ^ 0x80);
-                          return 3;
-                        }
-                      /* invalid multibyte character */
-                      *puc = 0xfffd;
+                      *puc = ((unsigned int) (c & 0x0f) << 12)
+                             | ((unsigned int) (s1 ^ 0x80) << 6)
+                             | (unsigned int) (s2 ^ 0x80);
                       return 3;
                     }
                   /* invalid multibyte character */
@@ -83,38 +78,50 @@
                   return 2;
                 }
               /* invalid multibyte character */
+              *puc = 0xfffd;
+              return 1;
             }
           else
             {
-              /* incomplete multibyte character */
               *puc = 0xfffd;
-              if (n == 1 || (s1 ^ 0x80) >= 0x40)
-                return 1;
+              if (n == 1)
+                {
+                  /* incomplete multibyte character */
+                  return 1;
+                }
               else
-                return 2;
+                {
+                  if ((s1 ^ 0x80) < 0x40
+                      && (c >= 0xe1 || s1 >= 0xa0)
+                      && (c != 0xed || s1 < 0xa0))
+                    {
+                      /* incomplete multibyte character */
+                      return 2;
+                    }
+                  else
+                    {
+                      /* invalid multibyte character */
+                      return 1;
+                    }
+                }
             }
         }
-      else if (c < 0xf8)
+      else if (c <= 0xf4)
         {
           if (n >= 4)
             {
-              if ((s1 ^ 0x80) < 0x40)
+              if ((s1 ^ 0x80) < 0x40
+                  && (c >= 0xf1 || s1 >= 0x90)
+                  && (c < 0xf4 || (/* c == 0xf4 && */ s1 < 0x90)))
                 {
                   if ((s2 ^ 0x80) < 0x40)
                     {
                       if ((s3 ^ 0x80) < 0x40)
                         {
-                          if ((c >= 0xf1 || s1 >= 0x90)
-                              && (c < 0xf4 || (c == 0xf4 && s1 < 0x90)))
-                            {
-                              *puc = ((unsigned int) (c & 0x07) << 18)
-                                     | ((unsigned int) (s1 ^ 0x80) << 12)
-                                     | ((unsigned int) (s2 ^ 0x80) << 6)
-                                     | (unsigned int) (s3 ^ 0x80);
-                              return 4;
-                            }
-                          /* invalid multibyte character */
-                          *puc = 0xfffd;
+                          *puc = ((unsigned int) (c & 0x07) << 18)
+                                 | ((unsigned int) (s1 ^ 0x80) << 12)
+                                 | ((unsigned int) (s2 ^ 0x80) << 6)
+                                 | (unsigned int) (s3 ^ 0x80);
                           return 4;
                         }
                       /* invalid multibyte character */
@@ -126,17 +133,48 @@
                   return 2;
                 }
               /* invalid multibyte character */
+              *puc = 0xfffd;
+              return 1;
             }
           else
             {
-              /* incomplete multibyte character */
               *puc = 0xfffd;
-              if (n == 1 || (s1 ^ 0x80) >= 0x40)
-                return 1;
-              else if (n == 2 || (s2 ^ 0x80) >= 0x40)
-                return 2;
+              if (n == 1)
+                {
+                  /* incomplete multibyte character */
+                  return 1;
+                }
               else
-                return 3;
+                {
+                  if ((s1 ^ 0x80) < 0x40
+                      && (c >= 0xf1 || s1 >= 0x90)
+                      && (c < 0xf4 || (/* c == 0xf4 && */ s1 < 0x90)))
+                    {
+                      if (n == 2)
+                        {
+                          /* incomplete multibyte character */
+                          return 2;
+                        }
+                      else
+                        {
+                          if ((s2 ^ 0x80) < 0x40)
+                            {
+                              /* incomplete multibyte character */
+                              return 3;
+                            }
+                          else
+                            {
+                              /* invalid multibyte character */
+                              return 2;
+                            }
+                        }
+                    }
+                  else
+                    {
+                      /* invalid multibyte character */
+                      return 1;
+                    }
+                }
             }
         }
     }

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr/u8-mbtoucr.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr/u8-mbtoucr.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr/u8-prev.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr/u8-prev.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr/u8-strlen.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr/u8-strlen.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr/u8-to-u32.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr/u8-to-u32.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr/u8-uctomb-aux.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr/u8-uctomb-aux.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unistr/u8-uctomb.c -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unistr/u8-uctomb.c Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/unitypes.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/unitypes.in.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/warn-on-use.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/warn-on-use.h Changed

_service:tar_scm:libidn2-2.3.4.tar.gz/unistring/wchar.in.h -> _service:tar_scm:libidn2-2.3.7.tar.gz/unistring/wchar.in.h Changed

@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
 
-   Copyright (C) 2007-2022 Free Software Foundation, Inc.
+   Copyright (C) 2007-2024 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -84,6 +84,13 @@
 #ifndef _@GUARD_PREFIX@_WCHAR_H
 #define _@GUARD_PREFIX@_WCHAR_H
 
+/* This file uses _GL_ATTRIBUTE_DEALLOC, _GL_ATTRIBUTE_MALLOC,
+   _GL_ATTRIBUTE_NOTHROW, _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK,
+   HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* _GL_ATTRIBUTE_DEALLOC (F, I) declares that the function returns pointers
    that can be freed by passing them as the Ith argument to the
    function F.  */
@@ -99,7 +106,14 @@
    can be freed via 'free'; it can be used only after declaring 'free'.  */
 /* Applies to: functions.  Cannot be used on inline functions.  */
 #ifndef _GL_ATTRIBUTE_DEALLOC_FREE
-# define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (free, 1)
+# if defined __cplusplus && defined __GNUC__ && !defined __clang__
+/* Work around GCC bug <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108231> */
+#  define _GL_ATTRIBUTE_DEALLOC_FREE \
+     _GL_ATTRIBUTE_DEALLOC ((void (*) (void *)) free, 1)
+# else
+#  define _GL_ATTRIBUTE_DEALLOC_FREE \
+     _GL_ATTRIBUTE_DEALLOC (free, 1)
+# endif
 #endif
 
 /* _GL_ATTRIBUTE_MALLOC declares that the function returns a pointer to freshly
@@ -123,6 +137,28 @@
 # endif
 #endif
 
+/* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions.
+ */
+#ifndef _GL_ATTRIBUTE_NOTHROW
+# if defined __cplusplus
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major >= 4
+#   if __cplusplus >= 201103L
+#    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
+#   else
+#    define _GL_ATTRIBUTE_NOTHROW throw ()
+#   endif
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# else
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__
+#   define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__))
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# endif
+#endif
+
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
 /* The definition of _GL_ARG_NONNULL is copied here.  */
@@ -181,7 +217,11 @@
 # if (@REPLACE_FREE@ && !defined free \
       && !(defined __cplusplus && defined GNULIB_NAMESPACE))
 /* We can't do '#define free rpl_free' here.  */
+#  if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
+_GL_EXTERN_C void rpl_free (void *) _GL_ATTRIBUTE_NOTHROW;
+#  else
 _GL_EXTERN_C void rpl_free (void *);
+#  endif
 #  undef _GL_ATTRIBUTE_DEALLOC_FREE
 #  define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (rpl_free, 1)
 # else
@@ -193,7 +233,7 @@
      void __cdecl free (void *);
 #  else
 #   if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
-_GL_EXTERN_C void free (void *) throw ();
+_GL_EXTERN_C void free (void *) _GL_ATTRIBUTE_NOTHROW;
 #   else
 _GL_EXTERN_C void free (void *);
 #   endif
@@ -208,13 +248,20 @@
      void __cdecl free (void *);
 # else
 #  if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
-_GL_EXTERN_C void free (void *) throw ();
+_GL_EXTERN_C void free (void *) _GL_ATTRIBUTE_NOTHROW;
 #  else
 _GL_EXTERN_C void free (void *);
 #  endif
 # endif
 #endif
 
+
+#if @GNULIB_MBSZERO@
+/* Get memset().  */
+# include <string.h>
+#endif
+
+
 /* Convert a single-byte character to a wide character.  */
 #if @GNULIB_BTOWC@
 # if @REPLACE_BTOWC@
@@ -271,7 +318,7 @@
 #endif
 
 
-/* Test whether *PS is in the initial state.  */
+/* Test whether *PS is in an initial state.  */
 #if @GNULIB_MBSINIT@
 # if @REPLACE_MBSINIT@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -298,6 +345,208 @@
 #endif
 
 
+/* Put *PS into an initial state.  */
+#if @GNULIB_MBSZERO@
+/* ISO C 23 § 7.31.6.(3) says that zeroing an mbstate_t is a way to put the
+   mbstate_t into an initial state.  However, on many platforms an mbstate_t
+   is large, and it is possible - as an optimization - to get away with zeroing
+   only part of it.  So, instead of
+
+        mbstate_t state = { 0 };
+
+   or
+
+        mbstate_t state;
+        memset (&state, 0, sizeof (mbstate_t));
+
+   we can write this faster code:
+
+        mbstate_t state;
+        mbszero (&state);
+ */
+/* _GL_MBSTATE_INIT_SIZE describes how mbsinit() behaves: It is the number of
+   bytes at the beginning of an mbstate_t that need to be zero, for mbsinit()
+   to return true.
+   _GL_MBSTATE_ZERO_SIZE is the number of bytes at the beginning of an mbstate_t
+   that need to be zero,
+     - for mbsinit() to return true, and
+     - for all other multibyte-aware functions to operate properly.
+   0 < _GL_MBSTATE_INIT_SIZE <= _GL_MBSTATE_ZERO_SIZE <= sizeof (mbstate_t).
+   These values are determined by source code inspection, where possible, and
+   by running the gnulib unit tests.
+   We need _GL_MBSTATE_INIT_SIZE because if we define _GL_MBSTATE_ZERO_SIZE
+   without considering what mbsinit() does, we get test failures such as
+     assertion "mbsinit (&iter->state)" failed
+ */
+# if GNULIB_defined_mbstate_t                             /* AIX, IRIX */
+/* mbstate_t has at least 4 bytes.  They are used as coded in
+   gnulib/lib/mbrtowc.c.  */
+#  define _GL_MBSTATE_INIT_SIZE 1
+/* define _GL_MBSTATE_ZERO_SIZE 4
+   does not work: it causes test failures.
+   So, use the safe fallback value, below.  */
+# elif __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2             /* glibc */
+/* mbstate_t is defined in <bits/types/__mbstate_t.h>.
+   For more details, see glibc/iconv/skeleton.c.  */
+#  define _GL_MBSTATE_INIT_SIZE 4 /* sizeof (((mbstate_t) {0}).__count) */
+#  define _GL_MBSTATE_ZERO_SIZE /* 8 */ sizeof (mbstate_t)
+# elif defined MUSL_LIBC                                  /* musl libc */
+/* mbstate_t is defined in <bits/alltypes.h>.
+   It is an opaque aligned 8-byte struct, of which at most the first
+   4 bytes are used.
+   For more details, see src/multibyte/mbrtowc.c.  */
+#  define _GL_MBSTATE_INIT_SIZE 4 /* sizeof (unsigned) */
+#  define _GL_MBSTATE_ZERO_SIZE 4
+# elif defined __APPLE__ && defined __MACH__              /* macOS */
+/* On macOS, mbstate_t is defined in <machine/_types.h>.
+   It is an opaque aligned 128-byte struct, of which at most the first
+   12 bytes are used.
+   For more details, see the __mbsinit implementations in
+   Libc-<version>/locale/FreeBSD/
+   {ascii,none,euc,mskanji,big5,gb2312,gbk,gb18030,utf8,utf2}.c.  */
+/* File       INIT_SIZE  ZERO_SIZE
+   ascii.c        0          0
+   none.c         0          0
+   euc.c         12         12
+   mskanji.c      4          4
+   big5.c         4          4
+   gb2312.c       4          6
+   gbk.c          4          4
+   gb18030.c      4          8
+   utf8.c         8         10
+   utf2.c         8         12 */
+#  define _GL_MBSTATE_INIT_SIZE 12
+#  define _GL_MBSTATE_ZERO_SIZE 12
+# elif defined __FreeBSD__                                /* FreeBSD */
+/* On FreeBSD, mbstate_t is defined in src/sys/sys/_types.h.
+   It is an opaque aligned 128-byte struct, of which at most the first
+   12 bytes are used.
+   For more details, see the __mbsinit implementations in
+   src/lib/libc/locale/
+   {ascii,none,euc,mskanji,big5,gb2312,gbk,gb18030,utf8}.c.  */
+/* File       INIT_SIZE  ZERO_SIZE
+   ascii.c        0          0
+   none.c         0          0
+   euc.c         12         12
+   mskanji.c      4          4
+   big5.c         4          4
+   gb2312.c       4          6
+   gbk.c          4          4
+   gb18030.c      4          8
+   utf8.c         8         12 */
+#  define _GL_MBSTATE_INIT_SIZE 12
+#  define _GL_MBSTATE_ZERO_SIZE 12
+# elif defined __NetBSD__                                 /* NetBSD */
+/* On NetBSD, mbstate_t is defined in src/sys/sys/ansi.h.
+   It is an opaque aligned 128-byte struct, of which at most the first
+   28 bytes are used.
+   For more details, see the *State types in
+   src/lib/libc/citrus/modules/citrus_*.c
+   (ignoring citrus_{hz,iso2022,utf7,viqr,zw}.c, since these implement
+   stateful encodings, not usable as locale encodings).  */
+/* File                                ZERO_SIZE
+   citrus/citrus_none.c                    0
+   citrus/modules/citrus_euc.c             8
+   citrus/modules/citrus_euctw.c           8
+   citrus/modules/citrus_mskanji.c         8
+   citrus/modules/citrus_big5.c            8
+   citrus/modules/citrus_gbk2k.c           8
+   citrus/modules/citrus_dechanyu.c        8
+   citrus/modules/citrus_johab.c           6
+   citrus/modules/citrus_utf8.c           12 */
+/* But 12 is not the correct value for _GL_MBSTATE_ZERO_SIZE: we get test
+   failures for values < 28.  */
+#  define _GL_MBSTATE_ZERO_SIZE 28
+# elif defined __OpenBSD__                                /* OpenBSD */
+/* On OpenBSD, mbstate_t is defined in src/sys/sys/_types.h.
+   It is an opaque aligned 128-byte struct, of which at most the first
+   12 bytes are used.
+   For more details, see src/lib/libc/citrus/citrus_*.c.  */
+/* File           INIT_SIZE  ZERO_SIZE
+   citrus_none.c      0          0
+   citrus_utf8.c     12         12 */
+#  define _GL_MBSTATE_INIT_SIZE 12
+#  define _GL_MBSTATE_ZERO_SIZE 12
+# elif defined __minix                                    /* Minix */
+/* On Minix, mbstate_t is defined in sys/sys/ansi.h.
+   It is an opaque aligned 128-byte struct.
+   For more details, see the *State types in
+   lib/libc/citrus/citrus_*.c.  */
+/* File           INIT_SIZE  ZERO_SIZE
+   citrus_none.c      0          0 */
+/* But 1 is not the correct value for _GL_MBSTATE_ZERO_SIZE: we get test
+   failures for values < 4.  */
+#  define _GL_MBSTATE_ZERO_SIZE 4
+# elif defined __sun                                      /* Solaris */
+/* On Solaris, mbstate_t is defined in <wchar_impl.h>.
+   It is an opaque aligned 24-byte or 32-byte struct, of which at most the first
+   20 or 28 bytes are used.
+   For more details on OpenSolaris derivatives, see the *State types in
+   illumos-gate/usr/src/lib/libc/port/locale/
+   {none,euc,mskanji,big5,gb2312,gbk,gb18030,utf8}.c.  */
+/* File       INIT_SIZE  ZERO_SIZE
+   none.c         0          0
+   euc.c         12         12
+   mskanji.c      4          4
+   big5.c         4          4
+   gb2312.c       4          6
+   gbk.c          4          4
+   gb18030.c      4          8
+   utf8.c        12         12 */
+/* But 12 is not the correct value for _GL_MBSTATE_ZERO_SIZE: we get test
+   failures
+     - in OpenIndiana and OmniOS: for values < 16,
+     - in Solaris 10 and 11: for values < 20 (in 32-bit mode)
+       or < 28 (in 64-bit mode).
+   Since we don't have a good way to distinguish the OpenSolaris derivatives
+   from the proprietary Solaris versions, and can't inspect the Solaris source
+   code, use the safe fallback values, below.  */
+# elif defined __CYGWIN__                                 /* Cygwin */
+/* On Cygwin, mbstate_t is defined in <sys/_types.h>.
+   For more details, see newlib/libc/stdlib/mbtowc_r.c and
+   winsup/cygwin/strfuncs.cc.  */
+#  define _GL_MBSTATE_INIT_SIZE 4 /* sizeof (int) */
+#  define _GL_MBSTATE_ZERO_SIZE 8
+# elif defined _WIN32 && !defined __CYGWIN__              /* Native Windows.  */
+/* MSVC defines 'mbstate_t' as an aligned 8-byte struct.
+   On mingw, 'mbstate_t' is sometimes defined as 'int', sometimes defined
+   as an aligned 8-byte struct, of which the first 4 bytes matter.
+   Use the safe values, below.  */
+# elif defined __ANDROID__                                /* Android */
+/* Android defines 'mbstate_t' in <bits/mbstate_t.h>.
+   It is an opaque 4-byte or 8-byte struct.
+   For more details, see
+   bionic/libc/private/bionic_mbstate.h
+   bionic/libc/bionic/mbrtoc32.cpp
+   bionic/libc/bionic/mbrtoc16.cpp
+ */
+#  define _GL_MBSTATE_INIT_SIZE 4
+#  define _GL_MBSTATE_ZERO_SIZE 4
+# endif
+/* Use safe values as defaults.  */
+# ifndef _GL_MBSTATE_INIT_SIZE
+#  define _GL_MBSTATE_INIT_SIZE sizeof (mbstate_t)
+# endif
+# ifndef _GL_MBSTATE_ZERO_SIZE
+#  define _GL_MBSTATE_ZERO_SIZE sizeof (mbstate_t)
+# endif
+_GL_BEGIN_C_LINKAGE
+# if defined IN_MBSZERO
+_GL_EXTERN_INLINE
+# else
+_GL_INLINE
+# endif
+_GL_ARG_NONNULL ((1)) void
+mbszero (mbstate_t *ps)
+{
+  memset (ps, 0, _GL_MBSTATE_ZERO_SIZE);
+}
+_GL_END_C_LINKAGE
+_GL_CXXALIAS_SYS (mbszero, void, (mbstate_t *ps));
+_GL_CXXALIASWARN (mbszero);
+#endif
+
+
 /* Convert a multibyte character to a wide character.  */
 #if @GNULIB_MBRTOWC@
 # if @REPLACE_MBRTOWC@
@@ -434,7 +683,9 @@
                    const char **restrict srcp, size_t srclen, size_t len,
                    mbstate_t *restrict ps));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (mbsnrtowcs);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef mbsnrtowcs
 # if HAVE_RAW_DECL_MBSNRTOWCS
@@ -622,13 +873,25 @@
 
 /* Compare N wide characters of S1 and S2.  */
 #if @GNULIB_WMEMCMP@
-# if !@HAVE_WMEMCMP@
+# if @REPLACE_WMEMCMP@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wmemcmp
+#   define wmemcmp rpl_wmemcmp
+#  endif
+_GL_FUNCDECL_RPL (wmemcmp, int,
+                  (const wchar_t *s1, const wchar_t *s2, size_t n)
+                  _GL_ATTRIBUTE_PURE);
+_GL_CXXALIAS_RPL (wmemcmp, int,
+                  (const wchar_t *s1, const wchar_t *s2, size_t n));
+# else
+#  if !@HAVE_WMEMCMP@
 _GL_FUNCDECL_SYS (wmemcmp, int,
                   (const wchar_t *s1, const wchar_t *s2, size_t n)
                   _GL_ATTRIBUTE_PURE);
-# endif
+#  endif
 _GL_CXXALIAS_SYS (wmemcmp, int,
                   (const wchar_t *s1, const wchar_t *s2, size_t n));
+# endif
 # if __GLIBC__ >= 2
 _GL_CXXALIASWARN (wmemcmp);
 # endif
@@ -687,14 +950,27 @@
 /* Copy N wide characters of SRC to DEST.
    Return pointer to wide characters after the last written wide character.  */
 #if @GNULIB_WMEMPCPY@
-# if !@HAVE_WMEMPCPY@
+# if @REPLACE_WMEMPCPY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wmempcpy
+#   define wmempcpy rpl_wmempcpy
+#  endif
+_GL_FUNCDECL_RPL (wmempcpy, wchar_t *,
+                  (wchar_t *restrict dest,
+                   const wchar_t *restrict src, size_t n));
+_GL_CXXALIAS_RPL (wmempcpy, wchar_t *,
+                  (wchar_t *restrict dest,
+                   const wchar_t *restrict src, size_t n));
+# else
+#  if !@HAVE_WMEMPCPY@
 _GL_FUNCDECL_SYS (wmempcpy, wchar_t *,
                   (wchar_t *restrict dest,
                    const wchar_t *restrict src, size_t n));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (wmempcpy, wchar_t *,
                   (wchar_t *restrict dest,
                    const wchar_t *restrict src, size_t n));
+# endif
 # if __GLIBC__ >= 2
 _GL_CXXALIASWARN (wmempcpy);
 # endif
@@ -894,11 +1170,21 @@
 
 /* Compare S1 and S2.  */
 #if @GNULIB_WCSCMP@
-# if !@HAVE_WCSCMP@
+# if @REPLACE_WCSCMP@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wcscmp
+#   define wcscmp rpl_wcscmp
+#  endif
+_GL_FUNCDECL_RPL (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)
+                               _GL_ATTRIBUTE_PURE);
+_GL_CXXALIAS_RPL (wcscmp, int, (const wchar_t *s1, const wchar_t *s2));
+# else
+#  if !@HAVE_WCSCMP@
 _GL_FUNCDECL_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)
                                _GL_ATTRIBUTE_PURE);
-# endif
+#  endif
 _GL_CXXALIAS_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2));
+# endif
 # if __GLIBC__ >= 2
 _GL_CXXALIASWARN (wcscmp);
 # endif
@@ -913,13 +1199,25 @@
 
 /* Compare no more than N wide characters of S1 and S2.  */
 #if @GNULIB_WCSNCMP@
-# if !@HAVE_WCSNCMP@
+# if @REPLACE_WCSNCMP@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wcsncmp
+#   define wcsncmp rpl_wcsncmp
+#  endif
+_GL_FUNCDECL_RPL (wcsncmp, int,
+                  (const wchar_t *s1, const wchar_t *s2, size_t n)
+                  _GL_ATTRIBUTE_PURE);
+_GL_CXXALIAS_RPL (wcsncmp, int,
+                  (const wchar_t *s1, const wchar_t *s2, size_t n));
+# else
+#  if !@HAVE_WCSNCMP@
 _GL_FUNCDECL_SYS (wcsncmp, int,
                   (const wchar_t *s1, const wchar_t *s2, size_t n)
                   _GL_ATTRIBUTE_PURE);
-# endif
+#  endif
 _GL_CXXALIAS_SYS (wcsncmp, int,
                   (const wchar_t *s1, const wchar_t *s2, size_t n));
+# endif
 # if __GLIBC__ >= 2
 _GL_CXXALIASWARN (wcsncmp);
 # endif
@@ -1028,9 +1326,16 @@
    namespace, not in the global namespace.  So, force a declaration in
    the global namespace.  */
 #  if !@HAVE_WCSDUP@ || (defined __sun && defined __cplusplus) || __GNUC__ >= 11
+#   if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
 _GL_FUNCDECL_SYS (wcsdup, wchar_t *,
                   (const wchar_t *s)
+                  _GL_ATTRIBUTE_NOTHROW
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   else
+_GL_FUNCDECL_SYS (wcsdup, wchar_t *,
+                  (const wchar_t *s)
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   endif
 #  endif
 _GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s));
 # endif
@@ -1038,9 +1343,16 @@
 #else
 # if __GNUC__ >= 11 && !defined wcsdup
 /* For -Wmismatched-dealloc: Associate wcsdup with free or rpl_free.  */
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
 _GL_FUNCDECL_SYS (wcsdup, wchar_t *,
                   (const wchar_t *s)
+                  _GL_ATTRIBUTE_NOTHROW
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  else
+_GL_FUNCDECL_SYS (wcsdup, wchar_t *,
+                  (const wchar_t *s)
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef wcsdup
@@ -1059,9 +1371,16 @@
 #   endif
 _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s));
 #  else
+#   if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
 _GL_FUNCDECL_SYS (wcsdup, wchar_t *,
                   (const wchar_t *s)
+                  _GL_ATTRIBUTE_NOTHROW
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   else
+_GL_FUNCDECL_SYS (wcsdup, wchar_t *,
+                  (const wchar_t *s)
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   endif
 #   if @HAVE_DECL_WCSDUP@
 _GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s));
 #   endif
@@ -1133,7 +1452,7 @@
 #endif
 
 
-/* Return the length of the initial segmet of WCS which consists entirely
+/* Return the length of the initial segment of WCS which consists entirely
    of wide characters not in REJECT.  */
 #if @GNULIB_WCSCSPN@
 # if !@HAVE_WCSCSPN@
@@ -1153,7 +1472,7 @@
 #endif
 
 
-/* Return the length of the initial segmet of WCS which consists entirely
+/* Return the length of the initial segment of WCS which consists entirely
    of wide characters in ACCEPT.  */
 #if @GNULIB_WCSSPN@
 # if !@HAVE_WCSSPN@
@@ -1208,12 +1527,25 @@
 
 /* Find the first occurrence of NEEDLE in HAYSTACK.  */
 #if @GNULIB_WCSSTR@
-# if !@HAVE_WCSSTR@
+# if @REPLACE_WCSSTR@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wcsstr
+#   define wcsstr rpl_wcsstr
+#  endif
+_GL_FUNCDECL_RPL (wcsstr, wchar_t *,
+                  (const wchar_t *restrict haystack,
+                   const wchar_t *restrict needle)
+                  _GL_ATTRIBUTE_PURE);
+_GL_CXXALIAS_RPL (wcsstr, wchar_t *,
+                  (const wchar_t *restrict haystack,
+                   const wchar_t *restrict needle));
+# else
+#  if !@HAVE_WCSSTR@
 _GL_FUNCDECL_SYS (wcsstr, wchar_t *,
                   (const wchar_t *restrict haystack,
                    const wchar_t *restrict needle)
                   _GL_ATTRIBUTE_PURE);
-# endif
+#  endif
   /* On some systems, this function is defined as an overloaded function:
        extern "C++" {
          const wchar_t * std::wcsstr (const wchar_t *, const wchar_t *);
@@ -1224,6 +1556,7 @@
                         (const wchar_t *restrict, const wchar_t *restrict),
                         const wchar_t *,
                         (const wchar_t *restrict, const wchar_t *restrict));
+# endif
 # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (wcsstr, wchar_t *,
@@ -1351,6 +1684,24 @@
 #endif
 
 
+#if @GNULIB_WGETCWD@ && (defined _WIN32 && !defined __CYGWIN__)
+/* Gets the name of the current working directory.
+   (a) If BUF is non-NULL, it is assumed to have room for SIZE wide characters.
+       This function stores the working directory (NUL-terminated) in BUF and
+       returns BUF.
+   (b) If BUF is NULL, an array is allocated with 'malloc'.  The array is SIZE
+       wide characters long, unless SIZE == 0, in which case it is as big as
+       necessary.
+   If the directory couldn't be determined or SIZE was too small, this function
+   returns NULL and sets errno.  For a directory of length LEN, SIZE should be
+   >= LEN + 3 in case (a) or >= LEN + 1 in case (b).
+   Possible errno values include:
+     - ERANGE if SIZE is too small.
+     - ENOMEM if the memory could no be allocated.  */
+_GL_FUNCDECL_SYS (wgetcwd, wchar_t *, (wchar_t *buf, size_t size));
+#endif
+
+
 #endif /* _@GUARD_PREFIX@_WCHAR_H */
 #endif /* _@GUARD_PREFIX@_WCHAR_H */
 #endif

Changes of Revision 2