Update upstream source from tag 'upstream/1.1'

Update to upstream version '1.1'
with Debian dir acc8a9214de592a0bbbdb680385559210b329d52

1 files changed, 431 insertions, 456 deletions

diff --git a/gnulib-m4/gnulib-comp.m4 b/gnulib-m4/gnulib-comp.m4
index 62dedba..7bad398 100644
--- a/gnulib-m4/gnulib-comp.m4
+++ b/gnulib-m4/gnulib-comp.m4
@@ -3,7 +3,7 @@
 #
 # 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
+# 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,
@@ -42,7 +42,6 @@ AC_DEFUN([gl_EARLY],
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_REQUIRE([gl_PROG_AR_RANLIB])
 
-  AC_REQUIRE([AM_PROG_CC_C_O])
   # Code from module absolute-header:
   # Code from module accept:
   # Code from module accept-tests:
@@ -54,6 +53,8 @@ AC_DEFUN([gl_EARLY],
   # Code from module arpa_inet-tests:
   # Code from module array-mergesort:
   # Code from module array-mergesort-tests:
+  # Code from module assert-h:
+  # Code from module assert-h-tests:
   # Code from module attribute:
   # Code from module basename-lgpl:
   # Code from module binary-io:
@@ -173,8 +174,8 @@ AC_DEFUN([gl_EARLY],
   # Code from module langinfo:
   # Code from module langinfo-tests:
   # Code from module largefile:
-  AC_REQUIRE([AC_SYS_LARGEFILE])
   AC_REQUIRE([gl_YEAR2038_EARLY])
+  AC_REQUIRE([AC_SYS_LARGEFILE])
   # Code from module limits-h:
   # Code from module limits-h-tests:
   # Code from module listen:
@@ -229,6 +230,8 @@ AC_DEFUN([gl_EARLY],
   # Code from module printf-frexpl:
   # Code from module printf-frexpl-tests:
   # Code from module printf-safe:
+  # Code from module pselect:
+  # Code from module pselect-tests:
   # Code from module pthread-h:
   gl_ANYTHREADLIB_EARLY
   # Code from module pthread-h-tests:
@@ -259,8 +262,6 @@ AC_DEFUN([gl_EARLY],
   # Code from module setlocale-tests:
   # Code from module setsockopt:
   # Code from module setsockopt-tests:
-  # Code from module sigaction:
-  # Code from module sigaction-tests:
   # Code from module signal-h:
   # Code from module signal-h-tests:
   # Code from module signbit:
@@ -289,6 +290,8 @@ AC_DEFUN([gl_EARLY],
   # Code from module stdalign-tests:
   # Code from module stdbool:
   # Code from module stdbool-tests:
+  # Code from module stdckdint:
+  # Code from module stdckdint-tests:
   # Code from module stddef:
   # Code from module stddef-tests:
   # Code from module stdint:
@@ -1344,6 +1347,9 @@ AC_DEFUN([gl_INIT],
   gl_CONDITIONAL_HEADER([alloca.h])
   AC_PROG_MKDIR_P
   AC_REQUIRE([AC_C_RESTRICT])
+  gl_ASSERT_H
+  gl_CONDITIONAL_HEADER([assert.h])
+  AC_PROG_MKDIR_P
   gl___BUILTIN_EXPECT
   gl_HEADER_ERRNO_H
   gl_CONDITIONAL_HEADER([errno.h])
@@ -1353,17 +1359,13 @@ AC_DEFUN([gl_INIT],
   gl_FLOAT_H
   gl_CONDITIONAL_HEADER([float.h])
   AC_PROG_MKDIR_P
-  if test $REPLACE_FLOAT_LDBL = 1; then
-    AC_LIBOBJ([float])
-  fi
-  if test $REPLACE_ITOLD = 1; then
-    AC_LIBOBJ([itold])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_FLOAT], [test $REPLACE_FLOAT_LDBL = 1])
+  gl_CONDITIONAL([GL_COND_OBJ_ITOLD], [test $REPLACE_ITOLD = 1])
   gl_FUNC_FREE
-  if test $REPLACE_FREE = 1; then
-    AC_LIBOBJ([free])
+  gl_CONDITIONAL([GL_COND_OBJ_FREE], [test $REPLACE_FREE = 1])
+  AM_COND_IF([GL_COND_OBJ_FREE], [
     gl_PREREQ_FREE
-  fi
+  ])
   gl_STDLIB_MODULE_INDICATOR([free-posix])
   gl_FUNC_FREXP_NO_LIBM
   if test $gl_func_frexp_no_libm != yes; then
@@ -1376,9 +1378,7 @@ AC_DEFUN([gl_INIT],
   fi
   gl_MATH_MODULE_INDICATOR([frexpl])
   gl_FUNC_FSETERR
-  if test $ac_cv_func___fseterr = no; then
-    AC_LIBOBJ([fseterr])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_FSETERR], [test $ac_cv_func___fseterr = no])
   AC_REQUIRE([gl_FUNC_SETLOCALE_NULL])
   LIB_HARD_LOCALE="$LIB_SETLOCALE_NULL"
   AC_SUBST([LIB_HARD_LOCALE])
@@ -1393,13 +1393,8 @@ AC_DEFUN([gl_INIT],
   gl_FUNC_ICONV_OPEN
   dnl Because of gl_REPLACE_ICONV_H:
   gl_CONDITIONAL_HEADER([iconv.h])
-  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_CONDITIONAL([GL_COND_OBJ_ICONV_OPEN], [test $REPLACE_ICONV_OPEN = 1])
+  gl_CONDITIONAL([GL_COND_OBJ_ICONV], [test $REPLACE_ICONV = 1])
   gl_INLINE
   gl_INTTYPES_INCOMPLETE
   gl_INTTYPES_H_REQUIRE_DEFAULTS
@@ -1420,31 +1415,16 @@ AC_DEFUN([gl_INIT],
     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_CONDITIONAL([GL_COND_OBJ_ISWBLANK],
+                 [! { test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; } && { test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; }])
   gl_WCTYPE_MODULE_INDICATOR([iswblank])
   gl_FUNC_ISWDIGIT
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
-    :
-  else
-    if test $REPLACE_ISWDIGIT = 1; then
-      AC_LIBOBJ([iswdigit])
-    fi
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_ISWDIGIT],
+                 [! { test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; } && test $REPLACE_ISWDIGIT = 1])
   gl_WCTYPE_MODULE_INDICATOR([iswdigit])
   gl_FUNC_ISWXDIGIT
-  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
-    :
-  else
-    if test $REPLACE_ISWXDIGIT = 1; then
-      AC_LIBOBJ([iswxdigit])
-    fi
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_ISWXDIGIT],
+                 [! { test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; } && test $REPLACE_ISWXDIGIT = 1])
   gl_WCTYPE_MODULE_INDICATOR([iswxdigit])
   gl_LANGINFO_H
   gl_LANGINFO_H_REQUIRE_DEFAULTS
@@ -1475,28 +1455,30 @@ AC_DEFUN([gl_INIT],
   gl_MBCHAR
   gl_MBITER
   gl_FUNC_MBRTOWC
-  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
-    AC_LIBOBJ([mbrtowc])
+  gl_CONDITIONAL([GL_COND_OBJ_MBRTOWC],
+                 [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1])
+  AM_COND_IF([GL_COND_OBJ_MBRTOWC], [
     if test $REPLACE_MBSTATE_T = 1; then
       AC_LIBOBJ([lc-charset-dispatch])
       AC_LIBOBJ([mbtowc-lock])
       gl_PREREQ_MBTOWC_LOCK
     fi
     gl_PREREQ_MBRTOWC
-  fi
+  ])
   gl_WCHAR_MODULE_INDICATOR([mbrtowc])
   gl_FUNC_MBSINIT
-  if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
-    AC_LIBOBJ([mbsinit])
+  gl_CONDITIONAL([GL_COND_OBJ_MBSINIT],
+                 [test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1])
+  AM_COND_IF([GL_COND_OBJ_MBSINIT], [
     gl_PREREQ_MBSINIT
-  fi
+  ])
   gl_WCHAR_MODULE_INDICATOR([mbsinit])
   gl_STRING_MODULE_INDICATOR([mbsnlen])
   gl_FUNC_MEMCHR
-  if test $REPLACE_MEMCHR = 1; then
-    AC_LIBOBJ([memchr])
+  gl_CONDITIONAL([GL_COND_OBJ_MEMCHR], [test $REPLACE_MEMCHR = 1])
+  AM_COND_IF([GL_COND_OBJ_MEMCHR], [
     gl_PREREQ_MEMCHR
-  fi
+  ])
   gl_STRING_MODULE_INDICATOR([memchr])
   gl_MINMAX
   gl_MULTIARCH
@@ -1508,22 +1490,25 @@ AC_DEFUN([gl_INIT],
     AC_LIBOBJ([relocatable])
   fi
   gl_FUNC_SETLOCALE_NULL
-  if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then
-    AC_LIBOBJ([setlocale-lock])
+  gl_CONDITIONAL([GL_COND_OBJ_SETLOCALE_LOCK],
+                 [test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0])
+  AM_COND_IF([GL_COND_OBJ_SETLOCALE_LOCK], [
     gl_PREREQ_SETLOCALE_LOCK
-  fi
+  ])
   gl_LOCALE_MODULE_INDICATOR([setlocale_null])
   gl_SIGNBIT
-  if test $REPLACE_SIGNBIT = 1; then
-    AC_LIBOBJ([signbitf])
-    AC_LIBOBJ([signbitd])
-    AC_LIBOBJ([signbitl])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_SIGNBIT3], [test $REPLACE_SIGNBIT = 1])
   gl_MATH_MODULE_INDICATOR([signbit])
   gl_SIZE_MAX
   gt_TYPE_SSIZE_T
-  gl_STDBOOL_H
-  gl_CONDITIONAL_HEADER([stdbool.h])
+  gl_C_BOOL
+  AC_CHECK_HEADERS_ONCE([stdckdint.h])
+  if test $ac_cv_header_stdckdint_h = yes; then
+    GL_GENERATE_STDCKDINT_H=false
+  else
+    GL_GENERATE_STDCKDINT_H=true
+  fi
+  gl_CONDITIONAL_HEADER([stdckdint.h])
   AC_PROG_MKDIR_P
   gl_STDDEF_H
   gl_STDDEF_H_REQUIRE_DEFAULTS
@@ -1545,10 +1530,10 @@ AC_DEFUN([gl_INIT],
   gl_STRING_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
   gl_FUNC_STRNCAT
-  if test $REPLACE_STRNCAT = 1; then
-    AC_LIBOBJ([strncat])
+  gl_CONDITIONAL([GL_COND_OBJ_STRNCAT], [test $REPLACE_STRNCAT = 1])
+  AM_COND_IF([GL_COND_OBJ_STRNCAT], [
     gl_PREREQ_STRNCAT
-  fi
+  ])
   gl_STRING_MODULE_INDICATOR([strncat])
   gl_FUNC_STRSTR
   if test $REPLACE_STRSTR = 1; then
@@ -1575,63 +1560,63 @@ AC_DEFUN([gl_INIT],
   gl_LIBUNISTRING_MODULE([0.9.11], [unicase/tolower])
   gl_LIBUNISTRING_MODULE([0.9.11], [unicase/totitle])
   gl_LIBUNISTRING_MODULE([0.9.11], [unicase/toupper])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-casecmp])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-casecoll])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-casefold])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-casexfrm])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-ct-casefold])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-ct-tolower])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-ct-totitle])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-ct-toupper])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-is-cased])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-is-casefolded])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-is-lowercase])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-is-titlecase])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-is-uppercase])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-prefix-context])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-suffix-context])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-tolower])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-totitle])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u16-toupper])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-casecmp])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-casecoll])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-casefold])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-casexfrm])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-ct-casefold])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-ct-tolower])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-ct-totitle])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-ct-toupper])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-is-cased])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-is-casefolded])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-is-lowercase])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-is-titlecase])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-is-uppercase])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-prefix-context])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-suffix-context])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-tolower])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-totitle])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u32-toupper])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-casecmp])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-casecoll])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-casefold])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-casexfrm])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-ct-casefold])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-ct-tolower])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-ct-totitle])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-ct-toupper])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-is-cased])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-is-casefolded])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-is-lowercase])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-is-titlecase])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-is-uppercase])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-prefix-context])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-suffix-context])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-tolower])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-totitle])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/u8-toupper])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/ulc-casecmp])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/ulc-casecoll])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unicase/ulc-casexfrm])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-casecmp])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-casecoll])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-casefold])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-casexfrm])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-ct-casefold])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-ct-tolower])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-ct-totitle])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-ct-toupper])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-is-cased])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-is-casefolded])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-is-lowercase])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-is-titlecase])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-is-uppercase])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-prefix-context])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-suffix-context])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-tolower])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-totitle])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u16-toupper])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-casecmp])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-casecoll])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-casefold])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-casexfrm])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-ct-casefold])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-ct-tolower])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-ct-totitle])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-ct-toupper])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-is-cased])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-is-casefolded])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-is-lowercase])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-is-titlecase])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-is-uppercase])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-prefix-context])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-suffix-context])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-tolower])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-totitle])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u32-toupper])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-casecmp])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-casecoll])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-casefold])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-casexfrm])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-ct-casefold])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-ct-tolower])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-ct-totitle])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-ct-toupper])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-is-cased])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-is-casefolded])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-is-lowercase])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-is-titlecase])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-is-uppercase])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-prefix-context])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-suffix-context])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-tolower])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-totitle])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/u8-toupper])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/ulc-casecmp])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/ulc-casecoll])
+  gl_LIBUNISTRING_MODULE([1.1], [unicase/ulc-casexfrm])
   gl_LIBUNISTRING_LIBHEADER([0.9.11], [uniconv.h])
   AC_PROG_MKDIR_P
   AC_REQUIRE([gl_BIGENDIAN])
@@ -1660,67 +1645,67 @@ AC_DEFUN([gl_INIT],
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/bidiclass-byname])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/bidiclass-longname])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/bidiclass-name])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/bidiclass-of])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/bidiclass-test])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/block-list])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/bidiclass-of])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/bidiclass-test])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/block-list])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/block-test])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-C])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-C])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Cc])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Cf])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Cn])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Cf])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Cn])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Co])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Cs])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-L])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-LC])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Ll])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Lm])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Lo])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-L])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-LC])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Ll])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Lm])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Lo])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Lt])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Lu])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-M])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Mc])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-M])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Mc])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Me])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Mn])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-N])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Nd])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Mn])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-N])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Nd])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Nl])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-No])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-P])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-No])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-P])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Pc])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Pd])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Pe])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Pf])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Pi])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Po])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-Po])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Ps])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-S])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-S])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Sc])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-Sk])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Sm])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-So])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-So])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Z])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Zl])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Zp])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-Zs])
-  gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-and])
-  gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-and-not])
-  gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-byname])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-and])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-and-not])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-byname])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-longname])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-name])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-none])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/category-of])
-  gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-or])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-of])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/category-or])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/category-test])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/combining-class])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/combining-class])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/combining-class-byname])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/combining-class-longname])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/combining-class-name])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/ctype-alnum])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/ctype-alnum])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/ctype-alpha])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/ctype-alpha])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-blank])
   AC_REQUIRE([AC_C_INLINE])
@@ -1728,73 +1713,73 @@ AC_DEFUN([gl_INIT],
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-digit])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/ctype-graph])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/ctype-graph])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/ctype-lower])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/ctype-print])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/ctype-print])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/ctype-punct])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/ctype-punct])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-space])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/ctype-upper])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-xdigit])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/decimal-digit])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/digit])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/decimal-digit])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/digit])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/joininggroup-byname])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/joininggroup-name])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/joininggroup-of])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/joiningtype-byname])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/joiningtype-longname])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/joiningtype-name])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/joiningtype-of])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/joiningtype-of])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/mirror])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/numeric])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/numeric])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-alphabetic])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-alphabetic])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-ascii-hex-digit])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-bidi-arabic-digit])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-arabic-digit])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-bidi-arabic-right-to-left])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-arabic-right-to-left])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-block-separator])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-block-separator])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-boundary-neutral])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-boundary-neutral])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-common-separator])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-common-separator])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-control])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-control])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-embedding-or-override])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-embedding-or-override])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-eur-num-separator])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-eur-num-separator])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-bidi-eur-num-terminator])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-eur-num-terminator])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-bidi-european-digit])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-european-digit])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-bidi-hebrew-right-to-left])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-hebrew-right-to-left])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-bidi-left-to-right])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-left-to-right])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-bidi-non-spacing-mark])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-non-spacing-mark])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-bidi-other-neutral])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-other-neutral])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-pdf])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-pdf])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-segment-separator])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-segment-separator])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-bidi-whitespace])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-byname])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-bidi-whitespace])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-byname])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-case-ignorable])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-case-ignorable])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-cased])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-cased])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-changes-when-casefolded])
   AC_REQUIRE([AC_C_INLINE])
@@ -1806,7 +1791,7 @@ AC_DEFUN([gl_INIT],
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-changes-when-uppercased])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-combining])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-combining])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-composite])
   AC_REQUIRE([AC_C_INLINE])
@@ -1814,23 +1799,23 @@ AC_DEFUN([gl_INIT],
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-dash])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-decimal-digit])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-decimal-digit])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-default-ignorable-code-point])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-deprecated])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-diacritic])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-diacritic])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-emoji])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-emoji])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-emoji-component])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-emoji-modifier])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-emoji-modifier-base])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-emoji-modifier-base])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-emoji-presentation])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-emoji-presentation])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-extended-pictographic])
   AC_REQUIRE([AC_C_INLINE])
@@ -1838,27 +1823,27 @@ AC_DEFUN([gl_INIT],
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-format-control])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-grapheme-base])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-grapheme-base])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-grapheme-extend])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-grapheme-extend])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-grapheme-link])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-grapheme-link])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-hex-digit])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-hyphen])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-id-continue])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-id-continue])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-id-start])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-id-start])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-ideographic])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-ideographic])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-ids-binary-operator])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-ids-trinary-operator])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-ignorable-control])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-ignorable-control])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-iso-control])
   AC_REQUIRE([AC_C_INLINE])
@@ -1870,7 +1855,7 @@ AC_DEFUN([gl_INIT],
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-logical-order-exception])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-lowercase])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-lowercase])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-math])
   AC_REQUIRE([AC_C_INLINE])
@@ -1878,9 +1863,9 @@ AC_DEFUN([gl_INIT],
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-not-a-character])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-numeric])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-numeric])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-other-alphabetic])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-other-alphabetic])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-other-default-ignorable-code-point])
   AC_REQUIRE([AC_C_INLINE])
@@ -1890,7 +1875,7 @@ AC_DEFUN([gl_INIT],
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-other-id-start])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-other-lowercase])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-other-lowercase])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-other-math])
   AC_REQUIRE([AC_C_INLINE])
@@ -1906,7 +1891,7 @@ AC_DEFUN([gl_INIT],
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-private-use])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-punctuation])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-punctuation])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-quotation-mark])
   AC_REQUIRE([AC_C_INLINE])
@@ -1914,20 +1899,20 @@ AC_DEFUN([gl_INIT],
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-regional-indicator])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-sentence-terminal])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-sentence-terminal])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-soft-dotted])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-soft-dotted])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-space])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-terminal-punctuation])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-terminal-punctuation])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-test])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-titlecase])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-unassigned-code-value])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-unassigned-code-value])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-unified-ideograph])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-unified-ideograph])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-uppercase])
   AC_REQUIRE([AC_C_INLINE])
@@ -1935,85 +1920,85 @@ AC_DEFUN([gl_INIT],
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/property-white-space])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-xid-continue])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-xid-continue])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-xid-start])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-xid-start])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/property-zero-width])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/scripts])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/property-zero-width])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/scripts])
   AC_REQUIRE([AC_C_INLINE])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/syntax-c-ident])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/syntax-c-whitespace])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unictype/syntax-java-ident])
+  gl_LIBUNISTRING_MODULE([1.1], [unictype/syntax-java-ident])
   gl_LIBUNISTRING_MODULE([0.9.8], [unictype/syntax-java-whitespace])
   gl_LIBUNISTRING_LIBHEADER([0.9.11], [unigbrk.h])
   AC_PROG_MKDIR_P
   gl_MODULE_INDICATOR([unigbrk/u16-grapheme-breaks])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u16-grapheme-breaks])
+  gl_LIBUNISTRING_MODULE([1.1], [unigbrk/u16-grapheme-breaks])
   gl_MODULE_INDICATOR([unigbrk/u16-grapheme-next])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u16-grapheme-next])
+  gl_LIBUNISTRING_MODULE([1.1], [unigbrk/u16-grapheme-next])
   gl_MODULE_INDICATOR([unigbrk/u16-grapheme-prev])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u16-grapheme-prev])
+  gl_LIBUNISTRING_MODULE([1.1], [unigbrk/u16-grapheme-prev])
   gl_MODULE_INDICATOR([unigbrk/u32-grapheme-breaks])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u32-grapheme-breaks])
+  gl_LIBUNISTRING_MODULE([1.1], [unigbrk/u32-grapheme-breaks])
   gl_MODULE_INDICATOR([unigbrk/u32-grapheme-next])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u32-grapheme-next])
+  gl_LIBUNISTRING_MODULE([1.1], [unigbrk/u32-grapheme-next])
   gl_MODULE_INDICATOR([unigbrk/u32-grapheme-prev])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u32-grapheme-prev])
+  gl_LIBUNISTRING_MODULE([1.1], [unigbrk/u32-grapheme-prev])
   gl_MODULE_INDICATOR([unigbrk/u8-grapheme-breaks])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u8-grapheme-breaks])
+  gl_LIBUNISTRING_MODULE([1.1], [unigbrk/u8-grapheme-breaks])
   gl_MODULE_INDICATOR([unigbrk/u8-grapheme-next])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u8-grapheme-next])
+  gl_LIBUNISTRING_MODULE([1.1], [unigbrk/u8-grapheme-next])
   gl_MODULE_INDICATOR([unigbrk/u8-grapheme-prev])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/u8-grapheme-prev])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/uc-gbrk-prop])
+  gl_LIBUNISTRING_MODULE([1.1], [unigbrk/u8-grapheme-prev])
+  gl_LIBUNISTRING_MODULE([1.1], [unigbrk/uc-gbrk-prop])
   gl_MODULE_INDICATOR([unigbrk/uc-grapheme-breaks])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/uc-grapheme-breaks])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/uc-is-grapheme-break])
+  gl_LIBUNISTRING_MODULE([1.1], [unigbrk/uc-grapheme-breaks])
+  gl_LIBUNISTRING_MODULE([1.1], [unigbrk/uc-is-grapheme-break])
   gl_MODULE_INDICATOR([unigbrk/ulc-grapheme-breaks])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unigbrk/ulc-grapheme-breaks])
+  gl_LIBUNISTRING_MODULE([1.1], [unigbrk/ulc-grapheme-breaks])
   gl_LIBUNISTRING_LIBHEADER([0.9.11], [unilbrk.h])
   AC_PROG_MKDIR_P
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/u16-possible-linebreaks])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/u16-width-linebreaks])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/u32-possible-linebreaks])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/u32-width-linebreaks])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/u8-possible-linebreaks])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/u8-width-linebreaks])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/ulc-possible-linebreaks])
-  gl_LIBUNISTRING_MODULE([0.9.11], [unilbrk/ulc-width-linebreaks])
+  gl_LIBUNISTRING_MODULE([1.1], [unilbrk/u16-possible-linebreaks])
+  gl_LIBUNISTRING_MODULE([1.1], [unilbrk/u16-width-linebreaks])
+  gl_LIBUNISTRING_MODULE([1.1], [unilbrk/u32-possible-linebreaks])
+  gl_LIBUNISTRING_MODULE([1.1], [unilbrk/u32-width-linebreaks])
+  gl_LIBUNISTRING_MODULE([1.1], [unilbrk/u8-possible-linebreaks])
+  gl_LIBUNISTRING_MODULE([1.1], [unilbrk/u8-width-linebreaks])
+  gl_LIBUNISTRING_MODULE([1.1], [unilbrk/ulc-possible-linebreaks])
+  gl_LIBUNISTRING_MODULE([1.1], [unilbrk/ulc-width-linebreaks])
   gl_LIBUNISTRING_LIBHEADER([0.9.5], [uniname.h])
   AC_PROG_MKDIR_P
-  gl_LIBUNISTRING_MODULE([0.9.11], [uniname/uniname])
+  gl_LIBUNISTRING_MODULE([1.1], [uniname/uniname])
   gl_LIBUNISTRING_LIBHEADER([0.9.11], [uninorm.h])
   AC_PROG_MKDIR_P
-  gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/canonical-decomposition])
+  gl_LIBUNISTRING_MODULE([1.1], [uninorm/canonical-decomposition])
   gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/composition])
   gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/decomposing-form])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/decomposition])
+  gl_LIBUNISTRING_MODULE([1.1], [uninorm/decomposition])
   AC_REQUIRE([AC_C_INLINE])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/filter])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/nfc])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/nfd])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/nfkc])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/nfkd])
+  gl_LIBUNISTRING_MODULE([1.1], [uninorm/filter])
+  gl_LIBUNISTRING_MODULE([1.1], [uninorm/nfc])
+  gl_LIBUNISTRING_MODULE([1.1], [uninorm/nfd])
+  gl_LIBUNISTRING_MODULE([1.1], [uninorm/nfkc])
+  gl_LIBUNISTRING_MODULE([1.1], [uninorm/nfkd])
   gl_MODULE_INDICATOR_FOR_TESTS([uninorm/u16-normalize])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u16-normalize])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u16-normcmp])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u16-normcoll])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u16-normxfrm])
+  gl_LIBUNISTRING_MODULE([1.1], [uninorm/u16-normalize])
+  gl_LIBUNISTRING_MODULE([1.1], [uninorm/u16-normcmp])
+  gl_LIBUNISTRING_MODULE([1.1], [uninorm/u16-normcoll])
+  gl_LIBUNISTRING_MODULE([1.1], [uninorm/u16-normxfrm])
   gl_MODULE_INDICATOR_FOR_TESTS([uninorm/u32-normalize])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u32-normalize])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u32-normcmp])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u32-normcoll])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u32-normxfrm])
+  gl_LIBUNISTRING_MODULE([1.1], [uninorm/u32-normalize])
+  gl_LIBUNISTRING_MODULE([1.1], [uninorm/u32-normcmp])
+  gl_LIBUNISTRING_MODULE([1.1], [uninorm/u32-normcoll])
+  gl_LIBUNISTRING_MODULE([1.1], [uninorm/u32-normxfrm])
   gl_MODULE_INDICATOR_FOR_TESTS([uninorm/u8-normalize])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u8-normalize])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u8-normcmp])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u8-normcoll])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uninorm/u8-normxfrm])
+  gl_LIBUNISTRING_MODULE([1.1], [uninorm/u8-normalize])
+  gl_LIBUNISTRING_MODULE([1.1], [uninorm/u8-normcmp])
+  gl_LIBUNISTRING_MODULE([1.1], [uninorm/u8-normcoll])
+  gl_LIBUNISTRING_MODULE([1.1], [uninorm/u8-normxfrm])
   gl_UNISTD_H
   gl_UNISTD_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
@@ -2247,20 +2232,20 @@ AC_DEFUN([gl_INIT],
   ])
   gl_LIBUNISTRING_LIBHEADER([0.9.11], [uniwbrk.h])
   AC_PROG_MKDIR_P
-  gl_LIBUNISTRING_MODULE([0.9.11], [uniwbrk/u16-wordbreaks])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uniwbrk/u32-wordbreaks])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uniwbrk/u8-wordbreaks])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uniwbrk/ulc-wordbreaks])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uniwbrk/wordbreak-property])
+  gl_LIBUNISTRING_MODULE([1.1], [uniwbrk/u16-wordbreaks])
+  gl_LIBUNISTRING_MODULE([1.1], [uniwbrk/u32-wordbreaks])
+  gl_LIBUNISTRING_MODULE([1.1], [uniwbrk/u8-wordbreaks])
+  gl_LIBUNISTRING_MODULE([1.1], [uniwbrk/ulc-wordbreaks])
+  gl_LIBUNISTRING_MODULE([1.1], [uniwbrk/wordbreak-property])
   gl_LIBUNISTRING_LIBHEADER([0.9.11], [uniwidth.h])
   AC_PROG_MKDIR_P
-  gl_LIBUNISTRING_MODULE([0.9.11], [uniwidth/u16-strwidth])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uniwidth/u16-width])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uniwidth/u32-strwidth])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uniwidth/u32-width])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uniwidth/u8-strwidth])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uniwidth/u8-width])
-  gl_LIBUNISTRING_MODULE([0.9.11], [uniwidth/width])
+  gl_LIBUNISTRING_MODULE([1.1], [uniwidth/u16-strwidth])
+  gl_LIBUNISTRING_MODULE([1.1], [uniwidth/u16-width])
+  gl_LIBUNISTRING_MODULE([1.1], [uniwidth/u32-strwidth])
+  gl_LIBUNISTRING_MODULE([1.1], [uniwidth/u32-width])
+  gl_LIBUNISTRING_MODULE([1.1], [uniwidth/u8-strwidth])
+  gl_LIBUNISTRING_MODULE([1.1], [uniwidth/u8-width])
+  gl_LIBUNISTRING_MODULE([1.1], [uniwidth/width])
   gl_WCHAR_H
   gl_WCHAR_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
@@ -2268,35 +2253,24 @@ AC_DEFUN([gl_INIT],
   gl_WCTYPE_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
   gl_FUNC_WCWIDTH
-  if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then
-    AC_LIBOBJ([wcwidth])
+  gl_CONDITIONAL([GL_COND_OBJ_WCWIDTH],
+                 [test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1])
+  AM_COND_IF([GL_COND_OBJ_WCWIDTH], [
     gl_PREREQ_WCWIDTH
-  fi
+  ])
   gl_WCHAR_MODULE_INDICATOR([wcwidth])
   AC_REQUIRE([AC_CANONICAL_HOST])
-  case "$host_os" in
-    mingw*)
-      AC_LIBOBJ([windows-mutex])
-      ;;
-  esac
+  gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_MUTEX],
+                 [case "$host_os" in mingw*) true;; *) false;; esac])
   AC_REQUIRE([AC_CANONICAL_HOST])
-  case "$host_os" in
-    mingw*)
-      AC_LIBOBJ([windows-once])
-      ;;
-  esac
+  gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_ONCE],
+                 [case "$host_os" in mingw*) true;; *) false;; esac])
   AC_REQUIRE([AC_CANONICAL_HOST])
-  case "$host_os" in
-    mingw*)
-      AC_LIBOBJ([windows-recmutex])
-      ;;
-  esac
+  gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_RECMUTEX],
+                 [case "$host_os" in mingw*) true;; *) false;; esac])
   AC_REQUIRE([AC_CANONICAL_HOST])
-  case "$host_os" in
-    mingw*)
-      AC_LIBOBJ([windows-rwlock])
-      ;;
-  esac
+  gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_RWLOCK],
+                 [case "$host_os" in mingw*) true;; *) false;; esac])
   gl_XSIZE
   # End of code from modules
   m4_ifval(gl_LIBSOURCES_LIST, [
@@ -2320,16 +2294,28 @@ AC_DEFUN([gl_INIT],
   AC_CONFIG_COMMANDS_PRE([
     gl_libobjs=
     gl_ltlibobjs=
+    gl_libobjdeps=
     if test -n "$gl_LIBOBJS"; then
       # Remove the extension.
+changequote(,)dnl
       sed_drop_objext='s/\.o$//;s/\.obj$//'
+      sed_dirname1='s,//*,/,g'
+      sed_dirname2='s,\(.\)/$,\1,'
+      sed_dirname3='s,^[^/]*$,.,'
+      sed_dirname4='s,\(.\)/[^/]*$,\1,'
+      sed_basename1='s,.*/,,'
+changequote([, ])dnl
       for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do
         gl_libobjs="$gl_libobjs $i.$ac_objext"
         gl_ltlibobjs="$gl_ltlibobjs $i.lo"
+        i_dir=`echo "$i" | sed -e "$sed_dirname1" -e "$sed_dirname2" -e "$sed_dirname3" -e "$sed_dirname4"`
+        i_base=`echo "$i" | sed -e "$sed_basename1"`
+        gl_libobjdeps="$gl_libobjdeps $i_dir/\$(DEPDIR)/$i_base.Plo"
       done
     fi
     AC_SUBST([gl_LIBOBJS], [$gl_libobjs])
     AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs])
+    AC_SUBST([gl_LIBOBJDEPS], [$gl_libobjdeps])
   ])
   gltests_libdeps=
   gltests_ltlibdeps=
@@ -2352,23 +2338,20 @@ changequote([, ])dnl
   gl_module_indicator_condition=$gltests_WITNESS
   m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition])
   AC_REQUIRE([gl_SYS_SOCKET_H])
-  if test "$ac_cv_header_winsock2_h" = yes; then
-    AC_LIBOBJ([accept])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_ACCEPT], [test "$ac_cv_header_winsock2_h" = yes])
   gl_SYS_SOCKET_MODULE_INDICATOR([accept])
   gl_ARPA_INET_H
   gl_ARPA_INET_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
   AC_REQUIRE([gl_SYS_SOCKET_H])
-  if test "$ac_cv_header_winsock2_h" = yes; then
-    AC_LIBOBJ([bind])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_BIND], [test "$ac_cv_header_winsock2_h" = yes])
   gl_SYS_SOCKET_MODULE_INDICATOR([bind])
   gl_FUNC_BTOWC
-  if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then
-    AC_LIBOBJ([btowc])
+  gl_CONDITIONAL([GL_COND_OBJ_BTOWC],
+                 [test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1])
+  AM_COND_IF([GL_COND_OBJ_BTOWC], [
     gl_PREREQ_BTOWC
-  fi
+  ])
   gl_WCHAR_MODULE_INDICATOR([btowc])
   gt_LOCALE_FR
   gt_LOCALE_FR_UTF8
@@ -2386,111 +2369,103 @@ changequote([, ])dnl
   gl_STDLIB_MODULE_INDICATOR([calloc-posix])
   gl_MODULE_INDICATOR_FOR_TESTS([cloexec])
   gl_FUNC_CLOSE
-  if test $REPLACE_CLOSE = 1; then
-    AC_LIBOBJ([close])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_CLOSE], [test $REPLACE_CLOSE = 1])
   gl_UNISTD_MODULE_INDICATOR([close])
   AC_REQUIRE([gl_SYS_SOCKET_H])
-  if test "$ac_cv_header_winsock2_h" = yes; then
-    AC_LIBOBJ([connect])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_CONNECT], [test "$ac_cv_header_winsock2_h" = yes])
   gl_SYS_SOCKET_MODULE_INDICATOR([connect])
   gl_CTYPE_H
   gl_CTYPE_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
   gl_DOUBLE_SLASH_ROOT
   gl_FUNC_DUP2
-  if test $REPLACE_DUP2 = 1; then
-    AC_LIBOBJ([dup2])
+  gl_CONDITIONAL([GL_COND_OBJ_DUP2], [test $REPLACE_DUP2 = 1])
+  AM_COND_IF([GL_COND_OBJ_DUP2], [
     gl_PREREQ_DUP2
-  fi
+  ])
   gl_UNISTD_MODULE_INDICATOR([dup2])
   gl_ENVIRON
   gl_UNISTD_MODULE_INDICATOR([environ])
   gl_ERROR
-  AS_IF([test "$ac_cv_lib_error_at_line" = no], [
-    AC_LIBOBJ([error])
+  gl_CONDITIONAL([GL_COND_OBJ_ERROR], [test "$ac_cv_lib_error_at_line" = no])
+  AM_COND_IF([GL_COND_OBJ_ERROR], [
     gl_PREREQ_ERROR
   ])
   m4_ifdef([AM_XGETTEXT_OPTION],
     [AM_][XGETTEXT_OPTION([--flag=error:3:c-format])
      AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])])
   gl_FUNC_FCNTL
-  if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then
-    AC_LIBOBJ([fcntl])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_FCNTL],
+                 [test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1])
   gl_FCNTL_MODULE_INDICATOR([fcntl])
   gl_FCNTL_H
   gl_FCNTL_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
   gl_FUNC_FDOPEN
-  if test $REPLACE_FDOPEN = 1; then
-    AC_LIBOBJ([fdopen])
+  gl_CONDITIONAL([GL_COND_OBJ_FDOPEN], [test $REPLACE_FDOPEN = 1])
+  AM_COND_IF([GL_COND_OBJ_FDOPEN], [
     gl_PREREQ_FDOPEN
-  fi
+  ])
   gl_STDIO_MODULE_INDICATOR([fdopen])
   gl_FUNC_FSTAT
-  if test $REPLACE_FSTAT = 1; then
-    AC_LIBOBJ([fstat])
+  gl_CONDITIONAL([GL_COND_OBJ_FSTAT], [test $REPLACE_FSTAT = 1])
+  AM_COND_IF([GL_COND_OBJ_FSTAT], [
     case "$host_os" in
       mingw*)
         AC_LIBOBJ([stat-w32])
         ;;
     esac
     gl_PREREQ_FSTAT
-  fi
+  ])
   gl_SYS_STAT_MODULE_INDICATOR([fstat])
   gl_FUNC_FTRUNCATE
-  if test $HAVE_FTRUNCATE = 0 || test $REPLACE_FTRUNCATE = 1; then
-    AC_LIBOBJ([ftruncate])
+  gl_CONDITIONAL([GL_COND_OBJ_FTRUNCATE],
+                 [test $HAVE_FTRUNCATE = 0 || test $REPLACE_FTRUNCATE = 1])
+  AM_COND_IF([GL_COND_OBJ_FTRUNCATE], [
     gl_PREREQ_FTRUNCATE
-  fi
+  ])
   gl_UNISTD_MODULE_INDICATOR([ftruncate])
   gl_FUNC_GETCWD_LGPL
-  if test $REPLACE_GETCWD = 1; then
-    AC_LIBOBJ([getcwd-lgpl])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_GETCWD_LGPL], [test $REPLACE_GETCWD = 1])
   gl_UNISTD_MODULE_INDICATOR([getcwd])
   gl_FUNC_GETDTABLESIZE
-  if test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1; then
-    AC_LIBOBJ([getdtablesize])
+  gl_CONDITIONAL([GL_COND_OBJ_GETDTABLESIZE],
+                 [test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1])
+  AM_COND_IF([GL_COND_OBJ_GETDTABLESIZE], [
     gl_PREREQ_GETDTABLESIZE
-  fi
+  ])
   gl_UNISTD_MODULE_INDICATOR([getdtablesize])
   gl_FUNC_GETPAGESIZE
-  if test $REPLACE_GETPAGESIZE = 1; then
-    AC_LIBOBJ([getpagesize])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_GETPAGESIZE], [test $REPLACE_GETPAGESIZE = 1])
   gl_UNISTD_MODULE_INDICATOR([getpagesize])
   gl_FUNC_GETPROGNAME
   AC_SUBST([LIBINTL])
   AC_SUBST([LTLIBINTL])
   gl_FUNC_GETTIMEOFDAY
-  if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then
-    AC_LIBOBJ([gettimeofday])
+  gl_CONDITIONAL([GL_COND_OBJ_GETTIMEOFDAY],
+                 [test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1])
+  AM_COND_IF([GL_COND_OBJ_GETTIMEOFDAY], [
     gl_PREREQ_GETTIMEOFDAY
-  fi
+  ])
   gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
   gl_MUSL_LIBC
   dnl Distinguish OpenBSD >= 6.2 from OpenBSD < 6.2.
   AC_CHECK_FUNCS_ONCE([duplocale])
   gl_FUNC_INET_PTON
-  if test $HAVE_INET_PTON = 0 || test $REPLACE_INET_PTON = 1; then
-    AC_LIBOBJ([inet_pton])
+  gl_CONDITIONAL([GL_COND_OBJ_INET_PTON],
+                 [test $HAVE_INET_PTON = 0 || test $REPLACE_INET_PTON = 1])
+  AM_COND_IF([GL_COND_OBJ_INET_PTON], [
     gl_PREREQ_INET_PTON
-  fi
+  ])
   gl_ARPA_INET_MODULE_INDICATOR([inet_pton])
   AC_C_BIGENDIAN
   gl_INTTYPES_H
   gl_FUNC_IOCTL
-  if test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1; then
-    AC_LIBOBJ([ioctl])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_IOCTL],
+                 [test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1])
   gl_SYS_IOCTL_MODULE_INDICATOR([ioctl])
   gl_FUNC_ISBLANK
-  if test $HAVE_ISBLANK = 0; then
-    AC_LIBOBJ([isblank])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_ISBLANK], [test $HAVE_ISBLANK = 0])
   gl_MODULE_INDICATOR([isblank])
   gl_CTYPE_MODULE_INDICATOR([isblank])
   gl_DOUBLE_EXPONENT_LOCATION
@@ -2507,9 +2482,7 @@ changequote([, ])dnl
   gt_LOCALE_ZH_CN
   AC_REQUIRE([gl_LARGEFILE])
   AC_REQUIRE([gl_SYS_SOCKET_H])
-  if test "$ac_cv_header_winsock2_h" = yes; then
-    AC_LIBOBJ([listen])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_LISTEN], [test "$ac_cv_header_winsock2_h" = yes])
   gl_SYS_SOCKET_MODULE_INDICATOR([listen])
   AC_CHECK_FUNCS_ONCE([newlocale])
   AC_CHECK_FUNCS_ONCE([newlocale])
@@ -2517,10 +2490,10 @@ changequote([, ])dnl
   AC_CHECK_DECLS_ONCE([alarm])
   AC_REQUIRE([gl_SEMAPHORE])
   gl_FUNC_LSTAT
-  if test $REPLACE_LSTAT = 1; then
-    AC_LIBOBJ([lstat])
+  gl_CONDITIONAL([GL_COND_OBJ_LSTAT], [test $REPLACE_LSTAT = 1])
+  AM_COND_IF([GL_COND_OBJ_LSTAT], [
     gl_PREREQ_LSTAT
-  fi
+  ])
   gl_SYS_STAT_MODULE_INDICATOR([lstat])
   gl_FUNC_MALLOC_GNU
   if test $REPLACE_MALLOC_FOR_MALLOC_GNU = 1; then
@@ -2533,76 +2506,75 @@ changequote([, ])dnl
   gt_LOCALE_ZH_CN
   gt_LOCALE_FR_UTF8
   gl_FUNC_MBTOWC
-  if test $HAVE_MBTOWC = 0 || test $REPLACE_MBTOWC = 1; then
-    AC_LIBOBJ([mbtowc])
+  gl_CONDITIONAL([GL_COND_OBJ_MBTOWC],
+                 [test $HAVE_MBTOWC = 0 || test $REPLACE_MBTOWC = 1])
+  AM_COND_IF([GL_COND_OBJ_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])
   AC_REQUIRE([gl_MSVC_INVAL])
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    AC_LIBOBJ([msvc-inval])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_MSVC_INVAL],
+                 [test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1])
   AC_REQUIRE([gl_MSVC_NOTHROW])
-  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
-    AC_LIBOBJ([msvc-nothrow])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_MSVC_NOTHROW],
+                 [test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1])
   gl_MODULE_INDICATOR([msvc-nothrow])
   gl_FUNC_NANOSLEEP
-  if test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1; then
-    AC_LIBOBJ([nanosleep])
-    gl_PREREQ_NANOSLEEP
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_NANOSLEEP],
+                 [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1])
   gl_TIME_MODULE_INDICATOR([nanosleep])
   AC_CHECK_DECLS_ONCE([alarm])
   gl_HEADER_NETINET_IN
   gl_CONDITIONAL_HEADER([netinet/in.h])
   AC_PROG_MKDIR_P
   gl_FUNC_OPEN
-  if test $REPLACE_OPEN = 1; then
-    AC_LIBOBJ([open])
+  gl_CONDITIONAL([GL_COND_OBJ_OPEN], [test $REPLACE_OPEN = 1])
+  AM_COND_IF([GL_COND_OBJ_OPEN], [
     gl_PREREQ_OPEN
-  fi
+  ])
   gl_FCNTL_MODULE_INDICATOR([open])
   gl_PATHMAX
   gl_FUNC_PERROR
-  if test $REPLACE_PERROR = 1; then
-    AC_LIBOBJ([perror])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_PERROR], [test $REPLACE_PERROR = 1])
   gl_STRING_MODULE_INDICATOR([perror])
   gl_FUNC_PIPE
-  if test $HAVE_PIPE = 0; then
-    AC_LIBOBJ([pipe])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_PIPE], [test $HAVE_PIPE = 0])
   gl_UNISTD_MODULE_INDICATOR([pipe])
+  gl_FUNC_PSELECT
+  gl_CONDITIONAL([GL_COND_OBJ_PSELECT],
+                 [test $HAVE_PSELECT = 0 || test $REPLACE_PSELECT = 1])
+  gl_SYS_SELECT_MODULE_INDICATOR([pselect])
+  AC_CHECK_HEADERS_ONCE([sys/wait.h])
   gl_PTHREAD_H
   gl_PTHREAD_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
   gl_PTHREAD_THREAD
-  if test $HAVE_PTHREAD_CREATE = 0 || test $REPLACE_PTHREAD_CREATE = 1; then
-    AC_LIBOBJ([pthread-thread])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_PTHREAD_THREAD],
+                 [test $HAVE_PTHREAD_CREATE = 0 || test $REPLACE_PTHREAD_CREATE = 1])
   gl_PTHREAD_MODULE_INDICATOR([pthread-thread])
   gl_FUNC_PTHREAD_SIGMASK
-  if test $HAVE_PTHREAD_SIGMASK = 0 || test $REPLACE_PTHREAD_SIGMASK = 1; then
-    AC_LIBOBJ([pthread_sigmask])
+  gl_CONDITIONAL([GL_COND_OBJ_PTHREAD_SIGMASK],
+                 [test $HAVE_PTHREAD_SIGMASK = 0 || test $REPLACE_PTHREAD_SIGMASK = 1])
+  AM_COND_IF([GL_COND_OBJ_PTHREAD_SIGMASK], [
     gl_PREREQ_PTHREAD_SIGMASK
-  fi
+  ])
   gl_SIGNAL_MODULE_INDICATOR([pthread_sigmask])
   gl_FUNC_PUTENV
-  if test $REPLACE_PUTENV = 1; then
-    AC_LIBOBJ([putenv])
+  gl_CONDITIONAL([GL_COND_OBJ_PUTENV], [test $REPLACE_PUTENV = 1])
+  AM_COND_IF([GL_COND_OBJ_PUTENV], [
     gl_PREREQ_PUTENV
-  fi
+  ])
   gl_STDLIB_MODULE_INDICATOR([putenv])
   gl_FUNC_RAISE
-  if test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1; then
-    AC_LIBOBJ([raise])
+  gl_CONDITIONAL([GL_COND_OBJ_RAISE],
+                 [test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1])
+  AM_COND_IF([GL_COND_OBJ_RAISE], [
     gl_PREREQ_RAISE
-  fi
+  ])
   gl_SIGNAL_MODULE_INDICATOR([raise])
   gl_FUNC_REALLOC_GNU
   if test $REPLACE_REALLOC_FOR_REALLOC_GNU = 1; then
@@ -2615,52 +2587,42 @@ changequote([, ])dnl
   fi
   gl_STDLIB_MODULE_INDICATOR([realloc-posix])
   gl_FUNC_REALLOCARRAY
-  if test $HAVE_REALLOCARRAY = 0 || test $REPLACE_REALLOCARRAY = 1; then
-    AC_LIBOBJ([reallocarray])
+  gl_CONDITIONAL([GL_COND_OBJ_REALLOCARRAY],
+                 [test $HAVE_REALLOCARRAY = 0 || test $REPLACE_REALLOCARRAY = 1])
+  AM_COND_IF([GL_COND_OBJ_REALLOCARRAY], [
     gl_PREREQ_REALLOCARRAY
-  fi
+  ])
   gl_MODULE_INDICATOR([reallocarray])
   gl_STDLIB_MODULE_INDICATOR([reallocarray])
   gl_SCHED_H
   gl_SCHED_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
   gl_FUNC_SCHED_YIELD
-  if test $HAVE_SCHED_YIELD = 0 || test $REPLACE_SCHED_YIELD = 1; then
-    AC_LIBOBJ([sched_yield])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_SCHED_YIELD],
+                 [test $HAVE_SCHED_YIELD = 0 || test $REPLACE_SCHED_YIELD = 1])
   gl_SCHED_MODULE_INDICATOR([sched_yield])
   gl_FUNC_SELECT
-  if test $REPLACE_SELECT = 1; then
-    AC_LIBOBJ([select])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_SELECT], [test $REPLACE_SELECT = 1])
   gl_SYS_SELECT_MODULE_INDICATOR([select])
   AC_CHECK_HEADERS_ONCE([sys/wait.h])
   gl_FUNC_SETENV
-  if test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1; then
-    AC_LIBOBJ([setenv])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_SETENV],
+                 [test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1])
   gl_STDLIB_MODULE_INDICATOR([setenv])
   gl_FUNC_SETLOCALE
-  if test $REPLACE_SETLOCALE = 1; then
-    AC_LIBOBJ([setlocale])
+  gl_CONDITIONAL([GL_COND_OBJ_SETLOCALE], [test $REPLACE_SETLOCALE = 1])
+  AM_COND_IF([GL_COND_OBJ_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_SYS_SOCKET_H])
-  if test "$ac_cv_header_winsock2_h" = yes; then
-    AC_LIBOBJ([setsockopt])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_SETSOCKOPT],
+                 [test "$ac_cv_header_winsock2_h" = yes])
   gl_SYS_SOCKET_MODULE_INDICATOR([setsockopt])
-  gl_SIGACTION
-  if test $HAVE_SIGACTION = 0; then
-    AC_LIBOBJ([sigaction])
-    gl_PREREQ_SIGACTION
-  fi
-  gl_SIGNAL_MODULE_INDICATOR([sigaction])
   gl_SIGNAL_H
   gl_SIGNAL_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
@@ -2668,21 +2630,18 @@ changequote([, ])dnl
   AC_REQUIRE([gl_DOUBLE_EXPONENT_LOCATION])
   AC_REQUIRE([gl_LONG_DOUBLE_EXPONENT_LOCATION])
   gl_SIGNALBLOCKING
-  if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
-    AC_LIBOBJ([sigprocmask])
+  gl_CONDITIONAL([GL_COND_OBJ_SIGPROCMASK], [test $HAVE_POSIX_SIGNALBLOCKING = 0])
+  AM_COND_IF([GL_COND_OBJ_SIGPROCMASK], [
     gl_PREREQ_SIGPROCMASK
-  fi
+  ])
   gl_SIGNAL_MODULE_INDICATOR([sigprocmask])
   gl_FUNC_SLEEP
-  if test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1; then
-    AC_LIBOBJ([sleep])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_SLEEP],
+                 [test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1])
   gl_UNISTD_MODULE_INDICATOR([sleep])
   AC_CHECK_DECLS_ONCE([alarm])
   AC_REQUIRE([gl_SYS_SOCKET_H])
-  if test "$ac_cv_header_winsock2_h" = yes; then
-    AC_LIBOBJ([socket])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_SOCKET], [test "$ac_cv_header_winsock2_h" = yes])
   # When this module is used, sockets may actually occur as file descriptors,
   # hence it is worth warning if the modules 'close' and 'ioctl' are not used.
   m4_ifdef([gl_UNISTD_H_DEFAULTS], [gl_UNISTD_H_REQUIRE_DEFAULTS])
@@ -2697,15 +2656,15 @@ changequote([, ])dnl
   AC_REQUIRE([gl_SOCKETS])
   gl_TYPE_SOCKLEN_T
   gl_FUNC_STAT
-  if test $REPLACE_STAT = 1; then
-    AC_LIBOBJ([stat])
+  gl_CONDITIONAL([GL_COND_OBJ_STAT], [test $REPLACE_STAT = 1])
+  AM_COND_IF([GL_COND_OBJ_STAT], [
     case "$host_os" in
       mingw*)
         AC_LIBOBJ([stat-w32])
         ;;
     esac
     gl_PREREQ_STAT
-  fi
+  ])
   gl_SYS_STAT_MODULE_INDICATOR([stat])
   gl_STAT_TIME
   gl_STAT_BIRTHTIME
@@ -2717,6 +2676,8 @@ changequote([, ])dnl
   gl_STDIO_H
   gl_STDIO_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
+  gl_CONDITIONAL([GL_COND_OBJ_STDIO_READ], [test $REPLACE_STDIO_READ_FUNCS = 1])
+  gl_CONDITIONAL([GL_COND_OBJ_STDIO_WRITE], [test $REPLACE_STDIO_WRITE_FUNCS = 1])
   dnl No need to create extra modules for these functions. Everyone who uses
   dnl <stdio.h> likely needs them.
   gl_STDIO_MODULE_INDICATOR([fscanf])
@@ -2741,17 +2702,16 @@ changequote([, ])dnl
   gl_STDIO_MODULE_INDICATOR([puts])
   gl_STDIO_MODULE_INDICATOR([fwrite])
   gl_FUNC_STRERROR
-  if test $REPLACE_STRERROR = 1; then
-    AC_LIBOBJ([strerror])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_STRERROR], [test $REPLACE_STRERROR = 1])
   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_CONDITIONAL([GL_COND_OBJ_STRERROR_OVERRIDE],
+                 [test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1])
+  AM_COND_IF([GL_COND_OBJ_STRERROR_OVERRIDE], [
     gl_PREREQ_SYS_H_WINSOCK2
-  fi
+  ])
   gl_FUNC_STRERROR_R
   AS_IF([test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1], [
     AC_LIBOBJ([strerror_r])
@@ -2768,9 +2728,8 @@ changequote([, ])dnl
   AC_CHECK_HEADERS_ONCE([sys/mman.h])
   AC_CHECK_FUNCS_ONCE([mprotect])
   gl_FUNC_SYMLINK
-  if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then
-    AC_LIBOBJ([symlink])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_SYMLINK],
+                 [test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1])
   gl_UNISTD_MODULE_INDICATOR([symlink])
   gl_SYS_IOCTL_H
   gl_SYS_IOCTL_H_REQUIRE_DEFAULTS
@@ -2885,51 +2844,47 @@ changequote([, ])dnl
   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_CONDITIONAL([GL_COND_OBJ_UNSETENV],
+                 [test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1])
+  AM_COND_IF([GL_COND_OBJ_UNSETENV], [
     gl_PREREQ_UNSETENV
-  fi
+  ])
   gl_STDLIB_MODULE_INDICATOR([unsetenv])
   gl_FUNC_USLEEP
-  if test $HAVE_USLEEP = 0 || test $REPLACE_USLEEP = 1; then
-    AC_LIBOBJ([usleep])
-  fi
+  gl_CONDITIONAL([GL_COND_OBJ_USLEEP],
+                 [test $HAVE_USLEEP = 0 || test $REPLACE_USLEEP = 1])
   gl_UNISTD_MODULE_INDICATOR([usleep])
   AC_C_VARARRAYS
   gl_FUNC_WCRTOMB
-  if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then
-    AC_LIBOBJ([wcrtomb])
+  gl_CONDITIONAL([GL_COND_OBJ_WCRTOMB],
+                 [test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1])
+  AM_COND_IF([GL_COND_OBJ_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_CONDITIONAL([GL_COND_OBJ_WCTOB],
+                 [test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1])
+  AM_COND_IF([GL_COND_OBJ_WCTOB], [
     gl_PREREQ_WCTOB
-  fi
+  ])
   gl_WCHAR_MODULE_INDICATOR([wctob])
   gl_FUNC_WCTOMB
-  if test $REPLACE_WCTOMB = 1; then
-    AC_LIBOBJ([wctomb])
+  gl_CONDITIONAL([GL_COND_OBJ_WCTOMB], [test $REPLACE_WCTOMB = 1])
+  AM_COND_IF([GL_COND_OBJ_WCTOMB], [
     gl_PREREQ_WCTOMB
-  fi
+  ])
   gl_STDLIB_MODULE_INDICATOR([wctomb])
   AC_REQUIRE([AC_CANONICAL_HOST])
-  case "$host_os" in
-    mingw*)
-      AC_LIBOBJ([windows-thread])
-      ;;
-  esac
+  gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_THREAD],
+                 [case "$host_os" in mingw*) true;; *) false;; esac])
   AC_REQUIRE([AC_CANONICAL_HOST])
-  case "$host_os" in
-    mingw*)
-      AC_LIBOBJ([windows-tls])
-      ;;
-  esac
+  gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_TLS],
+                 [case "$host_os" in mingw*) true;; *) false;; esac])
   gl_XALLOC
   gl_MODULE_INDICATOR([xalloc])
   gl_MODULE_INDICATOR([xalloc-die])
@@ -2956,17 +2911,30 @@ changequote([, ])dnl
   AC_CONFIG_COMMANDS_PRE([
     gltests_libobjs=
     gltests_ltlibobjs=
+    gltests_libobjdeps=
     if test -n "$gltests_LIBOBJS"; then
       # Remove the extension.
+changequote(,)dnl
       sed_drop_objext='s/\.o$//;s/\.obj$//'
+      sed_dirname1='s,//*,/,g'
+      sed_dirname2='s,\(.\)/$,\1,'
+      sed_dirname3='s,^[^/]*$,.,'
+      sed_dirname4='s,\(.\)/[^/]*$,\1,'
+      sed_basename1='s,.*/,,'
+changequote([, ])dnl
       for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do
         gltests_libobjs="$gltests_libobjs $i.$ac_objext"
         gltests_ltlibobjs="$gltests_ltlibobjs $i.lo"
+        i_dir=`echo "$i" | sed -e "$sed_dirname1" -e "$sed_dirname2" -e "$sed_dirname3" -e "$sed_dirname4"`
+        i_base=`echo "$i" | sed -e "$sed_basename1"`
+        gltests_libobjdeps="$gltests_libobjdeps $i_dir/\$(DEPDIR)/$i_base.Plo"
       done
     fi
     AC_SUBST([gltests_LIBOBJS], [$gltests_libobjs])
     AC_SUBST([gltests_LTLIBOBJS], [$gltests_ltlibobjs])
+    AC_SUBST([gltests_LIBOBJDEPS], [$gltests_libobjdeps])
   ])
+  AC_REQUIRE([gl_CC_GNULIB_WARNINGS])
   LIBTESTS_LIBDEPS="$gltests_libdeps"
   AC_SUBST([LIBTESTS_LIBDEPS])
 ])
@@ -3036,6 +3004,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/amemxfrm.h
   lib/arg-nonnull.h
   lib/array-mergesort.h
+  lib/assert.in.h
   lib/attribute.h
   lib/c++defs.h
   lib/c-ctype.c
@@ -3072,7 +3041,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/iconv_open.c
   lib/iconveh.h
   lib/idx.h
-  lib/intprops.h
+  lib/intprops-internal.h
   lib/inttypes.in.h
   lib/isnan.c
   lib/isnand-nolibm.h
@@ -3135,7 +3104,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/signbitf.c
   lib/signbitl.c
   lib/size_max.h
-  lib/stdbool.in.h
+  lib/stdckdint.in.h
   lib/stddef.in.h
   lib/stdint.in.h
   lib/stdio-impl.h
@@ -3966,8 +3935,10 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/absolute-header.m4
   m4/alloca.m4
   m4/arpa_inet_h.m4
+  m4/assert_h.m4
   m4/btowc.m4
   m4/builtin-expect.m4
+  m4/c-bool.m4
   m4/calloc.m4
   m4/close.m4
   m4/codeset.m4
@@ -4072,6 +4043,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/printf-frexp.m4
   m4/printf-frexpl.m4
   m4/printf.m4
+  m4/pselect.m4
   m4/pthread-thread.m4
   m4/pthread_h.m4
   m4/pthread_rwlock_rdlock.m4
@@ -4088,7 +4060,6 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/setenv.m4
   m4/setlocale.m4
   m4/setlocale_null.m4
-  m4/sigaction.m4
   m4/signal_h.m4
   m4/signalblocking.m4
   m4/signbit.m4
@@ -4103,7 +4074,6 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/stat.m4
   m4/std-gnu11.m4
   m4/stdalign.m4
-  m4/stdbool.m4
   m4/stddef_h.m4
   m4/stdint.m4
   m4/stdint_h.m4
@@ -4160,6 +4130,7 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/test-alloca-opt.c
   tests/test-arpa_inet.c
   tests/test-array-mergesort.c
+  tests/test-assert.c
   tests/test-binary-io.c
   tests/test-binary-io.sh
   tests/test-bind.c
@@ -4260,6 +4231,7 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/test-pipe.c
   tests/test-printf-frexp.c
   tests/test-printf-frexpl.c
+  tests/test-pselect.c
   tests/test-pthread-thread.c
   tests/test-pthread.c
   tests/test-pthread_sigmask1.c
@@ -4284,7 +4256,6 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/test-setlocale_null-mt-one.c
   tests/test-setlocale_null.c
   tests/test-setsockopt.c
-  tests/test-sigaction.c
   tests/test-signal-h.c
   tests/test-signbit.c
   tests/test-sigprocmask.c
@@ -4295,6 +4266,7 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/test-stat.h
   tests/test-stdalign.c
   tests/test-stdbool.c
+  tests/test-stdckdint.c
   tests/test-stddef.c
   tests/test-stdint.c
   tests/test-stdio.c
@@ -4908,6 +4880,8 @@ AC_DEFUN([gl_FILE_LIST], [
   tests=lib/ialloc.h
   tests=lib/ignore-value.h
   tests=lib/inet_pton.c
+  tests=lib/intprops-internal.h
+  tests=lib/intprops.h
   tests=lib/ioctl.c
   tests=lib/isblank.c
   tests=lib/listen.c
@@ -4925,6 +4899,7 @@ AC_DEFUN([gl_FILE_LIST], [
   tests=lib/pathmax.h
   tests=lib/perror.c
   tests=lib/pipe.c
+  tests=lib/pselect.c
   tests=lib/pthread-thread.c
   tests=lib/pthread.in.h
   tests=lib/pthread_sigmask.c
@@ -4939,9 +4914,6 @@ AC_DEFUN([gl_FILE_LIST], [
   tests=lib/setenv.c
   tests=lib/setlocale.c
   tests=lib/setsockopt.c
-  tests=lib/sig-handler.c
-  tests=lib/sig-handler.h
-  tests=lib/sigaction.c
   tests=lib/signal.in.h
   tests=lib/sigprocmask.c
   tests=lib/sleep.c
@@ -4954,6 +4926,8 @@ AC_DEFUN([gl_FILE_LIST], [
   tests=lib/stat-w32.h
   tests=lib/stat.c
   tests=lib/stdalign.in.h
+  tests=lib/stdio-read.c
+  tests=lib/stdio-write.c
   tests=lib/stdio.in.h
   tests=lib/strerror-override.c
   tests=lib/strerror-override.h
@@ -4970,6 +4944,7 @@ AC_DEFUN([gl_FILE_LIST], [
   tests=lib/time.in.h
   tests=lib/unsetenv.c
   tests=lib/usleep.c
+  tests=lib/verify.h
   tests=lib/w32sock.h
   tests=lib/warn-on-use.h
   tests=lib/wcrtomb.c