Merge tag 'upstream/0.9.6+really0.9.6'

Upstream version 0.9.6+really0.9.6

1 files changed, 1113 insertions, 607 deletions

diff --git a/gnulib-m4/gnulib-comp.m4 b/gnulib-m4/gnulib-comp.m4
index 21284a4..cab72bd 100644
--- a/gnulib-m4/gnulib-comp.m4
+++ b/gnulib-m4/gnulib-comp.m4
@@ -1,10 +1,22 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2010 Free Software Foundation, Inc.
+# Copyright (C) 2002-2015 Free Software Foundation, Inc.
 #
-# This file is free software, distributed under the terms of the GNU
-# General Public License.  As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
+# 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 Free Software Foundation; either version 3 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License,
+# this file may be distributed as part of a program that
+# contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
@@ -12,7 +24,8 @@
 # This file represents the compiled summary of the specification in
 # gnulib-cache.m4. It lists the computed macro invocations that need
 # to be invoked from configure.ac.
-# In projects using CVS, this file can be treated like other built files.
+# In projects that use version control, this file can be treated like
+# other built files.
 
 
 # This macro should be invoked from ./configure.ac, in the section
@@ -24,14 +37,16 @@ AC_DEFUN([gl_EARLY],
   m4_pattern_allow([^gl_ES$])dnl a valid locale name
   m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
   m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
-  AC_REQUIRE([AC_PROG_RANLIB])
+  AC_REQUIRE([gl_PROG_AR_RANLIB])
   AC_REQUIRE([AM_PROG_CC_C_O])
+  # Code from module absolute-header:
   # Code from module alloca-opt:
   # Code from module alloca-opt-tests:
-  # Code from module arg-nonnull:
+  # Code from module amemxfrm:
   # Code from module array-mergesort:
   # Code from module array-mergesort-tests:
-  # Code from module c++defs:
+  # Code from module btowc:
+  # Code from module btowc-tests:
   # Code from module c-ctype:
   # Code from module c-ctype-tests:
   # Code from module c-strcase:
@@ -46,14 +61,24 @@ AC_DEFUN([gl_EARLY],
   # Code from module exitfail:
   # Code from module extensions:
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  # Code from module extern-inline:
+  # Code from module fdopen:
+  # Code from module fdopen-tests:
+  # Code from module fgetc-tests:
   # Code from module float:
+  # Code from module float-tests:
   # Code from module fpieee:
   AC_REQUIRE([gl_FP_IEEE])
   # Code from module fpucw:
+  # Code from module fputc-tests:
+  # Code from module fread-tests:
+  # Code from module frexp-nolibm:
+  # Code from module frexp-nolibm-tests:
   # Code from module frexpl-nolibm:
   # Code from module frexpl-nolibm-tests:
   # Code from module fseterr:
   # Code from module fseterr-tests:
+  # Code from module fwrite-tests:
   # Code from module getpagesize:
   # Code from module gettext-h:
   # Code from module gperf:
@@ -66,12 +91,20 @@ AC_DEFUN([gl_EARLY],
   # Code from module include_next:
   # Code from module inline:
   # Code from module intprops:
+  # Code from module intprops-tests:
+  # Code from module inttypes:
+  # Code from module inttypes-incomplete:
+  # Code from module inttypes-tests:
   # Code from module isnand-nolibm:
   # Code from module isnand-nolibm-tests:
   # Code from module isnanf-nolibm:
   # Code from module isnanf-nolibm-tests:
   # Code from module isnanl-nolibm:
   # Code from module isnanl-nolibm-tests:
+  # Code from module iswblank:
+  # Code from module iswblank-tests:
+  # Code from module langinfo:
+  # Code from module langinfo-tests:
   # Code from module localcharset:
   # Code from module locale:
   # Code from module locale-tests:
@@ -91,11 +124,13 @@ AC_DEFUN([gl_EARLY],
   # Code from module mbsinit:
   # Code from module mbsinit-tests:
   # Code from module mbsnlen:
+  # Code from module mbtowc:
   # Code from module memchr:
   # Code from module memchr-tests:
   # Code from module memcmp2:
-  # Code from module memxfrm:
   # Code from module minmax:
+  # Code from module msvc-inval:
+  # Code from module msvc-nothrow:
   # Code from module multiarch:
   # Code from module nocrash:
   # Code from module printf-frexp:
@@ -108,19 +143,32 @@ AC_DEFUN([gl_EARLY],
   # Code from module relocatable-lib-lgpl:
   # Code from module setenv:
   # Code from module setenv-tests:
+  # Code from module setlocale:
+  # Code from module setlocale-tests:
   # Code from module signbit:
   # Code from module signbit-tests:
   # Code from module size_max:
+  # Code from module snippet/_Noreturn:
+  # Code from module snippet/arg-nonnull:
+  # Code from module snippet/c++defs:
+  # Code from module snippet/unused-parameter:
+  # Code from module snippet/warn-on-use:
+  # Code from module ssize_t:
+  # Code from module stdalign:
+  # Code from module stdalign-tests:
   # Code from module stdbool:
   # Code from module stdbool-tests:
   # Code from module stddef:
   # Code from module stddef-tests:
   # Code from module stdint:
   # Code from module stdint-tests:
+  # Code from module stdio:
+  # Code from module stdio-tests:
   # Code from module stdlib:
   # Code from module stdlib-tests:
   # Code from module streq:
   # Code from module strerror:
+  # Code from module strerror-override:
   # Code from module strerror-tests:
   # Code from module striconveh:
   # Code from module striconveh-tests:
@@ -130,7 +178,15 @@ AC_DEFUN([gl_EARLY],
   # Code from module string-tests:
   # Code from module strncat:
   # Code from module strncat-tests:
+  # Code from module strstr:
+  # Code from module strstr-simple:
+  # Code from module strstr-tests:
+  # Code from module sys_types:
+  # Code from module sys_types-tests:
+  # Code from module test-framework-sh:
+  # Code from module test-framework-sh-tests:
   # Code from module thread:
+  # Code from module thread-tests:
   # Code from module threadlib:
   gl_THREADLIB_EARLY
   # Code from module unicase/base:
@@ -274,15 +330,17 @@ AC_DEFUN([gl_EARLY],
   # Code from module uniconv/u8-strconv-to-enc-tests:
   # Code from module uniconv/u8-strconv-to-locale:
   # Code from module unictype/base:
-  # Code from module unictype/bidicategory-all:
-  # Code from module unictype/bidicategory-byname:
-  # Code from module unictype/bidicategory-byname-tests:
-  # Code from module unictype/bidicategory-name:
-  # Code from module unictype/bidicategory-name-tests:
-  # Code from module unictype/bidicategory-of:
-  # Code from module unictype/bidicategory-of-tests:
-  # Code from module unictype/bidicategory-test:
-  # Code from module unictype/bidicategory-test-tests:
+  # Code from module unictype/bidiclass-all:
+  # Code from module unictype/bidiclass-byname:
+  # Code from module unictype/bidiclass-byname-tests:
+  # Code from module unictype/bidiclass-longname:
+  # Code from module unictype/bidiclass-longname-tests:
+  # Code from module unictype/bidiclass-name:
+  # Code from module unictype/bidiclass-name-tests:
+  # Code from module unictype/bidiclass-of:
+  # Code from module unictype/bidiclass-of-tests:
+  # Code from module unictype/bidiclass-test:
+  # Code from module unictype/bidiclass-test-tests:
   # Code from module unictype/block-all:
   # Code from module unictype/block-list:
   # Code from module unictype/block-list-tests:
@@ -304,6 +362,8 @@ AC_DEFUN([gl_EARLY],
   # Code from module unictype/category-Cs-tests:
   # Code from module unictype/category-L:
   # Code from module unictype/category-L-tests:
+  # Code from module unictype/category-LC:
+  # Code from module unictype/category-LC-tests:
   # Code from module unictype/category-Ll:
   # Code from module unictype/category-Ll-tests:
   # Code from module unictype/category-Lm:
@@ -371,6 +431,8 @@ AC_DEFUN([gl_EARLY],
   # Code from module unictype/category-and-tests:
   # Code from module unictype/category-byname:
   # Code from module unictype/category-byname-tests:
+  # Code from module unictype/category-longname:
+  # Code from module unictype/category-longname-tests:
   # Code from module unictype/category-name:
   # Code from module unictype/category-name-tests:
   # Code from module unictype/category-none:
@@ -383,6 +445,13 @@ AC_DEFUN([gl_EARLY],
   # Code from module unictype/category-test-withtable:
   # Code from module unictype/category-test-withtable-tests:
   # Code from module unictype/combining-class:
+  # Code from module unictype/combining-class-all:
+  # Code from module unictype/combining-class-byname:
+  # Code from module unictype/combining-class-byname-tests:
+  # Code from module unictype/combining-class-longname:
+  # Code from module unictype/combining-class-longname-tests:
+  # Code from module unictype/combining-class-name:
+  # Code from module unictype/combining-class-name-tests:
   # Code from module unictype/combining-class-tests:
   # Code from module unictype/ctype-alnum:
   # Code from module unictype/ctype-alnum-tests:
@@ -412,6 +481,22 @@ AC_DEFUN([gl_EARLY],
   # Code from module unictype/decimal-digit-tests:
   # Code from module unictype/digit:
   # Code from module unictype/digit-tests:
+  # Code from module unictype/joininggroup-all:
+  # Code from module unictype/joininggroup-byname:
+  # Code from module unictype/joininggroup-byname-tests:
+  # Code from module unictype/joininggroup-name:
+  # Code from module unictype/joininggroup-name-tests:
+  # Code from module unictype/joininggroup-of:
+  # Code from module unictype/joininggroup-of-tests:
+  # Code from module unictype/joiningtype-all:
+  # Code from module unictype/joiningtype-byname:
+  # Code from module unictype/joiningtype-byname-tests:
+  # Code from module unictype/joiningtype-longname:
+  # Code from module unictype/joiningtype-longname-tests:
+  # Code from module unictype/joiningtype-name:
+  # Code from module unictype/joiningtype-name-tests:
+  # Code from module unictype/joiningtype-of:
+  # Code from module unictype/joiningtype-of-tests:
   # Code from module unictype/mirror:
   # Code from module unictype/mirror-tests:
   # Code from module unictype/numeric:
@@ -457,6 +542,20 @@ AC_DEFUN([gl_EARLY],
   # Code from module unictype/property-bidi-whitespace-tests:
   # Code from module unictype/property-byname:
   # Code from module unictype/property-byname-tests:
+  # Code from module unictype/property-case-ignorable:
+  # Code from module unictype/property-case-ignorable-tests:
+  # Code from module unictype/property-cased:
+  # Code from module unictype/property-cased-tests:
+  # Code from module unictype/property-changes-when-casefolded:
+  # Code from module unictype/property-changes-when-casefolded-tests:
+  # Code from module unictype/property-changes-when-casemapped:
+  # Code from module unictype/property-changes-when-casemapped-tests:
+  # Code from module unictype/property-changes-when-lowercased:
+  # Code from module unictype/property-changes-when-lowercased-tests:
+  # Code from module unictype/property-changes-when-titlecased:
+  # Code from module unictype/property-changes-when-titlecased-tests:
+  # Code from module unictype/property-changes-when-uppercased:
+  # Code from module unictype/property-changes-when-uppercased-tests:
   # Code from module unictype/property-combining:
   # Code from module unictype/property-combining-tests:
   # Code from module unictype/property-composite:
@@ -590,6 +689,31 @@ AC_DEFUN([gl_EARLY],
   # Code from module unictype/syntax-java-ident-tests:
   # Code from module unictype/syntax-java-whitespace:
   # Code from module unictype/syntax-java-whitespace-tests:
+  # Code from module unigbrk/base:
+  # Code from module unigbrk/u16-grapheme-breaks:
+  # Code from module unigbrk/u16-grapheme-breaks-tests:
+  # Code from module unigbrk/u16-grapheme-next:
+  # Code from module unigbrk/u16-grapheme-next-tests:
+  # Code from module unigbrk/u16-grapheme-prev:
+  # Code from module unigbrk/u16-grapheme-prev-tests:
+  # Code from module unigbrk/u32-grapheme-breaks:
+  # Code from module unigbrk/u32-grapheme-breaks-tests:
+  # Code from module unigbrk/u32-grapheme-next:
+  # Code from module unigbrk/u32-grapheme-next-tests:
+  # Code from module unigbrk/u32-grapheme-prev:
+  # Code from module unigbrk/u32-grapheme-prev-tests:
+  # Code from module unigbrk/u8-grapheme-breaks:
+  # Code from module unigbrk/u8-grapheme-breaks-tests:
+  # Code from module unigbrk/u8-grapheme-next:
+  # Code from module unigbrk/u8-grapheme-next-tests:
+  # Code from module unigbrk/u8-grapheme-prev:
+  # Code from module unigbrk/u8-grapheme-prev-tests:
+  # Code from module unigbrk/uc-gbrk-prop:
+  # Code from module unigbrk/uc-gbrk-prop-tests:
+  # Code from module unigbrk/uc-is-grapheme-break:
+  # Code from module unigbrk/uc-is-grapheme-break-tests:
+  # Code from module unigbrk/ulc-grapheme-breaks:
+  # Code from module unigbrk/ulc-grapheme-breaks-tests:
   # Code from module unilbrk/base:
   # Code from module unilbrk/tables:
   # Code from module unilbrk/u16-possible-linebreaks:
@@ -779,6 +903,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module unistr/u16-strcat:
   # Code from module unistr/u16-strcat-tests:
   # Code from module unistr/u16-strchr:
+  # Code from module unistr/u16-strchr-tests:
   # Code from module unistr/u16-strcmp:
   # Code from module unistr/u16-strcmp-tests:
   # Code from module unistr/u16-strcoll:
@@ -806,7 +931,9 @@ AC_DEFUN([gl_EARLY],
   # Code from module unistr/u16-strrchr:
   # Code from module unistr/u16-strspn:
   # Code from module unistr/u16-strstr:
+  # Code from module unistr/u16-strstr-tests:
   # Code from module unistr/u16-strtok:
+  # Code from module unistr/u16-strtok-tests:
   # Code from module unistr/u16-to-u32:
   # Code from module unistr/u16-to-u32-tests:
   # Code from module unistr/u16-to-u8:
@@ -852,6 +979,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module unistr/u32-strcat:
   # Code from module unistr/u32-strcat-tests:
   # Code from module unistr/u32-strchr:
+  # Code from module unistr/u32-strchr-tests:
   # Code from module unistr/u32-strcmp:
   # Code from module unistr/u32-strcmp-tests:
   # Code from module unistr/u32-strcoll:
@@ -879,7 +1007,9 @@ AC_DEFUN([gl_EARLY],
   # Code from module unistr/u32-strrchr:
   # Code from module unistr/u32-strspn:
   # Code from module unistr/u32-strstr:
+  # Code from module unistr/u32-strstr-tests:
   # Code from module unistr/u32-strtok:
+  # Code from module unistr/u32-strtok-tests:
   # Code from module unistr/u32-to-u16:
   # Code from module unistr/u32-to-u16-tests:
   # Code from module unistr/u32-to-u8:
@@ -925,6 +1055,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module unistr/u8-strcat:
   # Code from module unistr/u8-strcat-tests:
   # Code from module unistr/u8-strchr:
+  # Code from module unistr/u8-strchr-tests:
   # Code from module unistr/u8-strcmp:
   # Code from module unistr/u8-strcmp-tests:
   # Code from module unistr/u8-strcoll:
@@ -952,7 +1083,9 @@ AC_DEFUN([gl_EARLY],
   # Code from module unistr/u8-strrchr:
   # Code from module unistr/u8-strspn:
   # Code from module unistr/u8-strstr:
+  # Code from module unistr/u8-strstr-tests:
   # Code from module unistr/u8-strtok:
+  # Code from module unistr/u8-strtok-tests:
   # Code from module unistr/u8-to-u16:
   # Code from module unistr/u8-to-u16-tests:
   # Code from module unistr/u8-to-u32:
@@ -988,19 +1121,22 @@ AC_DEFUN([gl_EARLY],
   # Code from module uniwidth/width-tests:
   # Code from module unsetenv:
   # Code from module unsetenv-tests:
-  # Code from module unused-parameter:
   # Code from module verify:
-  # Code from module warn-on-use:
+  # Code from module verify-tests:
   # Code from module wchar:
   # Code from module wchar-tests:
+  # Code from module wcrtomb:
+  # Code from module wcrtomb-tests:
   # Code from module wctob:
-  # Code from module wctype:
-  # Code from module wctype-tests:
+  # Code from module wctomb:
+  # Code from module wctype-h:
+  # Code from module wctype-h-tests:
   # Code from module wcwidth:
   # Code from module wcwidth-tests:
   # Code from module xalloc:
   # Code from module xalloc-die:
   # Code from module xalloc-die-tests:
+  # Code from module xalloc-oversized:
   # Code from module xsize:
   # Code from module yield:
 ])
@@ -1019,750 +1155,797 @@ AC_DEFUN([gl_INIT],
   m4_pushdef([gl_LIBSOURCES_DIR], [])
   gl_COMMON
   gl_source_base='lib'
-  # Code from module alloca-opt:
   gl_FUNC_ALLOCA
-  # Code from module arg-nonnull:
-  # Code from module array-mergesort:
-  # Code from module c++defs:
-  # Code from module c-ctype:
-  # Code from module c-strcase:
-  # Code from module c-strcaseeq:
-  # Code from module configmake:
-  # Code from module errno:
+  gl_CONFIGMAKE_PREP
   gl_HEADER_ERRNO_H
-  # Code from module extensions:
-  # Code from module float:
+  AC_REQUIRE([gl_EXTERN_INLINE])
   gl_FLOAT_H
-  # Code from module fpieee:
-  # Code from module fpucw:
-  # Code from module frexpl-nolibm:
+  if test $REPLACE_FLOAT_LDBL = 1; then
+    AC_LIBOBJ([float])
+  fi
+  if test $REPLACE_ITOLD = 1; then
+    AC_LIBOBJ([itold])
+  fi
+  gl_FUNC_FREXP_NO_LIBM
+  if test $gl_func_frexp_no_libm != yes; then
+    AC_LIBOBJ([frexp])
+  fi
+  gl_MATH_MODULE_INDICATOR([frexp])
   gl_FUNC_FREXPL_NO_LIBM
+  if test $HAVE_DECL_FREXPL = 0 || test $gl_func_frexpl_no_libm = no; then
+    AC_LIBOBJ([frexpl])
+  fi
   gl_MATH_MODULE_INDICATOR([frexpl])
-  # Code from module fseterr:
-  # Code from module gperf:
-  # Code from module havelib:
-  # Code from module iconv:
+  gl_FUNC_FSETERR
+  if test $ac_cv_func___fseterr = no; then
+    AC_LIBOBJ([fseterr])
+  fi
   AM_ICONV
-  # Code from module iconv-h:
+  m4_ifdef([gl_ICONV_MODULE_INDICATOR],
+    [gl_ICONV_MODULE_INDICATOR([iconv])])
   gl_ICONV_H
-  # Code from module iconv_open:
   gl_FUNC_ICONV_OPEN
-  # Code from module include_next:
-  # Code from module inline:
+  if test $REPLACE_ICONV_OPEN = 1; then
+    AC_LIBOBJ([iconv_open])
+  fi
+  if test $REPLACE_ICONV = 1; then
+    AC_LIBOBJ([iconv])
+    AC_LIBOBJ([iconv_close])
+  fi
   gl_INLINE
-  # Code from module isnand-nolibm:
   gl_FUNC_ISNAND_NO_LIBM
-  # Code from module isnanf-nolibm:
+  if test $gl_func_isnand_no_libm != yes; then
+    AC_LIBOBJ([isnand])
+    gl_PREREQ_ISNAND
+  fi
   gl_FUNC_ISNANF_NO_LIBM
-  # Code from module isnanl-nolibm:
+  if test $gl_func_isnanf_no_libm != yes; then
+    AC_LIBOBJ([isnanf])
+    gl_PREREQ_ISNANF
+  fi
   gl_FUNC_ISNANL_NO_LIBM
-  # Code from module localcharset:
+  if test $gl_func_isnanl_no_libm != yes; then
+    AC_LIBOBJ([isnanl])
+    gl_PREREQ_ISNANL
+  fi
+  gl_FUNC_ISWBLANK
+  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
+    :
+  else
+    if test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; then
+      AC_LIBOBJ([iswblank])
+    fi
+  fi
+  gl_WCTYPE_MODULE_INDICATOR([iswblank])
+  gl_LANGINFO_H
   gl_LOCALCHARSET
-  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\""
+  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
   AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
-  # Code from module localename:
   gl_LOCALENAME
-  # Code from module lock:
   gl_LOCK
-  # Code from module malloc-posix:
+  gl_MODULE_INDICATOR([lock])
   gl_FUNC_MALLOC_POSIX
+  if test $REPLACE_MALLOC = 1; then
+    AC_LIBOBJ([malloc])
+  fi
   gl_STDLIB_MODULE_INDICATOR([malloc-posix])
-  # Code from module malloca:
   gl_MALLOCA
-  # Code from module math:
   gl_MATH_H
-  # Code from module mbchar:
   gl_MBCHAR
-  # Code from module mbiter:
   gl_MBITER
-  # Code from module mbrtowc:
   gl_FUNC_MBRTOWC
+  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+    AC_LIBOBJ([mbrtowc])
+    gl_PREREQ_MBRTOWC
+  fi
   gl_WCHAR_MODULE_INDICATOR([mbrtowc])
-  # Code from module mbsinit:
   gl_FUNC_MBSINIT
+  if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
+    AC_LIBOBJ([mbsinit])
+    gl_PREREQ_MBSINIT
+  fi
   gl_WCHAR_MODULE_INDICATOR([mbsinit])
-  # Code from module mbsnlen:
   gl_STRING_MODULE_INDICATOR([mbsnlen])
-  # Code from module memchr:
   gl_FUNC_MEMCHR
+  if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
+    AC_LIBOBJ([memchr])
+    gl_PREREQ_MEMCHR
+  fi
   gl_STRING_MODULE_INDICATOR([memchr])
-  # Code from module memcmp2:
-  # Code from module memxfrm:
-  # Code from module minmax:
   gl_MINMAX
-  # Code from module multiarch:
   gl_MULTIARCH
-  # Code from module nocrash:
-  # Code from module printf-frexp:
   gl_FUNC_PRINTF_FREXP
-  # Code from module printf-frexpl:
   gl_FUNC_PRINTF_FREXPL
-  # Code from module printf-safe:
   m4_divert_text([INIT_PREPARE], [gl_printf_safe=yes])
-  # Code from module relocatable-lib-lgpl:
   gl_RELOCATABLE_LIBRARY
-  # Code from module signbit:
   gl_SIGNBIT
+  if test $REPLACE_SIGNBIT = 1; then
+    AC_LIBOBJ([signbitf])
+    AC_LIBOBJ([signbitd])
+    AC_LIBOBJ([signbitl])
+  fi
   gl_MATH_MODULE_INDICATOR([signbit])
-  # Code from module size_max:
   gl_SIZE_MAX
-  # Code from module stdbool:
+  gt_TYPE_SSIZE_T
   AM_STDBOOL_H
-  # Code from module stddef:
   gl_STDDEF_H
-  # Code from module stdint:
   gl_STDINT_H
-  # Code from module stdlib:
   gl_STDLIB_H
-  # Code from module streq:
-  # Code from module striconveh:
   if test $gl_cond_libtool = false; then
     gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV"
     gl_libdeps="$gl_libdeps $LIBICONV"
   fi
-  # Code from module striconveha:
-  # Code from module string:
   gl_HEADER_STRING_H
-  # Code from module strncat:
   gl_FUNC_STRNCAT
+  if test $REPLACE_STRNCAT = 1; then
+    AC_LIBOBJ([strncat])
+    gl_PREREQ_STRNCAT
+  fi
   gl_STRING_MODULE_INDICATOR([strncat])
-  # Code from module threadlib:
+  gl_FUNC_STRSTR
+  if test $REPLACE_STRSTR = 1; then
+    AC_LIBOBJ([strstr])
+  fi
+  gl_FUNC_STRSTR_SIMPLE
+  if test $REPLACE_STRSTR = 1; then
+    AC_LIBOBJ([strstr])
+  fi
+  gl_STRING_MODULE_INDICATOR([strstr])
+  gl_SYS_TYPES_H
+  AC_PROG_MKDIR_P
   gl_THREADLIB
-  # Code from module unicase/base:
-  # Code from module unicase/cased:
-  AC_REQUIRE([AC_C_INLINE])
-  # Code from module unicase/empty-prefix-context:
-  # Code from module unicase/empty-suffix-context:
-  # Code from module unicase/ignorable:
-  AC_REQUIRE([AC_C_INLINE])
-  # Code from module unicase/locale-language:
-  # Code from module unicase/special-casing:
-  # Code from module unicase/tocasefold:
-  # Code from module unicase/tolower:
-  # Code from module unicase/totitle:
-  # Code from module unicase/toupper:
-  # Code from module unicase/u16-casecmp:
-  # Code from module unicase/u16-casecoll:
-  # Code from module unicase/u16-casefold:
-  # Code from module unicase/u16-casemap:
-  # Code from module unicase/u16-casexfrm:
-  # Code from module unicase/u16-ct-casefold:
-  # Code from module unicase/u16-ct-tolower:
-  # Code from module unicase/u16-ct-totitle:
-  # Code from module unicase/u16-ct-toupper:
-  # Code from module unicase/u16-is-cased:
-  # Code from module unicase/u16-is-casefolded:
-  # Code from module unicase/u16-is-invariant:
-  # Code from module unicase/u16-is-lowercase:
-  # Code from module unicase/u16-is-titlecase:
-  # Code from module unicase/u16-is-uppercase:
-  # Code from module unicase/u16-tolower:
-  # Code from module unicase/u16-totitle:
-  # Code from module unicase/u16-toupper:
-  # Code from module unicase/u32-casecmp:
-  # Code from module unicase/u32-casecoll:
-  # Code from module unicase/u32-casefold:
-  # Code from module unicase/u32-casemap:
-  # Code from module unicase/u32-casexfrm:
-  # Code from module unicase/u32-ct-casefold:
-  # Code from module unicase/u32-ct-tolower:
-  # Code from module unicase/u32-ct-totitle:
-  # Code from module unicase/u32-ct-toupper:
-  # Code from module unicase/u32-is-cased:
-  # Code from module unicase/u32-is-casefolded:
-  # Code from module unicase/u32-is-invariant:
-  # Code from module unicase/u32-is-lowercase:
-  # Code from module unicase/u32-is-titlecase:
-  # Code from module unicase/u32-is-uppercase:
-  # Code from module unicase/u32-tolower:
-  # Code from module unicase/u32-totitle:
-  # Code from module unicase/u32-toupper:
-  # Code from module unicase/u8-casecmp:
-  # Code from module unicase/u8-casecoll:
-  # Code from module unicase/u8-casefold:
-  # Code from module unicase/u8-casemap:
-  # Code from module unicase/u8-casexfrm:
-  # Code from module unicase/u8-ct-casefold:
-  # Code from module unicase/u8-ct-tolower:
-  # Code from module unicase/u8-ct-totitle:
-  # Code from module unicase/u8-ct-toupper:
-  # Code from module unicase/u8-is-cased:
-  # Code from module unicase/u8-is-casefolded:
-  # Code from module unicase/u8-is-invariant:
-  # Code from module unicase/u8-is-lowercase:
-  # Code from module unicase/u8-is-titlecase:
-  # Code from module unicase/u8-is-uppercase:
-  # Code from module unicase/u8-tolower:
-  # Code from module unicase/u8-totitle:
-  # Code from module unicase/u8-toupper:
-  # Code from module unicase/ulc-casecmp:
-  # Code from module unicase/ulc-casecoll:
-  # Code from module unicase/ulc-casexfrm:
-  # Code from module uniconv/base:
-  # Code from module uniconv/u16-conv-from-enc:
+  gl_LIBUNISTRING_LIBHEADER([0.9.4], [unicase.h])
+  AC_REQUIRE([AC_C_INLINE])
+  gl_LIBUNISTRING_MODULE([0.9.1], [unicase/empty-prefix-context])
+  gl_LIBUNISTRING_MODULE([0.9.1], [unicase/empty-suffix-context])
+  AC_REQUIRE([AC_C_INLINE])
+  gl_LIBUNISTRING_MODULE([0.9.3], [unicase/locale-language])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/tolower])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/totitle])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/toupper])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u16-casecmp])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u16-casecoll])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u16-casefold])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u16-casexfrm])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u16-ct-casefold])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u16-ct-tolower])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u16-ct-totitle])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u16-ct-toupper])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u16-is-cased])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u16-is-casefolded])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u16-is-lowercase])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u16-is-titlecase])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u16-is-uppercase])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u16-tolower])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u16-totitle])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u16-toupper])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u32-casecmp])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u32-casecoll])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u32-casefold])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u32-casexfrm])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u32-ct-casefold])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u32-ct-tolower])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u32-ct-totitle])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u32-ct-toupper])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u32-is-cased])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u32-is-casefolded])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u32-is-lowercase])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u32-is-titlecase])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u32-is-uppercase])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u32-tolower])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u32-totitle])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u32-toupper])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u8-casecmp])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u8-casecoll])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u8-casefold])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u8-casexfrm])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u8-ct-casefold])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u8-ct-tolower])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u8-ct-totitle])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u8-ct-toupper])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u8-is-cased])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u8-is-casefolded])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u8-is-lowercase])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u8-is-titlecase])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u8-is-uppercase])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u8-tolower])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u8-totitle])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/u8-toupper])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/ulc-casecmp])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/ulc-casecoll])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unicase/ulc-casexfrm])
+  gl_LIBUNISTRING_LIBHEADER([0.9.4], [uniconv.h])
   AC_REQUIRE([gl_BIGENDIAN])
-  # Code from module uniconv/u16-conv-to-enc:
+  gl_LIBUNISTRING_MODULE([0.9], [uniconv/u16-conv-from-enc])
   AC_REQUIRE([gl_BIGENDIAN])
-  # Code from module uniconv/u16-strconv-from-enc:
-  # Code from module uniconv/u16-strconv-from-locale:
-  # Code from module uniconv/u16-strconv-to-enc:
+  gl_LIBUNISTRING_MODULE([0.9], [uniconv/u16-conv-to-enc])
+  gl_LIBUNISTRING_MODULE([0.9], [uniconv/u16-strconv-from-enc])
+  gl_LIBUNISTRING_MODULE([0.9], [uniconv/u16-strconv-from-locale])
   AC_REQUIRE([gl_BIGENDIAN])
-  # Code from module uniconv/u16-strconv-to-locale:
-  # Code from module uniconv/u32-conv-from-enc:
-  # Code from module uniconv/u32-conv-to-enc:
-  # Code from module uniconv/u32-strconv-from-enc:
-  # Code from module uniconv/u32-strconv-from-locale:
-  # Code from module uniconv/u32-strconv-to-enc:
-  # Code from module uniconv/u32-strconv-to-locale:
-  # Code from module uniconv/u8-conv-from-enc:
-  # Code from module uniconv/u8-conv-to-enc:
-  # Code from module uniconv/u8-strconv-from-enc:
-  # Code from module uniconv/u8-strconv-from-locale:
-  # Code from module uniconv/u8-strconv-to-enc:
-  # Code from module uniconv/u8-strconv-to-locale:
-  # Code from module unictype/base:
-  # Code from module unictype/bidicategory-all:
-  # Code from module unictype/bidicategory-byname:
-  # Code from module unictype/bidicategory-name:
-  # Code from module unictype/bidicategory-of:
-  # Code from module unictype/bidicategory-test:
-  # Code from module unictype/block-all:
-  # Code from module unictype/block-list:
-  # Code from module unictype/block-of:
-  # Code from module unictype/block-test:
-  # Code from module unictype/category-C:
-  # Code from module unictype/category-Cc:
-  # Code from module unictype/category-Cf:
-  # Code from module unictype/category-Cn:
-  # Code from module unictype/category-Co:
-  # Code from module unictype/category-Cs:
-  # Code from module unictype/category-L:
-  # Code from module unictype/category-Ll:
-  # Code from module unictype/category-Lm:
-  # Code from module unictype/category-Lo:
-  # Code from module unictype/category-Lt:
-  # Code from module unictype/category-Lu:
-  # Code from module unictype/category-M:
-  # Code from module unictype/category-Mc:
-  # Code from module unictype/category-Me:
-  # Code from module unictype/category-Mn:
-  # Code from module unictype/category-N:
-  # Code from module unictype/category-Nd:
-  # Code from module unictype/category-Nl:
-  # Code from module unictype/category-No:
-  # Code from module unictype/category-P:
-  # Code from module unictype/category-Pc:
-  # Code from module unictype/category-Pd:
-  # Code from module unictype/category-Pe:
-  # Code from module unictype/category-Pf:
-  # Code from module unictype/category-Pi:
-  # Code from module unictype/category-Po:
-  # Code from module unictype/category-Ps:
-  # Code from module unictype/category-S:
-  # Code from module unictype/category-Sc:
-  # Code from module unictype/category-Sk:
-  # Code from module unictype/category-Sm:
-  # Code from module unictype/category-So:
-  # Code from module unictype/category-Z:
-  # Code from module unictype/category-Zl:
-  # Code from module unictype/category-Zp:
-  # Code from module unictype/category-Zs:
-  # Code from module unictype/category-all:
-  # Code from module unictype/category-and:
-  # Code from module unictype/category-and-not:
-  # Code from module unictype/category-byname:
-  # Code from module unictype/category-name:
-  # Code from module unictype/category-none:
-  # Code from module unictype/category-of:
+  gl_LIBUNISTRING_MODULE([0.9], [uniconv/u16-strconv-to-enc])
+  gl_LIBUNISTRING_MODULE([0.9], [uniconv/u16-strconv-to-locale])
+  gl_LIBUNISTRING_MODULE([0.9], [uniconv/u32-conv-from-enc])
+  gl_LIBUNISTRING_MODULE([0.9], [uniconv/u32-conv-to-enc])
+  gl_LIBUNISTRING_MODULE([0.9], [uniconv/u32-strconv-from-enc])
+  gl_LIBUNISTRING_MODULE([0.9], [uniconv/u32-strconv-from-locale])
+  gl_LIBUNISTRING_MODULE([0.9], [uniconv/u32-strconv-to-enc])
+  gl_LIBUNISTRING_MODULE([0.9], [uniconv/u32-strconv-to-locale])
+  gl_LIBUNISTRING_MODULE([0.9], [uniconv/u8-conv-from-enc])
+  gl_LIBUNISTRING_MODULE([0.9], [uniconv/u8-conv-to-enc])
+  gl_LIBUNISTRING_MODULE([0.9], [uniconv/u8-strconv-from-enc])
+  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.4], [unictype.h])
+  gl_LIBUNISTRING_MODULE([0.9.5], [unictype/bidiclass-byname])
+  gl_LIBUNISTRING_MODULE([0.9.5], [unictype/bidiclass-longname])
+  gl_LIBUNISTRING_MODULE([0.9.5], [unictype/bidiclass-name])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/bidiclass-of])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/bidiclass-test])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/block-list])
+  gl_LIBUNISTRING_MODULE([0.9.5], [unictype/block-test])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-C])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Cc])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Cf])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Cn])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Co])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Cs])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-L])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-LC])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Ll])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Lm])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Lo])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Lt])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Lu])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-M])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Mc])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Me])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Mn])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-N])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Nd])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Nl])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-No])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-P])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Pc])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Pd])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Pe])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Pf])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Pi])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Po])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Ps])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-S])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Sc])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Sk])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Sm])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-So])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Z])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Zl])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Zp])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-Zs])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-and])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-and-not])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-byname])
+  gl_LIBUNISTRING_MODULE([0.9.5], [unictype/category-longname])
+  gl_LIBUNISTRING_MODULE([0.9], [unictype/category-name])
+  gl_LIBUNISTRING_MODULE([0.9.5], [unictype/category-none])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/category-or:
-  # Code from module unictype/category-test:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-of])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/category-or])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/category-test-withtable:
-  # Code from module unictype/combining-class:
-  # Code from module unictype/ctype-alnum:
+  gl_LIBUNISTRING_MODULE([0.9.5], [unictype/category-test])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/combining-class])
+  gl_LIBUNISTRING_MODULE([0.9.5], [unictype/combining-class-byname])
+  gl_LIBUNISTRING_MODULE([0.9.5], [unictype/combining-class-longname])
+  gl_LIBUNISTRING_MODULE([0.9.5], [unictype/combining-class-name])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/ctype-alpha:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/ctype-alnum])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/ctype-blank:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/ctype-alpha])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/ctype-cntrl:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/ctype-blank])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/ctype-digit:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/ctype-cntrl])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/ctype-graph:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/ctype-digit])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/ctype-lower:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/ctype-graph])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/ctype-print:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/ctype-lower])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/ctype-punct:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/ctype-print])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/ctype-space:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/ctype-punct])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/ctype-upper:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/ctype-space])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/ctype-xdigit:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/ctype-upper])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/decimal-digit:
-  # Code from module unictype/digit:
-  # Code from module unictype/mirror:
-  # Code from module unictype/numeric:
-  # Code from module unictype/property-all:
-  # Code from module unictype/property-alphabetic:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/ctype-xdigit])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/decimal-digit])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/digit])
+  gl_LIBUNISTRING_MODULE([0.9.5], [unictype/joininggroup-byname])
+  gl_LIBUNISTRING_MODULE([0.9.5], [unictype/joininggroup-name])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/joininggroup-of])
+  gl_LIBUNISTRING_MODULE([0.9.5], [unictype/joiningtype-byname])
+  gl_LIBUNISTRING_MODULE([0.9.5], [unictype/joiningtype-longname])
+  gl_LIBUNISTRING_MODULE([0.9.5], [unictype/joiningtype-name])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/joiningtype-of])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/mirror])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/numeric])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-ascii-hex-digit:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-alphabetic])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-bidi-arabic-digit:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-ascii-hex-digit])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-bidi-arabic-right-to-left:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-bidi-arabic-digit])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-bidi-block-separator:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-bidi-arabic-right-to-left])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-bidi-boundary-neutral:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-bidi-block-separator])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-bidi-common-separator:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-bidi-boundary-neutral])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-bidi-control:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-bidi-common-separator])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-bidi-embedding-or-override:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-bidi-control])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-bidi-eur-num-separator:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-bidi-embedding-or-override])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-bidi-eur-num-terminator:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-bidi-eur-num-separator])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-bidi-european-digit:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-bidi-eur-num-terminator])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-bidi-hebrew-right-to-left:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-bidi-european-digit])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-bidi-left-to-right:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-bidi-hebrew-right-to-left])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-bidi-non-spacing-mark:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-bidi-left-to-right])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-bidi-other-neutral:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-bidi-non-spacing-mark])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-bidi-pdf:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-bidi-other-neutral])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-bidi-segment-separator:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-bidi-pdf])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-bidi-whitespace:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-bidi-segment-separator])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-byname:
-  # Code from module unictype/property-combining:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-bidi-whitespace])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-byname])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-composite:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-case-ignorable])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-currency-symbol:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-cased])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-dash:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-changes-when-casefolded])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-decimal-digit:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-changes-when-casemapped])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-default-ignorable-code-point:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-changes-when-lowercased])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-deprecated:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-changes-when-titlecased])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-diacritic:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-changes-when-uppercased])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-extender:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-combining])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-format-control:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-composite])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-grapheme-base:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-currency-symbol])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-grapheme-extend:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-dash])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-grapheme-link:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-decimal-digit])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-hex-digit:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-default-ignorable-code-point])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-hyphen:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-deprecated])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-id-continue:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-diacritic])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-id-start:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-extender])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-ideographic:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-format-control])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-ids-binary-operator:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-grapheme-base])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-ids-trinary-operator:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-grapheme-extend])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-ignorable-control:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-grapheme-link])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-iso-control:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-hex-digit])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-join-control:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-hyphen])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-left-of-pair:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-id-continue])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-line-separator:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-id-start])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-logical-order-exception:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-ideographic])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-lowercase:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-ids-binary-operator])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-math:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-ids-trinary-operator])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-non-break:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-ignorable-control])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-not-a-character:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-iso-control])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-numeric:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-join-control])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-other-alphabetic:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-left-of-pair])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-other-default-ignorable-code-point:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-line-separator])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-other-grapheme-extend:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-logical-order-exception])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-other-id-continue:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-lowercase])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-other-id-start:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-math])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-other-lowercase:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-non-break])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-other-math:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-not-a-character])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-other-uppercase:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-numeric])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-paired-punctuation:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-other-alphabetic])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-paragraph-separator:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-other-default-ignorable-code-point])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-pattern-syntax:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-other-grapheme-extend])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-pattern-white-space:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-other-id-continue])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-private-use:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-other-id-start])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-punctuation:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-other-lowercase])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-quotation-mark:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-other-math])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-radical:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-other-uppercase])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-sentence-terminal:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-paired-punctuation])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-soft-dotted:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-paragraph-separator])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-space:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-pattern-syntax])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-terminal-punctuation:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-pattern-white-space])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-test:
-  # Code from module unictype/property-titlecase:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-private-use])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-unassigned-code-value:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-punctuation])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-unified-ideograph:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-quotation-mark])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-uppercase:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-radical])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-variation-selector:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-sentence-terminal])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-white-space:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-soft-dotted])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-xid-continue:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-space])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-xid-start:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-terminal-punctuation])
+  gl_LIBUNISTRING_MODULE([0.9], [unictype/property-test])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/property-zero-width:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-titlecase])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/scripts:
-  # Code from module unictype/scripts-all:
-  # Code from module unictype/syntax-c-ident:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-unassigned-code-value])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/syntax-c-whitespace:
-  # Code from module unictype/syntax-java-ident:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-unified-ideograph])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unictype/syntax-java-whitespace:
-  # Code from module unilbrk/base:
-  # Code from module unilbrk/tables:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-uppercase])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module unilbrk/u16-possible-linebreaks:
-  # Code from module unilbrk/u16-width-linebreaks:
-  # Code from module unilbrk/u32-possible-linebreaks:
-  # Code from module unilbrk/u32-width-linebreaks:
-  # Code from module unilbrk/u8-possible-linebreaks:
-  # Code from module unilbrk/u8-width-linebreaks:
-  # Code from module unilbrk/ulc-common:
-  # Code from module unilbrk/ulc-possible-linebreaks:
-  # Code from module unilbrk/ulc-width-linebreaks:
-  # Code from module uniname/base:
-  # Code from module uniname/uniname:
-  # Code from module uninorm/base:
-  # Code from module uninorm/canonical-decomposition:
-  # Code from module uninorm/compat-decomposition:
-  # Code from module uninorm/composition:
-  # Code from module uninorm/decompose-internal:
-  # Code from module uninorm/decomposing-form:
-  # Code from module uninorm/decomposition:
-  # Code from module uninorm/decomposition-table:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-variation-selector])
   AC_REQUIRE([AC_C_INLINE])
-  # Code from module uninorm/filter:
-  # Code from module uninorm/nfc:
-  # Code from module uninorm/nfd:
-  # Code from module uninorm/nfkc:
-  # Code from module uninorm/nfkd:
-  # Code from module uninorm/u16-normalize:
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-white-space])
+  AC_REQUIRE([AC_C_INLINE])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-xid-continue])
+  AC_REQUIRE([AC_C_INLINE])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-xid-start])
+  AC_REQUIRE([AC_C_INLINE])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/property-zero-width])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/scripts])
+  AC_REQUIRE([AC_C_INLINE])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/syntax-c-ident])
+  gl_LIBUNISTRING_MODULE([0.9], [unictype/syntax-c-whitespace])
+  AC_REQUIRE([AC_C_INLINE])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unictype/syntax-java-ident])
+  gl_LIBUNISTRING_MODULE([0.9], [unictype/syntax-java-whitespace])
+  gl_LIBUNISTRING_LIBHEADER([0.9.4], [unigbrk.h])
+  gl_MODULE_INDICATOR([unigbrk/u16-grapheme-breaks])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unigbrk/u16-grapheme-breaks])
+  gl_MODULE_INDICATOR([unigbrk/u16-grapheme-next])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unigbrk/u16-grapheme-next])
+  gl_MODULE_INDICATOR([unigbrk/u16-grapheme-prev])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unigbrk/u16-grapheme-prev])
+  gl_MODULE_INDICATOR([unigbrk/u32-grapheme-breaks])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unigbrk/u32-grapheme-breaks])
+  gl_MODULE_INDICATOR([unigbrk/u32-grapheme-next])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unigbrk/u32-grapheme-next])
+  gl_MODULE_INDICATOR([unigbrk/u32-grapheme-prev])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unigbrk/u32-grapheme-prev])
+  gl_MODULE_INDICATOR([unigbrk/u8-grapheme-breaks])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unigbrk/u8-grapheme-breaks])
+  gl_MODULE_INDICATOR([unigbrk/u8-grapheme-next])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unigbrk/u8-grapheme-next])
+  gl_MODULE_INDICATOR([unigbrk/u8-grapheme-prev])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unigbrk/u8-grapheme-prev])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unigbrk/uc-gbrk-prop])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unigbrk/uc-is-grapheme-break])
+  gl_MODULE_INDICATOR([unigbrk/ulc-grapheme-breaks])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unigbrk/ulc-grapheme-breaks])
+  gl_LIBUNISTRING_LIBHEADER([0.9.4], [unilbrk.h])
+  AC_REQUIRE([AC_C_INLINE])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unilbrk/u16-possible-linebreaks])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unilbrk/u16-width-linebreaks])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unilbrk/u32-possible-linebreaks])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unilbrk/u32-width-linebreaks])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unilbrk/u8-possible-linebreaks])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unilbrk/u8-width-linebreaks])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unilbrk/ulc-possible-linebreaks])
+  gl_LIBUNISTRING_MODULE([0.9.6], [unilbrk/ulc-width-linebreaks])
+  gl_LIBUNISTRING_LIBHEADER([0.9.5], [uniname.h])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uniname/uniname])
+  gl_LIBUNISTRING_LIBHEADER([0.9.4], [uninorm.h])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uninorm/canonical-decomposition])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uninorm/composition])
+  gl_LIBUNISTRING_MODULE([0.9.5], [uninorm/decomposing-form])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uninorm/decomposition])
+  AC_REQUIRE([AC_C_INLINE])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uninorm/filter])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uninorm/nfc])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uninorm/nfd])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uninorm/nfkc])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uninorm/nfkd])
   gl_MODULE_INDICATOR_FOR_TESTS([uninorm/u16-normalize])
-  # Code from module uninorm/u16-normcmp:
-  # Code from module uninorm/u16-normcoll:
-  # Code from module uninorm/u16-normxfrm:
-  # Code from module uninorm/u32-normalize:
+  gl_LIBUNISTRING_MODULE([0.9.6], [uninorm/u16-normalize])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uninorm/u16-normcmp])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uninorm/u16-normcoll])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uninorm/u16-normxfrm])
   gl_MODULE_INDICATOR_FOR_TESTS([uninorm/u32-normalize])
-  # Code from module uninorm/u32-normcmp:
-  # Code from module uninorm/u32-normcoll:
-  # Code from module uninorm/u32-normxfrm:
-  # Code from module uninorm/u8-normalize:
+  gl_LIBUNISTRING_MODULE([0.9.6], [uninorm/u32-normalize])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uninorm/u32-normcmp])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uninorm/u32-normcoll])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uninorm/u32-normxfrm])
   gl_MODULE_INDICATOR_FOR_TESTS([uninorm/u8-normalize])
-  # Code from module uninorm/u8-normcmp:
-  # Code from module uninorm/u8-normcoll:
-  # Code from module uninorm/u8-normxfrm:
-  # Code from module unistd:
+  gl_LIBUNISTRING_MODULE([0.9.6], [uninorm/u8-normalize])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uninorm/u8-normcmp])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uninorm/u8-normcoll])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uninorm/u8-normxfrm])
   gl_UNISTD_H
-  # Code from module unistdio/base:
-  # Code from module unistdio/u-printf-args:
+  gl_LIBUNISTRING_LIBHEADER([0.9.4], [unistdio.h])
   gl_PREREQ_PRINTF_ARGS
-  # Code from module unistdio/u16-asnprintf:
-  # Code from module unistdio/u16-asprintf:
-  # Code from module unistdio/u16-printf-parse:
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-asnprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-asprintf])
   gl_PREREQ_PRINTF_PARSE
-  # Code from module unistdio/u16-snprintf:
-  # Code from module unistdio/u16-sprintf:
-  # Code from module unistdio/u16-u16-asnprintf:
-  # Code from module unistdio/u16-u16-asprintf:
-  # Code from module unistdio/u16-u16-snprintf:
-  # Code from module unistdio/u16-u16-sprintf:
-  # Code from module unistdio/u16-u16-vasnprintf:
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-snprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-sprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-u16-asnprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-u16-asprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-u16-snprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-u16-sprintf])
   gl_PREREQ_VASNPRINTF_WITH_EXTRAS
-  # Code from module unistdio/u16-u16-vasprintf:
-  # Code from module unistdio/u16-u16-vsnprintf:
-  # Code from module unistdio/u16-u16-vsprintf:
-  # Code from module unistdio/u16-vasnprintf:
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-u16-vasnprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-u16-vasprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-u16-vsnprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-u16-vsprintf])
   gl_PREREQ_VASNPRINTF_WITH_EXTRAS
-  # Code from module unistdio/u16-vasprintf:
-  # Code from module unistdio/u16-vsnprintf:
-  # Code from module unistdio/u16-vsprintf:
-  # Code from module unistdio/u32-asnprintf:
-  # Code from module unistdio/u32-asprintf:
-  # Code from module unistdio/u32-printf-parse:
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-vasnprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-vasprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-vsnprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u16-vsprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-asnprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-asprintf])
   gl_PREREQ_PRINTF_PARSE
-  # Code from module unistdio/u32-snprintf:
-  # Code from module unistdio/u32-sprintf:
-  # Code from module unistdio/u32-u32-asnprintf:
-  # Code from module unistdio/u32-u32-asprintf:
-  # Code from module unistdio/u32-u32-snprintf:
-  # Code from module unistdio/u32-u32-sprintf:
-  # Code from module unistdio/u32-u32-vasnprintf:
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-snprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-sprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-u32-asnprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-u32-asprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-u32-snprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-u32-sprintf])
   gl_PREREQ_VASNPRINTF_WITH_EXTRAS
-  # Code from module unistdio/u32-u32-vasprintf:
-  # Code from module unistdio/u32-u32-vsnprintf:
-  # Code from module unistdio/u32-u32-vsprintf:
-  # Code from module unistdio/u32-vasnprintf:
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-u32-vasnprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-u32-vasprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-u32-vsnprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-u32-vsprintf])
   gl_PREREQ_VASNPRINTF_WITH_EXTRAS
-  # Code from module unistdio/u32-vasprintf:
-  # Code from module unistdio/u32-vsnprintf:
-  # Code from module unistdio/u32-vsprintf:
-  # Code from module unistdio/u8-asnprintf:
-  # Code from module unistdio/u8-asprintf:
-  # Code from module unistdio/u8-printf-parse:
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-vasnprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-vasprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-vsnprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u32-vsprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-asnprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-asprintf])
   gl_PREREQ_PRINTF_PARSE
-  # Code from module unistdio/u8-snprintf:
-  # Code from module unistdio/u8-sprintf:
-  # Code from module unistdio/u8-u8-asnprintf:
-  # Code from module unistdio/u8-u8-asprintf:
-  # Code from module unistdio/u8-u8-snprintf:
-  # Code from module unistdio/u8-u8-sprintf:
-  # Code from module unistdio/u8-u8-vasnprintf:
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-snprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-sprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-u8-asnprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-u8-asprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-u8-snprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-u8-sprintf])
   gl_PREREQ_VASNPRINTF_WITH_EXTRAS
-  # Code from module unistdio/u8-u8-vasprintf:
-  # Code from module unistdio/u8-u8-vsnprintf:
-  # Code from module unistdio/u8-u8-vsprintf:
-  # Code from module unistdio/u8-vasnprintf:
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-u8-vasnprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-u8-vasprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-u8-vsnprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-u8-vsprintf])
   gl_PREREQ_VASNPRINTF_WITH_EXTRAS
-  # Code from module unistdio/u8-vasprintf:
-  # Code from module unistdio/u8-vsnprintf:
-  # Code from module unistdio/u8-vsprintf:
-  # Code from module unistdio/ulc-asnprintf:
-  # Code from module unistdio/ulc-asprintf:
-  # Code from module unistdio/ulc-fprintf:
-  # Code from module unistdio/ulc-printf-parse:
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-vasnprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-vasprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-vsnprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/u8-vsprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/ulc-asnprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/ulc-asprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/ulc-fprintf])
   gl_PREREQ_PRINTF_PARSE
-  # Code from module unistdio/ulc-snprintf:
-  # Code from module unistdio/ulc-sprintf:
-  # Code from module unistdio/ulc-vasnprintf:
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/ulc-snprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/ulc-sprintf])
   gl_PREREQ_VASNPRINTF_WITH_EXTRAS
-  # Code from module unistdio/ulc-vasprintf:
-  # Code from module unistdio/ulc-vfprintf:
-  # Code from module unistdio/ulc-vsnprintf:
-  # Code from module unistdio/ulc-vsprintf:
-  # Code from module unistr/base:
-  # Code from module unistr/u16-check:
-  # Code from module unistr/u16-chr:
-  # Code from module unistr/u16-cmp:
-  # Code from module unistr/u16-cmp2:
-  # Code from module unistr/u16-cpy:
-  # Code from module unistr/u16-cpy-alloc:
-  # Code from module unistr/u16-endswith:
-  # Code from module unistr/u16-mblen:
-  # Code from module unistr/u16-mbsnlen:
-  # Code from module unistr/u16-mbtouc:
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/ulc-vasnprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/ulc-vasprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/ulc-vfprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/ulc-vsnprintf])
+  gl_LIBUNISTRING_MODULE([0.9], [unistdio/ulc-vsprintf])
+  gl_LIBUNISTRING_LIBHEADER([0.9.4], [unistr.h])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-check])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-chr])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-cmp])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-cmp2])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-cpy])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-cpy-alloc])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-endswith])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-mblen])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-mbsnlen])
   gl_MODULE_INDICATOR([unistr/u16-mbtouc])
-  # Code from module unistr/u16-mbtouc-unsafe:
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-mbtouc])
   gl_MODULE_INDICATOR([unistr/u16-mbtouc-unsafe])
-  # Code from module unistr/u16-mbtoucr:
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-mbtouc-unsafe])
   gl_MODULE_INDICATOR([unistr/u16-mbtoucr])
-  # Code from module unistr/u16-move:
-  # Code from module unistr/u16-next:
-  # Code from module unistr/u16-prev:
-  # Code from module unistr/u16-set:
-  # Code from module unistr/u16-startswith:
-  # Code from module unistr/u16-stpcpy:
-  # Code from module unistr/u16-stpncpy:
-  # Code from module unistr/u16-strcat:
-  # Code from module unistr/u16-strchr:
-  # Code from module unistr/u16-strcmp:
-  # Code from module unistr/u16-strcoll:
-  # Code from module unistr/u16-strcpy:
-  # Code from module unistr/u16-strcspn:
-  # Code from module unistr/u16-strdup:
-  # Code from module unistr/u16-strlen:
-  # Code from module unistr/u16-strmblen:
-  # Code from module unistr/u16-strmbtouc:
-  # Code from module unistr/u16-strncat:
-  # Code from module unistr/u16-strncmp:
-  # Code from module unistr/u16-strncpy:
-  # Code from module unistr/u16-strnlen:
-  # Code from module unistr/u16-strpbrk:
-  # Code from module unistr/u16-strrchr:
-  # Code from module unistr/u16-strspn:
-  # Code from module unistr/u16-strstr:
-  # Code from module unistr/u16-strtok:
-  # Code from module unistr/u16-to-u32:
-  # Code from module unistr/u16-to-u8:
-  # Code from module unistr/u16-uctomb:
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-mbtoucr])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-move])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-next])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-prev])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-set])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-startswith])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-stpcpy])
+  gl_LIBUNISTRING_MODULE([0.9.3], [unistr/u16-stpncpy])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strcat])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strchr])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strcmp])
+  gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u16-strcoll])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strcpy])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strcspn])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strdup])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strlen])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strmblen])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strmbtouc])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strncat])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strncmp])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strncpy])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strnlen])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strpbrk])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strrchr])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strspn])
+  gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u16-strstr])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-strtok])
+  gl_LIBUNISTRING_MODULE([0.9.3], [unistr/u16-to-u32])
+  gl_LIBUNISTRING_MODULE([0.9.3], [unistr/u16-to-u8])
   gl_MODULE_INDICATOR([unistr/u16-uctomb])
-  # Code from module unistr/u32-check:
-  # Code from module unistr/u32-chr:
-  # Code from module unistr/u32-cmp:
-  # Code from module unistr/u32-cmp2:
-  # Code from module unistr/u32-cpy:
-  # Code from module unistr/u32-cpy-alloc:
-  # Code from module unistr/u32-endswith:
-  # Code from module unistr/u32-mblen:
-  # Code from module unistr/u32-mbsnlen:
-  # Code from module unistr/u32-mbtouc:
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u16-uctomb])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-check])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-chr])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-cmp])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-cmp2])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-cpy])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-cpy-alloc])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-endswith])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-mblen])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-mbsnlen])
   gl_MODULE_INDICATOR([unistr/u32-mbtouc])
-  # Code from module unistr/u32-mbtouc-unsafe:
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-mbtouc])
   gl_MODULE_INDICATOR([unistr/u32-mbtouc-unsafe])
-  # Code from module unistr/u32-mbtoucr:
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-mbtouc-unsafe])
   gl_MODULE_INDICATOR([unistr/u32-mbtoucr])
-  # Code from module unistr/u32-move:
-  # Code from module unistr/u32-next:
-  # Code from module unistr/u32-prev:
-  # Code from module unistr/u32-set:
-  # Code from module unistr/u32-startswith:
-  # Code from module unistr/u32-stpcpy:
-  # Code from module unistr/u32-stpncpy:
-  # Code from module unistr/u32-strcat:
-  # Code from module unistr/u32-strchr:
-  # Code from module unistr/u32-strcmp:
-  # Code from module unistr/u32-strcoll:
-  # Code from module unistr/u32-strcpy:
-  # Code from module unistr/u32-strcspn:
-  # Code from module unistr/u32-strdup:
-  # Code from module unistr/u32-strlen:
-  # Code from module unistr/u32-strmblen:
-  # Code from module unistr/u32-strmbtouc:
-  # Code from module unistr/u32-strncat:
-  # Code from module unistr/u32-strncmp:
-  # Code from module unistr/u32-strncpy:
-  # Code from module unistr/u32-strnlen:
-  # Code from module unistr/u32-strpbrk:
-  # Code from module unistr/u32-strrchr:
-  # Code from module unistr/u32-strspn:
-  # Code from module unistr/u32-strstr:
-  # Code from module unistr/u32-strtok:
-  # Code from module unistr/u32-to-u16:
-  # Code from module unistr/u32-to-u8:
-  # Code from module unistr/u32-uctomb:
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-mbtoucr])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-move])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-next])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-prev])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-set])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-startswith])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-stpcpy])
+  gl_LIBUNISTRING_MODULE([0.9.3], [unistr/u32-stpncpy])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strcat])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strchr])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strcmp])
+  gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u32-strcoll])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strcpy])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strcspn])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strdup])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strlen])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strmblen])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strmbtouc])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strncat])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strncmp])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strncpy])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strnlen])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strpbrk])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strrchr])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strspn])
+  gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u32-strstr])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-strtok])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-to-u16])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-to-u8])
   gl_MODULE_INDICATOR([unistr/u32-uctomb])
-  # Code from module unistr/u8-check:
-  # Code from module unistr/u8-chr:
-  # Code from module unistr/u8-cmp:
-  # Code from module unistr/u8-cmp2:
-  # Code from module unistr/u8-cpy:
-  # Code from module unistr/u8-cpy-alloc:
-  # Code from module unistr/u8-endswith:
-  # Code from module unistr/u8-mblen:
-  # Code from module unistr/u8-mbsnlen:
-  # Code from module unistr/u8-mbtouc:
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u32-uctomb])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-check])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-chr])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-cmp])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-cmp2])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-cpy])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-cpy-alloc])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-endswith])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mblen])
+  gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u8-mbsnlen])
   gl_MODULE_INDICATOR([unistr/u8-mbtouc])
-  # Code from module unistr/u8-mbtouc-unsafe:
+  gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u8-mbtouc])
   gl_MODULE_INDICATOR([unistr/u8-mbtouc-unsafe])
-  # Code from module unistr/u8-mbtoucr:
+  gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u8-mbtouc-unsafe])
   gl_MODULE_INDICATOR([unistr/u8-mbtoucr])
-  # Code from module unistr/u8-move:
-  # Code from module unistr/u8-next:
-  # Code from module unistr/u8-prev:
-  # Code from module unistr/u8-set:
-  # Code from module unistr/u8-startswith:
-  # Code from module unistr/u8-stpcpy:
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtoucr])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-move])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-next])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-prev])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-set])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-startswith])
   AC_CHECK_FUNCS_ONCE([stpcpy])
-  # Code from module unistr/u8-stpncpy:
-  # Code from module unistr/u8-strcat:
-  # Code from module unistr/u8-strchr:
-  # Code from module unistr/u8-strcmp:
-  # Code from module unistr/u8-strcoll:
-  # Code from module unistr/u8-strcpy:
-  # Code from module unistr/u8-strcspn:
-  # Code from module unistr/u8-strdup:
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-stpcpy])
+  gl_LIBUNISTRING_MODULE([0.9.3], [unistr/u8-stpncpy])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strcat])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strchr])
+  gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u8-strcmp])
+  gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u8-strcoll])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strcpy])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strcspn])
   AC_CHECK_FUNCS_ONCE([strdup])
-  # Code from module unistr/u8-strlen:
-  # Code from module unistr/u8-strmblen:
-  # Code from module unistr/u8-strmbtouc:
-  # Code from module unistr/u8-strncat:
-  # Code from module unistr/u8-strncmp:
-  # Code from module unistr/u8-strncpy:
-  # Code from module unistr/u8-strnlen:
-  # Code from module unistr/u8-strpbrk:
-  # Code from module unistr/u8-strrchr:
-  # Code from module unistr/u8-strspn:
-  # Code from module unistr/u8-strstr:
-  # Code from module unistr/u8-strtok:
-  # Code from module unistr/u8-to-u16:
-  # Code from module unistr/u8-to-u32:
-  # Code from module unistr/u8-uctomb:
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strdup])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strlen])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strmblen])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strmbtouc])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strncat])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strncmp])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strncpy])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strnlen])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strpbrk])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strrchr])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strspn])
+  gl_LIBUNISTRING_MODULE([0.9.4], [unistr/u8-strstr])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-strtok])
+  gl_LIBUNISTRING_MODULE([0.9.3], [unistr/u8-to-u16])
+  gl_LIBUNISTRING_MODULE([0.9.3], [unistr/u8-to-u32])
   gl_MODULE_INDICATOR([unistr/u8-uctomb])
-  # Code from module unitypes:
-  # Code from module uniwbrk/base:
-  # Code from module uniwbrk/table:
-  # Code from module uniwbrk/u16-wordbreaks:
-  # Code from module uniwbrk/u32-wordbreaks:
-  # Code from module uniwbrk/u8-wordbreaks:
-  # Code from module uniwbrk/ulc-wordbreaks:
-  # Code from module uniwbrk/wordbreak-property:
-  # Code from module uniwidth/base:
-  # Code from module uniwidth/u16-strwidth:
-  # Code from module uniwidth/u16-width:
-  # Code from module uniwidth/u32-strwidth:
-  # Code from module uniwidth/u32-width:
-  # Code from module uniwidth/u8-strwidth:
-  # Code from module uniwidth/u8-width:
-  # Code from module uniwidth/width:
-  # Code from module unused-parameter:
-  # Code from module verify:
-  # Code from module warn-on-use:
-  # Code from module wchar:
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-uctomb])
+  gl_LIBUNISTRING_LIBHEADER([0.9.4], [unitypes.h])
+  gl_LIBUNISTRING_LIBHEADER([0.9.4], [uniwbrk.h])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uniwbrk/u16-wordbreaks])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uniwbrk/u32-wordbreaks])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uniwbrk/u8-wordbreaks])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uniwbrk/ulc-wordbreaks])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uniwbrk/wordbreak-property])
+  gl_LIBUNISTRING_LIBHEADER([0.9.4], [uniwidth.h])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uniwidth/u16-strwidth])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uniwidth/u16-width])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uniwidth/u32-strwidth])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uniwidth/u32-width])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uniwidth/u8-strwidth])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uniwidth/u8-width])
+  gl_LIBUNISTRING_MODULE([0.9.6], [uniwidth/width])
   gl_WCHAR_H
-  # Code from module wctype:
   gl_WCTYPE_H
-  # Code from module wcwidth:
   gl_FUNC_WCWIDTH
+  if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then
+    AC_LIBOBJ([wcwidth])
+  fi
   gl_WCHAR_MODULE_INDICATOR([wcwidth])
-  # Code from module xsize:
   gl_XSIZE
   # End of code from modules
   m4_ifval(gl_LIBSOURCES_LIST, [
@@ -1810,21 +1993,45 @@ changequote([, ])dnl
   AC_SUBST([gltests_WITNESS])
   gl_module_indicator_condition=$gltests_WITNESS
   m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition])
+  gl_FUNC_BTOWC
+  if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then
+    AC_LIBOBJ([btowc])
+    gl_PREREQ_BTOWC
+  fi
+  gl_WCHAR_MODULE_INDICATOR([btowc])
+  gt_LOCALE_FR
+  gt_LOCALE_FR_UTF8
   gt_LOCALE_FR
   gt_LOCALE_TR_UTF8
   gl_ENVIRON
   gl_UNISTD_MODULE_INDICATOR([environ])
   gl_ERROR
+  if test $ac_cv_lib_error_at_line = no; then
+    AC_LIBOBJ([error])
+    gl_PREREQ_ERROR
+  fi
   m4_ifdef([AM_XGETTEXT_OPTION],
     [AM_][XGETTEXT_OPTION([--flag=error:3:c-format])
      AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])])
+  gl_FUNC_FDOPEN
+  if test $REPLACE_FDOPEN = 1; then
+    AC_LIBOBJ([fdopen])
+    gl_PREREQ_FDOPEN
+  fi
+  gl_STDIO_MODULE_INDICATOR([fdopen])
   gl_FUNC_GETPAGESIZE
+  if test $REPLACE_GETPAGESIZE = 1; then
+    AC_LIBOBJ([getpagesize])
+  fi
   gl_UNISTD_MODULE_INDICATOR([getpagesize])
   AC_SUBST([LIBINTL])
   AC_SUBST([LTLIBINTL])
+  gl_INTTYPES_H
+  gl_INTTYPES_INCOMPLETE
   gl_DOUBLE_EXPONENT_LOCATION
   gl_FLOAT_EXPONENT_LOCATION
   gl_LONG_DOUBLE_EXPONENT_LOCATION
+  AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE])
   gl_LOCALE_H
   AC_CHECK_FUNCS_ONCE([newlocale])
   AC_CHECK_FUNCS_ONCE([newlocale])
@@ -1833,19 +2040,70 @@ changequote([, ])dnl
   gt_LOCALE_JA
   gt_LOCALE_ZH_CN
   gt_LOCALE_FR_UTF8
+  gl_FUNC_MBTOWC
+  if test $REPLACE_MBTOWC = 1; then
+    AC_LIBOBJ([mbtowc])
+    gl_PREREQ_MBTOWC
+  fi
+  gl_STDLIB_MODULE_INDICATOR([mbtowc])
+  dnl Check for prerequisites for memory fence checks.
+  gl_FUNC_MMAP_ANON
+  AC_CHECK_HEADERS_ONCE([sys/mman.h])
+  AC_CHECK_FUNCS_ONCE([mprotect])
+  gl_MSVC_INVAL
+  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
+    AC_LIBOBJ([msvc-inval])
+  fi
+  gl_MSVC_NOTHROW
+  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
+    AC_LIBOBJ([msvc-nothrow])
+  fi
   AC_CHECK_DECLS([program_invocation_name], [], [], [#include <errno.h>])
   AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include <errno.h>])
   gl_FUNC_PUTENV
+  if test $REPLACE_PUTENV = 1; then
+    AC_LIBOBJ([putenv])
+    gl_PREREQ_PUTENV
+  fi
   gl_STDLIB_MODULE_INDICATOR([putenv])
   gl_FUNC_SETENV
+  if test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1; then
+    AC_LIBOBJ([setenv])
+  fi
   gl_STDLIB_MODULE_INDICATOR([setenv])
+  gl_FUNC_SETLOCALE
+  if test $REPLACE_SETLOCALE = 1; then
+    AC_LIBOBJ([setlocale])
+    gl_PREREQ_SETLOCALE
+  fi
+  gl_LOCALE_MODULE_INDICATOR([setlocale])
+  gt_LOCALE_FR
+  gt_LOCALE_FR_UTF8
+  gt_LOCALE_JA
+  gt_LOCALE_ZH_CN
   AC_REQUIRE([gl_FLOAT_EXPONENT_LOCATION])
   AC_REQUIRE([gl_DOUBLE_EXPONENT_LOCATION])
   AC_REQUIRE([gl_LONG_DOUBLE_EXPONENT_LOCATION])
-  gt_TYPE_WCHAR_T
-  gt_TYPE_WINT_T
+  gl_STDALIGN_H
+  AC_REQUIRE([gt_TYPE_WCHAR_T])
+  AC_REQUIRE([gt_TYPE_WINT_T])
+  gl_STDIO_H
   gl_FUNC_STRERROR
+  if test $REPLACE_STRERROR = 1; then
+    AC_LIBOBJ([strerror])
+  fi
+  gl_MODULE_INDICATOR([strerror])
   gl_STRING_MODULE_INDICATOR([strerror])
+  AC_REQUIRE([gl_HEADER_ERRNO_H])
+  AC_REQUIRE([gl_FUNC_STRERROR_0])
+  if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then
+    AC_LIBOBJ([strerror-override])
+    gl_PREREQ_SYS_H_WINSOCK2
+  fi
+  gl_FUNC_MMAP_ANON
+  AC_CHECK_HEADERS_ONCE([sys/mman.h])
+  AC_CHECK_FUNCS_ONCE([mprotect])
+  AC_CHECK_DECLS_ONCE([alarm])
   gl_FUNC_MMAP_ANON
   AC_CHECK_HEADERS_ONCE([sys/mman.h])
   AC_CHECK_FUNCS_ONCE([mprotect])
@@ -1859,6 +2117,7 @@ changequote([, ])dnl
   gt_LOCALE_FR_UTF8
   gt_LOCALE_FR
   gt_LOCALE_FR_UTF8
+  gt_LOCALE_AR
   AC_CHECK_DECLS_ONCE([alarm])
   AC_CHECK_DECLS_ONCE([alarm])
   AC_CHECK_DECLS_ONCE([alarm])
@@ -1892,6 +2151,7 @@ changequote([, ])dnl
   gl_FUNC_MMAP_ANON
   AC_CHECK_HEADERS_ONCE([sys/mman.h])
   AC_CHECK_FUNCS_ONCE([mprotect])
+  AC_CHECK_DECLS_ONCE([alarm])
   gl_FUNC_MMAP_ANON
   AC_CHECK_HEADERS_ONCE([sys/mman.h])
   AC_CHECK_FUNCS_ONCE([mprotect])
@@ -1913,6 +2173,16 @@ changequote([, ])dnl
   gl_FUNC_MMAP_ANON
   AC_CHECK_HEADERS_ONCE([sys/mman.h])
   AC_CHECK_FUNCS_ONCE([mprotect])
+  AC_CHECK_DECLS_ONCE([alarm])
+  gl_FUNC_MMAP_ANON
+  AC_CHECK_HEADERS_ONCE([sys/mman.h])
+  AC_CHECK_FUNCS_ONCE([mprotect])
+  gl_FUNC_MMAP_ANON
+  AC_CHECK_HEADERS_ONCE([sys/mman.h])
+  AC_CHECK_FUNCS_ONCE([mprotect])
+  gl_FUNC_MMAP_ANON
+  AC_CHECK_HEADERS_ONCE([sys/mman.h])
+  AC_CHECK_FUNCS_ONCE([mprotect])
   gl_FUNC_MMAP_ANON
   AC_CHECK_HEADERS_ONCE([sys/mman.h])
   AC_CHECK_FUNCS_ONCE([mprotect])
@@ -1925,11 +2195,36 @@ changequote([, ])dnl
   gl_FUNC_MMAP_ANON
   AC_CHECK_HEADERS_ONCE([sys/mman.h])
   AC_CHECK_FUNCS_ONCE([mprotect])
+  AC_CHECK_DECLS_ONCE([alarm])
   gt_LOCALE_FR
   gl_FUNC_UNSETENV
+  if test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1; then
+    AC_LIBOBJ([unsetenv])
+    gl_PREREQ_UNSETENV
+  fi
   gl_STDLIB_MODULE_INDICATOR([unsetenv])
+  gl_FUNC_WCRTOMB
+  if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then
+    AC_LIBOBJ([wcrtomb])
+    gl_PREREQ_WCRTOMB
+  fi
+  gl_WCHAR_MODULE_INDICATOR([wcrtomb])
+  gt_LOCALE_FR
+  gt_LOCALE_FR_UTF8
+  gt_LOCALE_JA
+  gt_LOCALE_ZH_CN
   gl_FUNC_WCTOB
+  if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then
+    AC_LIBOBJ([wctob])
+    gl_PREREQ_WCTOB
+  fi
   gl_WCHAR_MODULE_INDICATOR([wctob])
+  gl_FUNC_WCTOMB
+  if test $REPLACE_WCTOMB = 1; then
+    AC_LIBOBJ([wctomb])
+    gl_PREREQ_WCTOMB
+  fi
+  gl_STDLIB_MODULE_INDICATOR([wctomb])
   gl_XALLOC
   gl_YIELD
   m4_popdef([gl_MODULE_INDICATOR_CONDITION])
@@ -2024,13 +2319,16 @@ AC_DEFUN([gltests_LIBSOURCES], [
 # This macro records the list of files which have been installed by
 # gnulib-tool and may be removed by future gnulib-tool invocations.
 AC_DEFUN([gl_FILE_LIST], [
-  build-aux/arg-nonnull.h
-  build-aux/c++defs.h
   build-aux/config.rpath
-  build-aux/unused-parameter.h
-  build-aux/warn-on-use.h
+  build-aux/snippet/_Noreturn.h
+  build-aux/snippet/arg-nonnull.h
+  build-aux/snippet/c++defs.h
+  build-aux/snippet/unused-parameter.h
+  build-aux/snippet/warn-on-use.h
   doc/relocatable.texi
   lib/alloca.in.h
+  lib/amemxfrm.c
+  lib/amemxfrm.h
   lib/array-mergesort.h
   lib/c-ctype.c
   lib/c-ctype.h
@@ -2041,6 +2339,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/config.charset
   lib/errno.in.h
   lib/float+.h
+  lib/float.c
   lib/float.in.h
   lib/fpucw.h
   lib/frexp.c
@@ -2050,7 +2349,9 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/glthread/lock.c
   lib/glthread/lock.h
   lib/glthread/threadlib.c
+  lib/iconv.c
   lib/iconv.in.h
+  lib/iconv_close.c
   lib/iconv_open-aix.gperf
   lib/iconv_open-hpux.gperf
   lib/iconv_open-irix.gperf
@@ -2065,6 +2366,9 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/isnanf.c
   lib/isnanl-nolibm.h
   lib/isnanl.c
+  lib/iswblank.c
+  lib/itold.c
+  lib/langinfo.in.h
   lib/localcharset.c
   lib/localcharset.h
   lib/localename.c
@@ -2073,9 +2377,11 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/malloca.c
   lib/malloca.h
   lib/malloca.valgrind
+  lib/math.c
   lib/math.in.h
   lib/mbchar.c
   lib/mbchar.h
+  lib/mbiter.c
   lib/mbiter.h
   lib/mbrtowc.c
   lib/mbsinit.c
@@ -2084,8 +2390,6 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/memchr.valgrind
   lib/memcmp2.c
   lib/memcmp2.h
-  lib/memxfrm.c
-  lib/memxfrm.h
   lib/minmax.h
   lib/printf-args.c
   lib/printf-args.h
@@ -2108,6 +2412,8 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/stdint.in.h
   lib/stdio-impl.h
   lib/stdlib.in.h
+  lib/str-kmp.h
+  lib/str-two-way.h
   lib/streq.h
   lib/striconveh.c
   lib/striconveh.h
@@ -2115,7 +2421,9 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/striconveha.h
   lib/string.in.h
   lib/strncat.c
-  lib/unicase.h
+  lib/strstr.c
+  lib/sys_types.in.h
+  lib/unicase.in.h
   lib/unicase/cased.c
   lib/unicase/cased.h
   lib/unicase/casefold.h
@@ -2208,7 +2516,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/unicase/ulc-casecoll.c
   lib/unicase/ulc-casexfrm.c
   lib/unicase/unicasemap.h
-  lib/uniconv.h
+  lib/uniconv.in.h
   lib/uniconv/u-conv-from-enc.h
   lib/uniconv/u-conv-to-enc.h
   lib/uniconv/u-strconv-from-enc.h
@@ -2231,8 +2539,10 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/uniconv/u8-strconv-from-locale.c
   lib/uniconv/u8-strconv-to-enc.c
   lib/uniconv/u8-strconv-to-locale.c
-  lib/unictype.h
+  lib/unictype.in.h
   lib/unictype/bidi_byname.c
+  lib/unictype/bidi_byname.gperf
+  lib/unictype/bidi_longname.c
   lib/unictype/bidi_name.c
   lib/unictype/bidi_of.c
   lib/unictype/bidi_of.h
@@ -2255,6 +2565,8 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/unictype/categ_Cs.h
   lib/unictype/categ_L.c
   lib/unictype/categ_L.h
+  lib/unictype/categ_LC.c
+  lib/unictype/categ_LC.h
   lib/unictype/categ_Ll.c
   lib/unictype/categ_Ll.h
   lib/unictype/categ_Lm.c
@@ -2318,14 +2630,20 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/unictype/categ_and.c
   lib/unictype/categ_and_not.c
   lib/unictype/categ_byname.c
+  lib/unictype/categ_byname.gperf
+  lib/unictype/categ_longname.c
   lib/unictype/categ_name.c
   lib/unictype/categ_none.c
   lib/unictype/categ_of.c
   lib/unictype/categ_of.h
   lib/unictype/categ_or.c
   lib/unictype/categ_test.c
-  lib/unictype/combining.c
-  lib/unictype/combining.h
+  lib/unictype/combiningclass.c
+  lib/unictype/combiningclass.h
+  lib/unictype/combiningclass_byname.c
+  lib/unictype/combiningclass_byname.gperf
+  lib/unictype/combiningclass_longname.c
+  lib/unictype/combiningclass_name.c
   lib/unictype/ctype_alnum.c
   lib/unictype/ctype_alnum.h
   lib/unictype/ctype_alpha.c
@@ -2355,6 +2673,18 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/unictype/digit.c
   lib/unictype/digit.h
   lib/unictype/identsyntaxmap.h
+  lib/unictype/joininggroup_byname.c
+  lib/unictype/joininggroup_byname.gperf
+  lib/unictype/joininggroup_name.c
+  lib/unictype/joininggroup_name.h
+  lib/unictype/joininggroup_of.c
+  lib/unictype/joininggroup_of.h
+  lib/unictype/joiningtype_byname.c
+  lib/unictype/joiningtype_byname.gperf
+  lib/unictype/joiningtype_longname.c
+  lib/unictype/joiningtype_name.c
+  lib/unictype/joiningtype_of.c
+  lib/unictype/joiningtype_of.h
   lib/unictype/mirror.c
   lib/unictype/mirror.h
   lib/unictype/numeric.c
@@ -2399,6 +2729,20 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/unictype/pr_bidi_whitespace.h
   lib/unictype/pr_byname.c
   lib/unictype/pr_byname.gperf
+  lib/unictype/pr_case_ignorable.c
+  lib/unictype/pr_case_ignorable.h
+  lib/unictype/pr_cased.c
+  lib/unictype/pr_cased.h
+  lib/unictype/pr_changes_when_casefolded.c
+  lib/unictype/pr_changes_when_casefolded.h
+  lib/unictype/pr_changes_when_casemapped.c
+  lib/unictype/pr_changes_when_casemapped.h
+  lib/unictype/pr_changes_when_lowercased.c
+  lib/unictype/pr_changes_when_lowercased.h
+  lib/unictype/pr_changes_when_titlecased.c
+  lib/unictype/pr_changes_when_titlecased.h
+  lib/unictype/pr_changes_when_uppercased.c
+  lib/unictype/pr_changes_when_uppercased.h
   lib/unictype/pr_combining.c
   lib/unictype/pr_combining.h
   lib/unictype/pr_composite.c
@@ -2529,7 +2873,21 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/unictype/sy_java_ident.c
   lib/unictype/sy_java_ident.h
   lib/unictype/sy_java_whitespace.c
-  lib/unilbrk.h
+  lib/unigbrk.in.h
+  lib/unigbrk/gbrkprop.h
+  lib/unigbrk/u16-grapheme-breaks.c
+  lib/unigbrk/u16-grapheme-next.c
+  lib/unigbrk/u16-grapheme-prev.c
+  lib/unigbrk/u32-grapheme-breaks.c
+  lib/unigbrk/u32-grapheme-next.c
+  lib/unigbrk/u32-grapheme-prev.c
+  lib/unigbrk/u8-grapheme-breaks.c
+  lib/unigbrk/u8-grapheme-next.c
+  lib/unigbrk/u8-grapheme-prev.c
+  lib/unigbrk/uc-gbrk-prop.c
+  lib/unigbrk/uc-is-grapheme-break.c
+  lib/unigbrk/ulc-grapheme-breaks.c
+  lib/unilbrk.in.h
   lib/unilbrk/lbrkprop1.h
   lib/unilbrk/lbrkprop2.h
   lib/unilbrk/lbrktables.c
@@ -2544,11 +2902,11 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/unilbrk/ulc-common.h
   lib/unilbrk/ulc-possible-linebreaks.c
   lib/unilbrk/ulc-width-linebreaks.c
-  lib/uniname.h
+  lib/uniname.in.h
   lib/uniname/gen-uninames.lisp
   lib/uniname/uniname.c
   lib/uniname/uninames.h
-  lib/uninorm.h
+  lib/uninorm.in.h
   lib/uninorm/canonical-decomposition.c
   lib/uninorm/compat-decomposition.c
   lib/uninorm/composition-table.gperf
@@ -2583,8 +2941,9 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/uninorm/u8-normcoll.c
   lib/uninorm/u8-normxfrm.c
   lib/uninorm/uninorm-filter.c
+  lib/unistd.c
   lib/unistd.in.h
-  lib/unistdio.h
+  lib/unistdio.in.h
   lib/unistdio/u-asnprintf.h
   lib/unistdio/u-asprintf.h
   lib/unistdio/u-printf-args.c
@@ -2657,7 +3016,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/unistdio/ulc-vfprintf.c
   lib/unistdio/ulc-vsnprintf.c
   lib/unistdio/ulc-vsprintf.c
-  lib/unistr.h
+  lib/unistr.in.h
   lib/unistr/u-cmp2.h
   lib/unistr/u-cpy-alloc.h
   lib/unistr/u-cpy.h
@@ -2809,8 +3168,8 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/unistr/u8-to-u32.c
   lib/unistr/u8-uctomb-aux.c
   lib/unistr/u8-uctomb.c
-  lib/unitypes.h
-  lib/uniwbrk.h
+  lib/unitypes.in.h
+  lib/uniwbrk.in.h
   lib/uniwbrk/u-wordbreaks.h
   lib/uniwbrk/u16-wordbreaks.c
   lib/uniwbrk/u32-wordbreaks.c
@@ -2820,7 +3179,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/uniwbrk/wbrktable.c
   lib/uniwbrk/wbrktable.h
   lib/uniwbrk/wordbreak-property.c
-  lib/uniwidth.h
+  lib/uniwidth.in.h
   lib/uniwidth/cjk.h
   lib/uniwidth/u16-strwidth.c
   lib/uniwidth/u16-width.c
@@ -2832,12 +3191,17 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/vasnprintf.c
   lib/verify.h
   lib/wchar.in.h
+  lib/wctype-h.c
   lib/wctype.in.h
   lib/wcwidth.c
+  lib/xsize.c
   lib/xsize.h
   m4/00gnulib.m4
+  m4/absolute-header.m4
   m4/alloca.m4
+  m4/btowc.m4
   m4/codeset.m4
+  m4/configmake.m4
   m4/eealloc.m4
   m4/environ.m4
   m4/errno_h.m4
@@ -2846,11 +3210,14 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/exponentf.m4
   m4/exponentl.m4
   m4/extensions.m4
+  m4/extern-inline.m4
   m4/fcntl-o.m4
+  m4/fdopen.m4
   m4/float_h.m4
   m4/fpieee.m4
   m4/frexp.m4
   m4/frexpl.m4
+  m4/fseterr.m4
   m4/getpagesize.m4
   m4/glibc21.m4
   m4/gnulib-common.m4
@@ -2861,16 +3228,22 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/inline.m4
   m4/intlmacosx.m4
   m4/intmax_t.m4
+  m4/inttypes-pri.m4
+  m4/inttypes.m4
   m4/inttypes_h.m4
   m4/isnand.m4
   m4/isnanf.m4
   m4/isnanl.m4
+  m4/iswblank.m4
+  m4/langinfo_h.m4
   m4/lcmessage.m4
   m4/ldexpl.m4
   m4/lib-ld.m4
   m4/lib-link.m4
   m4/lib-prefix.m4
+  m4/libunistring-base.m4
   m4/localcharset.m4
+  m4/locale-ar.m4
   m4/locale-fr.m4
   m4/locale-ja.m4
   m4/locale-tr.m4
@@ -2887,27 +3260,38 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/mbrtowc.m4
   m4/mbsinit.m4
   m4/mbstate_t.m4
+  m4/mbtowc.m4
   m4/memchr.m4
   m4/minmax.m4
   m4/mmap-anon.m4
+  m4/msvc-inval.m4
+  m4/msvc-nothrow.m4
   m4/multiarch.m4
   m4/nocrash.m4
+  m4/off_t.m4
   m4/printf-frexp.m4
   m4/printf-frexpl.m4
   m4/printf.m4
   m4/putenv.m4
   m4/relocatable-lib.m4
   m4/setenv.m4
+  m4/setlocale.m4
   m4/signbit.m4
   m4/size_max.m4
+  m4/ssize_t.m4
+  m4/stdalign.m4
   m4/stdbool.m4
   m4/stddef_h.m4
   m4/stdint.m4
   m4/stdint_h.m4
+  m4/stdio_h.m4
   m4/stdlib_h.m4
   m4/strerror.m4
   m4/string_h.m4
   m4/strncat.m4
+  m4/strstr.m4
+  m4/sys_socket_h.m4
+  m4/sys_types_h.m4
   m4/thread.m4
   m4/threadlib.m4
   m4/unistd_h.m4
@@ -2915,40 +3299,68 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/warn-on-use.m4
   m4/wchar_h.m4
   m4/wchar_t.m4
+  m4/wcrtomb.m4
   m4/wctob.m4
+  m4/wctomb.m4
   m4/wctype_h.m4
   m4/wcwidth.m4
   m4/wint_t.m4
   m4/xalloc.m4
   m4/xsize.m4
   m4/yield.m4
+  tests/infinity.h
   tests/init.sh
   tests/macros.h
+  tests/minus-zero.h
   tests/nan.h
+  tests/randomd.c
+  tests/randoml.c
   tests/signature.h
   tests/test-alloca-opt.c
   tests/test-array-mergesort.c
+  tests/test-btowc.c
+  tests/test-btowc1.sh
+  tests/test-btowc2.sh
   tests/test-c-ctype.c
   tests/test-c-strcase.sh
   tests/test-c-strcasecmp.c
   tests/test-c-strncasecmp.c
   tests/test-environ.c
   tests/test-errno.c
+  tests/test-fdopen.c
+  tests/test-fgetc.c
+  tests/test-float.c
+  tests/test-fputc.c
+  tests/test-fread.c
+  tests/test-frexp.c
+  tests/test-frexp.h
   tests/test-frexpl.c
   tests/test-fseterr.c
+  tests/test-fwrite.c
   tests/test-iconv-h.c
   tests/test-iconv.c
+  tests/test-init.sh
+  tests/test-intprops.c
+  tests/test-inttypes.c
   tests/test-isnand-nolibm.c
   tests/test-isnand.h
   tests/test-isnanf-nolibm.c
   tests/test-isnanf.h
   tests/test-isnanl-nolibm.c
   tests/test-isnanl.h
+  tests/test-iswblank.c
+  tests/test-langinfo.c
   tests/test-locale.c
   tests/test-localename.c
   tests/test-lock.c
   tests/test-malloca.c
   tests/test-math.c
+  tests/test-mbrtowc-w32-1.sh
+  tests/test-mbrtowc-w32-2.sh
+  tests/test-mbrtowc-w32-3.sh
+  tests/test-mbrtowc-w32-4.sh
+  tests/test-mbrtowc-w32-5.sh
+  tests/test-mbrtowc-w32.c
   tests/test-mbrtowc.c
   tests/test-mbrtowc1.sh
   tests/test-mbrtowc2.sh
@@ -2960,20 +3372,41 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/test-printf-frexp.c
   tests/test-printf-frexpl.c
   tests/test-setenv.c
+  tests/test-setlocale1.c
+  tests/test-setlocale1.sh
+  tests/test-setlocale2.c
+  tests/test-setlocale2.sh
   tests/test-signbit.c
+  tests/test-stdalign.c
   tests/test-stdbool.c
   tests/test-stddef.c
   tests/test-stdint.c
+  tests/test-stdio.c
   tests/test-stdlib.c
   tests/test-strerror.c
   tests/test-striconveh.c
   tests/test-striconveha.c
   tests/test-string.c
   tests/test-strncat.c
+  tests/test-strstr.c
+  tests/test-sys_types.c
+  tests/test-sys_wait.h
+  tests/test-thread_create.c
+  tests/test-thread_self.c
   tests/test-unistd.c
   tests/test-unsetenv.c
+  tests/test-verify.c
+  tests/test-verify.sh
   tests/test-wchar.c
-  tests/test-wctype.c
+  tests/test-wcrtomb-w32-1.sh
+  tests/test-wcrtomb-w32-2.sh
+  tests/test-wcrtomb-w32-3.sh
+  tests/test-wcrtomb-w32-4.sh
+  tests/test-wcrtomb-w32-5.sh
+  tests/test-wcrtomb-w32.c
+  tests/test-wcrtomb.c
+  tests/test-wcrtomb.sh
+  tests/test-wctype-h.c
   tests/test-wcwidth.c
   tests/test-xalloc-die.c
   tests/test-xalloc-die.sh
@@ -3046,6 +3479,7 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/uniconv/test-u8-strconv-from-enc.c
   tests/uniconv/test-u8-strconv-to-enc.c
   tests/unictype/test-bidi_byname.c
+  tests/unictype/test-bidi_longname.c
   tests/unictype/test-bidi_name.c
   tests/unictype/test-bidi_of.c
   tests/unictype/test-bidi_test.c
@@ -3059,6 +3493,7 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/unictype/test-categ_Co.c
   tests/unictype/test-categ_Cs.c
   tests/unictype/test-categ_L.c
+  tests/unictype/test-categ_LC.c
   tests/unictype/test-categ_Ll.c
   tests/unictype/test-categ_Lm.c
   tests/unictype/test-categ_Lo.c
@@ -3092,12 +3527,16 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/unictype/test-categ_and.c
   tests/unictype/test-categ_and_not.c
   tests/unictype/test-categ_byname.c
+  tests/unictype/test-categ_longname.c
   tests/unictype/test-categ_name.c
   tests/unictype/test-categ_none.c
   tests/unictype/test-categ_of.c
   tests/unictype/test-categ_or.c
   tests/unictype/test-categ_test_withtable.c
-  tests/unictype/test-combining.c
+  tests/unictype/test-combiningclass.c
+  tests/unictype/test-combiningclass_byname.c
+  tests/unictype/test-combiningclass_longname.c
+  tests/unictype/test-combiningclass_name.c
   tests/unictype/test-ctype_alnum.c
   tests/unictype/test-ctype_alpha.c
   tests/unictype/test-ctype_blank.c
@@ -3114,6 +3553,15 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/unictype/test-decdigit.h
   tests/unictype/test-digit.c
   tests/unictype/test-digit.h
+  tests/unictype/test-joininggroup_byname.c
+  tests/unictype/test-joininggroup_name.c
+  tests/unictype/test-joininggroup_of.c
+  tests/unictype/test-joininggroup_of.h
+  tests/unictype/test-joiningtype_byname.c
+  tests/unictype/test-joiningtype_longname.c
+  tests/unictype/test-joiningtype_name.c
+  tests/unictype/test-joiningtype_of.c
+  tests/unictype/test-joiningtype_of.h
   tests/unictype/test-mirror.c
   tests/unictype/test-numeric.c
   tests/unictype/test-numeric.h
@@ -3137,6 +3585,13 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/unictype/test-pr_bidi_segment_separator.c
   tests/unictype/test-pr_bidi_whitespace.c
   tests/unictype/test-pr_byname.c
+  tests/unictype/test-pr_case_ignorable.c
+  tests/unictype/test-pr_cased.c
+  tests/unictype/test-pr_changes_when_casefolded.c
+  tests/unictype/test-pr_changes_when_casemapped.c
+  tests/unictype/test-pr_changes_when_lowercased.c
+  tests/unictype/test-pr_changes_when_titlecased.c
+  tests/unictype/test-pr_changes_when_uppercased.c
   tests/unictype/test-pr_combining.c
   tests/unictype/test-pr_composite.c
   tests/unictype/test-pr_currency_symbol.c
@@ -3205,6 +3660,22 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/unictype/test-sy_c_whitespace.c
   tests/unictype/test-sy_java_ident.c
   tests/unictype/test-sy_java_whitespace.c
+  tests/unigbrk/GraphemeBreakTest.txt
+  tests/unigbrk/test-u16-grapheme-breaks.c
+  tests/unigbrk/test-u16-grapheme-next.c
+  tests/unigbrk/test-u16-grapheme-prev.c
+  tests/unigbrk/test-u32-grapheme-breaks.c
+  tests/unigbrk/test-u32-grapheme-next.c
+  tests/unigbrk/test-u32-grapheme-prev.c
+  tests/unigbrk/test-u8-grapheme-breaks.c
+  tests/unigbrk/test-u8-grapheme-next.c
+  tests/unigbrk/test-u8-grapheme-prev.c
+  tests/unigbrk/test-uc-gbrk-prop.c
+  tests/unigbrk/test-uc-gbrk-prop.h
+  tests/unigbrk/test-uc-is-grapheme-break.c
+  tests/unigbrk/test-uc-is-grapheme-break.sh
+  tests/unigbrk/test-ulc-grapheme-breaks.c
+  tests/unigbrk/test-ulc-grapheme-breaks.sh
   tests/unilbrk/test-u16-possible-linebreaks.c
   tests/unilbrk/test-u16-width-linebreaks.c
   tests/unilbrk/test-u32-possible-linebreaks.c
@@ -3213,7 +3684,9 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/unilbrk/test-u8-width-linebreaks.c
   tests/unilbrk/test-ulc-possible-linebreaks.c
   tests/unilbrk/test-ulc-width-linebreaks.c
-  tests/uniname/UnicodeDataNames.txt
+  tests/uniname/HangulSyllableNames.txt
+  tests/uniname/NameAliases.txt
+  tests/uniname/UnicodeData.txt
   tests/uniname/test-uninames.c
   tests/uniname/test-uninames.sh
   tests/uninorm/NormalizationTest.txt
@@ -3312,6 +3785,7 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/unistr/test-stpcpy.h
   tests/unistr/test-stpncpy.h
   tests/unistr/test-strcat.h
+  tests/unistr/test-strchr.h
   tests/unistr/test-strcmp.h
   tests/unistr/test-strcpy.h
   tests/unistr/test-strdup.h
@@ -3319,6 +3793,8 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/unistr/test-strncmp.h
   tests/unistr/test-strncpy.h
   tests/unistr/test-strnlen.h
+  tests/unistr/test-u-strstr.h
+  tests/unistr/test-u-strtok.h
   tests/unistr/test-u16-check.c
   tests/unistr/test-u16-chr.c
   tests/unistr/test-u16-cmp.c
@@ -3338,6 +3814,7 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/unistr/test-u16-stpcpy.c
   tests/unistr/test-u16-stpncpy.c
   tests/unistr/test-u16-strcat.c
+  tests/unistr/test-u16-strchr.c
   tests/unistr/test-u16-strcmp.c
   tests/unistr/test-u16-strcmp.h
   tests/unistr/test-u16-strcoll.c
@@ -3350,6 +3827,8 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/unistr/test-u16-strncmp.c
   tests/unistr/test-u16-strncpy.c
   tests/unistr/test-u16-strnlen.c
+  tests/unistr/test-u16-strstr.c
+  tests/unistr/test-u16-strtok.c
   tests/unistr/test-u16-to-u32.c
   tests/unistr/test-u16-to-u8.c
   tests/unistr/test-u16-uctomb.c
@@ -3372,6 +3851,7 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/unistr/test-u32-stpcpy.c
   tests/unistr/test-u32-stpncpy.c
   tests/unistr/test-u32-strcat.c
+  tests/unistr/test-u32-strchr.c
   tests/unistr/test-u32-strcmp.c
   tests/unistr/test-u32-strcmp.h
   tests/unistr/test-u32-strcoll.c
@@ -3384,6 +3864,8 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/unistr/test-u32-strncmp.c
   tests/unistr/test-u32-strncpy.c
   tests/unistr/test-u32-strnlen.c
+  tests/unistr/test-u32-strstr.c
+  tests/unistr/test-u32-strtok.c
   tests/unistr/test-u32-to-u16.c
   tests/unistr/test-u32-to-u8.c
   tests/unistr/test-u32-uctomb.c
@@ -3406,6 +3888,7 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/unistr/test-u8-stpcpy.c
   tests/unistr/test-u8-stpncpy.c
   tests/unistr/test-u8-strcat.c
+  tests/unistr/test-u8-strchr.c
   tests/unistr/test-u8-strcmp.c
   tests/unistr/test-u8-strcmp.h
   tests/unistr/test-u8-strcoll.c
@@ -3418,12 +3901,17 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/unistr/test-u8-strncmp.c
   tests/unistr/test-u8-strncpy.c
   tests/unistr/test-u8-strnlen.c
+  tests/unistr/test-u8-strstr.c
+  tests/unistr/test-u8-strtok.c
   tests/unistr/test-u8-to-u16.c
   tests/unistr/test-u8-to-u32.c
   tests/unistr/test-u8-uctomb.c
+  tests/uniwbrk/WordBreakTest.txt
   tests/uniwbrk/test-u16-wordbreaks.c
   tests/uniwbrk/test-u32-wordbreaks.c
   tests/uniwbrk/test-u8-wordbreaks.c
+  tests/uniwbrk/test-uc-wordbreaks.c
+  tests/uniwbrk/test-uc-wordbreaks.sh
   tests/uniwbrk/test-ulc-wordbreaks.c
   tests/uniwbrk/test-ulc-wordbreaks.sh
   tests/uniwidth/test-u16-strwidth.c
@@ -3436,25 +3924,43 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/uniwidth/test-uc_width2.c
   tests/uniwidth/test-uc_width2.sh
   tests/zerosize-ptr.h
+  tests=lib/btowc.c
   tests=lib/error.c
   tests=lib/error.h
   tests=lib/exitfail.c
   tests=lib/exitfail.h
+  tests=lib/fdopen.c
   tests=lib/getpagesize.c
   tests=lib/gettext.h
   tests=lib/glthread/thread.c
   tests=lib/glthread/thread.h
   tests=lib/glthread/yield.h
   tests=lib/intprops.h
+  tests=lib/inttypes.in.h
   tests=lib/locale.in.h
+  tests=lib/mbtowc-impl.h
+  tests=lib/mbtowc.c
+  tests=lib/msvc-inval.c
+  tests=lib/msvc-inval.h
+  tests=lib/msvc-nothrow.c
+  tests=lib/msvc-nothrow.h
   tests=lib/progname.c
   tests=lib/progname.h
   tests=lib/putenv.c
   tests=lib/setenv.c
+  tests=lib/setlocale.c
+  tests=lib/stdalign.in.h
+  tests=lib/stdio.in.h
+  tests=lib/strerror-override.c
+  tests=lib/strerror-override.h
   tests=lib/strerror.c
   tests=lib/unsetenv.c
+  tests=lib/wcrtomb.c
   tests=lib/wctob.c
+  tests=lib/wctomb-impl.h
+  tests=lib/wctomb.c
   tests=lib/xalloc-die.c
+  tests=lib/xalloc-oversized.h
   tests=lib/xalloc.h
   tests=lib/xmalloc.c
 ])