bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

m4: use AC_SUBST with two arguments when applicable


From: Akim Demaille
Subject: m4: use AC_SUBST with two arguments when applicable
Date: Sat, 9 May 2020 14:14:57 +0200

Actually, given the number of times this pattern is used, I would personally 
introduce gl_SUBSTS, a variadic version of AC_SUBST, to avoid all this 
repetition, say something like

  gl_SUBSTS(
    [[GNULIB_ISWBLANK], [0]],
    [[GNULIB_ISWDIGIT], [0]],
    [[GNULIB_ISWXDIGIT], [0]],
    [[GNULIB_WCTYPE], [0]],
    [[GNULIB_ISWCTYPE], [0]],
    [[GNULIB_WCTRANS], [0]],
    [[GNULIB_TOWCTRANS], [0]]
  )

instead of

  AC_SUBST([GNULIB_ISWBLANK], [0])
  AC_SUBST([GNULIB_ISWDIGIT], [0])
  AC_SUBST([GNULIB_ISWXDIGIT], [0])
  AC_SUBST([GNULIB_WCTYPE], [0])
  AC_SUBST([GNULIB_ISWCTYPE], [0])
  AC_SUBST([GNULIB_WCTRANS], [0])
  AC_SUBST([GNULIB_TOWCTRANS], [0])

I can take care of that if there is agreement.

Ok to install?

commit 295dc196c4f5e186a7a435fa4c7535943e815132
Author: Akim Demaille <address@hidden>
Date:   Sat May 9 14:08:12 2020 +0200

    m4: use AC_SUBST with two arguments when applicable.
    
    * m4/arpa_inet_h.m4, m4/dirent_h.m4, m4/fcntl_h.m4,
    * m4/fnmatch_h.m4, m4/iconv_h.m4, m4/inttypes.m4, m4/langinfo_h.m4,
    * m4/locale_h.m4, m4/math_h.m4, m4/monetary_h.m4, m4/netdb_h.m4,
    * m4/poll_h.m4, m4/pthread_h.m4, m4/pty_h.m4, m4/sched_h.m4,
    * m4/search_h.m4, m4/signal_h.m4, m4/spawn_h.m4, m4/stddef_h.m4,
    * m4/stdio_h.m4, m4/stdlib_h.m4, m4/string_h.m4, m4/sys_file_h.m4,
    * m4/sys_ioctl_h.m4, m4/sys_resource_h.m4, m4/sys_select_h.m4,
    * m4/sys_socket_h.m4, m4/sys_stat_h.m4, m4/sys_time_h.m4,
    * m4/sys_utsname_h.m4, m4/termios_h.m4, m4/threads.m4, m4/time_h.m4,
    * m4/uchar.m4, m4/unistd_h.m4, m4/utime_h.m4, m4/wchar_h.m4,
    * m4/wctype_h.m4:
    Use AC_SUBST([FOO], [BAR]) instead of FOO=BAR; AC_SUBST([FOO]).

diff --git a/ChangeLog b/ChangeLog
index bc99924b1..4cc9d30cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2020-05-09  Akim Demaille  <address@hidden>
+
+       m4: use AC_SUBST with two arguments when applicable.
+       * m4/arpa_inet_h.m4, m4/dirent_h.m4, m4/fcntl_h.m4,
+       * m4/fnmatch_h.m4, m4/iconv_h.m4, m4/inttypes.m4, m4/langinfo_h.m4,
+       * m4/locale_h.m4, m4/math_h.m4, m4/monetary_h.m4, m4/netdb_h.m4,
+       * m4/poll_h.m4, m4/pthread_h.m4, m4/pty_h.m4, m4/sched_h.m4,
+       * m4/search_h.m4, m4/signal_h.m4, m4/spawn_h.m4, m4/stddef_h.m4,
+       * m4/stdio_h.m4, m4/stdlib_h.m4, m4/string_h.m4, m4/sys_file_h.m4,
+       * m4/sys_ioctl_h.m4, m4/sys_resource_h.m4, m4/sys_select_h.m4,
+       * m4/sys_socket_h.m4, m4/sys_stat_h.m4, m4/sys_time_h.m4,
+       * m4/sys_utsname_h.m4, m4/termios_h.m4, m4/threads.m4, m4/time_h.m4,
+       * m4/uchar.m4, m4/unistd_h.m4, m4/utime_h.m4, m4/wchar_h.m4,
+       * m4/wctype_h.m4:
+       Use AC_SUBST([FOO], [BAR]) instead of FOO=BAR; AC_SUBST([FOO]).
+
 2020-05-09  Akim Demaille  <address@hidden>
 
        bitset: use the attribute module
diff --git a/m4/arpa_inet_h.m4 b/m4/arpa_inet_h.m4
index b39449494..3f0562b05 100644
--- a/m4/arpa_inet_h.m4
+++ b/m4/arpa_inet_h.m4
@@ -1,4 +1,4 @@
-# arpa_inet_h.m4 serial 14
+# arpa_inet_h.m4 serial 15
 dnl Copyright (C) 2006, 2008-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -49,11 +49,11 @@ AC_DEFUN([gl_ARPA_INET_MODULE_INDICATOR],
 
 AC_DEFUN([gl_ARPA_INET_H_DEFAULTS],
 [
-  GNULIB_INET_NTOP=0;     AC_SUBST([GNULIB_INET_NTOP])
-  GNULIB_INET_PTON=0;     AC_SUBST([GNULIB_INET_PTON])
+  AC_SUBST([GNULIB_INET_NTOP], [0])
+  AC_SUBST([GNULIB_INET_PTON], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_DECL_INET_NTOP=1;  AC_SUBST([HAVE_DECL_INET_NTOP])
-  HAVE_DECL_INET_PTON=1;  AC_SUBST([HAVE_DECL_INET_PTON])
-  REPLACE_INET_NTOP=0;    AC_SUBST([REPLACE_INET_NTOP])
-  REPLACE_INET_PTON=0;    AC_SUBST([REPLACE_INET_PTON])
+  AC_SUBST([HAVE_DECL_INET_NTOP], [1])
+  AC_SUBST([HAVE_DECL_INET_PTON], [1])
+  AC_SUBST([REPLACE_INET_NTOP],   [0])
+  AC_SUBST([REPLACE_INET_PTON],   [0])
 ])
diff --git a/m4/dirent_h.m4 b/m4/dirent_h.m4
index 8bef6a0ce..93130618f 100644
--- a/m4/dirent_h.m4
+++ b/m4/dirent_h.m4
@@ -1,4 +1,4 @@
-# dirent_h.m4 serial 16
+# dirent_h.m4 serial 17
 dnl Copyright (C) 2008-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -39,26 +39,26 @@ AC_DEFUN([gl_DIRENT_MODULE_INDICATOR],
 AC_DEFUN([gl_DIRENT_H_DEFAULTS],
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR
-  GNULIB_OPENDIR=0;     AC_SUBST([GNULIB_OPENDIR])
-  GNULIB_READDIR=0;     AC_SUBST([GNULIB_READDIR])
-  GNULIB_REWINDDIR=0;   AC_SUBST([GNULIB_REWINDDIR])
-  GNULIB_CLOSEDIR=0;    AC_SUBST([GNULIB_CLOSEDIR])
-  GNULIB_DIRFD=0;       AC_SUBST([GNULIB_DIRFD])
-  GNULIB_FDOPENDIR=0;   AC_SUBST([GNULIB_FDOPENDIR])
-  GNULIB_SCANDIR=0;     AC_SUBST([GNULIB_SCANDIR])
-  GNULIB_ALPHASORT=0;   AC_SUBST([GNULIB_ALPHASORT])
+  AC_SUBST([GNULIB_OPENDIR],   [0])
+  AC_SUBST([GNULIB_READDIR],   [0])
+  AC_SUBST([GNULIB_REWINDDIR], [0])
+  AC_SUBST([GNULIB_CLOSEDIR],  [0])
+  AC_SUBST([GNULIB_DIRFD],     [0])
+  AC_SUBST([GNULIB_FDOPENDIR], [0])
+  AC_SUBST([GNULIB_SCANDIR],   [0])
+  AC_SUBST([GNULIB_ALPHASORT], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_OPENDIR=1;       AC_SUBST([HAVE_OPENDIR])
-  HAVE_READDIR=1;       AC_SUBST([HAVE_READDIR])
-  HAVE_REWINDDIR=1;     AC_SUBST([HAVE_REWINDDIR])
-  HAVE_CLOSEDIR=1;      AC_SUBST([HAVE_CLOSEDIR])
-  HAVE_DECL_DIRFD=1;    AC_SUBST([HAVE_DECL_DIRFD])
-  HAVE_DECL_FDOPENDIR=1;AC_SUBST([HAVE_DECL_FDOPENDIR])
-  HAVE_FDOPENDIR=1;     AC_SUBST([HAVE_FDOPENDIR])
-  HAVE_SCANDIR=1;       AC_SUBST([HAVE_SCANDIR])
-  HAVE_ALPHASORT=1;     AC_SUBST([HAVE_ALPHASORT])
-  REPLACE_OPENDIR=0;    AC_SUBST([REPLACE_OPENDIR])
-  REPLACE_CLOSEDIR=0;   AC_SUBST([REPLACE_CLOSEDIR])
-  REPLACE_DIRFD=0;      AC_SUBST([REPLACE_DIRFD])
-  REPLACE_FDOPENDIR=0;  AC_SUBST([REPLACE_FDOPENDIR])
+  AC_SUBST([HAVE_OPENDIR],        [1])
+  AC_SUBST([HAVE_READDIR],        [1])
+  AC_SUBST([HAVE_REWINDDIR],      [1])
+  AC_SUBST([HAVE_CLOSEDIR],       [1])
+  AC_SUBST([HAVE_DECL_DIRFD],     [1])
+  AC_SUBST([HAVE_DECL_FDOPENDIR], [1])
+  AC_SUBST([HAVE_FDOPENDIR],      [1])
+  AC_SUBST([HAVE_SCANDIR],        [1])
+  AC_SUBST([HAVE_ALPHASORT],      [1])
+  AC_SUBST([REPLACE_OPENDIR],     [0])
+  AC_SUBST([REPLACE_CLOSEDIR],    [0])
+  AC_SUBST([REPLACE_DIRFD],       [0])
+  AC_SUBST([REPLACE_FDOPENDIR],   [0])
 ])
diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4
index 6b253937f..f59d4e049 100644
--- a/m4/fcntl_h.m4
+++ b/m4/fcntl_h.m4
@@ -1,4 +1,4 @@
-# serial 16
+# serial 17
 # Configure fcntl.h.
 dnl Copyright (C) 2006-2007, 2009-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -37,16 +37,16 @@ AC_DEFUN([gl_FCNTL_MODULE_INDICATOR],
 
 AC_DEFUN([gl_FCNTL_H_DEFAULTS],
 [
-  GNULIB_CREAT=0;        AC_SUBST([GNULIB_CREAT])
-  GNULIB_FCNTL=0;        AC_SUBST([GNULIB_FCNTL])
-  GNULIB_NONBLOCKING=0;  AC_SUBST([GNULIB_NONBLOCKING])
-  GNULIB_OPEN=0;         AC_SUBST([GNULIB_OPEN])
-  GNULIB_OPENAT=0;       AC_SUBST([GNULIB_OPENAT])
+  AC_SUBST([GNULIB_CREAT],       [0])
+  AC_SUBST([GNULIB_FCNTL],       [0])
+  AC_SUBST([GNULIB_NONBLOCKING], [0])
+  AC_SUBST([GNULIB_OPEN],        [0])
+  AC_SUBST([GNULIB_OPENAT],      [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_FCNTL=1;          AC_SUBST([HAVE_FCNTL])
-  HAVE_OPENAT=1;         AC_SUBST([HAVE_OPENAT])
-  REPLACE_CREAT=0;       AC_SUBST([REPLACE_CREAT])
-  REPLACE_FCNTL=0;       AC_SUBST([REPLACE_FCNTL])
-  REPLACE_OPEN=0;        AC_SUBST([REPLACE_OPEN])
-  REPLACE_OPENAT=0;      AC_SUBST([REPLACE_OPENAT])
+  AC_SUBST([HAVE_FCNTL],     [1])
+  AC_SUBST([HAVE_OPENAT],    [1])
+  AC_SUBST([REPLACE_CREAT],  [0])
+  AC_SUBST([REPLACE_FCNTL],  [0])
+  AC_SUBST([REPLACE_OPEN],   [0])
+  AC_SUBST([REPLACE_OPENAT], [0])
 ])
diff --git a/m4/fnmatch_h.m4 b/m4/fnmatch_h.m4
index a21ec2c5e..70ca0a0bb 100644
--- a/m4/fnmatch_h.m4
+++ b/m4/fnmatch_h.m4
@@ -1,4 +1,4 @@
-# fnmatch_h.m4 serial 4
+# fnmatch_h.m4 serial 5
 dnl Copyright (C) 2009-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -68,8 +68,8 @@ AC_DEFUN([gl_FNMATCH_MODULE_INDICATOR],
 
 AC_DEFUN([gl_FNMATCH_H_DEFAULTS],
 [
-  GNULIB_FNMATCH=0;          AC_SUBST([GNULIB_FNMATCH])
+  AC_SUBST([GNULIB_FNMATCH],  [0])
   dnl Assume POSIX behavior unless another module says otherwise.
-  HAVE_FNMATCH=1;            AC_SUBST([HAVE_FNMATCH])
-  REPLACE_FNMATCH=0;         AC_SUBST([REPLACE_FNMATCH])
+  AC_SUBST([HAVE_FNMATCH],    [1])
+  AC_SUBST([REPLACE_FNMATCH], [0])
 ])
diff --git a/m4/iconv_h.m4 b/m4/iconv_h.m4
index 23d41c91b..874105c9e 100644
--- a/m4/iconv_h.m4
+++ b/m4/iconv_h.m4
@@ -1,4 +1,4 @@
-# iconv_h.m4 serial 12
+# iconv_h.m4 serial 13
 dnl Copyright (C) 2007-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -39,13 +39,13 @@ AC_DEFUN([gl_ICONV_MODULE_INDICATOR],
 AC_DEFUN([gl_ICONV_H_DEFAULTS],
 [
   m4_ifdef([gl_ANSI_CXX], [AC_REQUIRE([gl_ANSI_CXX])])
-  GNULIB_ICONV=0;       AC_SUBST([GNULIB_ICONV])
+  AC_SUBST([GNULIB_ICONV], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  ICONV_CONST=;         AC_SUBST([ICONV_CONST])
-  REPLACE_ICONV=0;      AC_SUBST([REPLACE_ICONV])
-  REPLACE_ICONV_OPEN=0; AC_SUBST([REPLACE_ICONV_OPEN])
-  REPLACE_ICONV_UTF=0;  AC_SUBST([REPLACE_ICONV_UTF])
-  ICONV_H='';           AC_SUBST([ICONV_H])
+  AC_SUBST([ICONV_CONST],        [''])
+  AC_SUBST([REPLACE_ICONV],      [0])
+  AC_SUBST([REPLACE_ICONV_OPEN], [0])
+  AC_SUBST([REPLACE_ICONV_UTF],  [0])
+  AC_SUBST([ICONV_H],            [''])
   m4_ifdef([gl_POSIXCHECK],
     [ICONV_H='iconv.h'],
     [if m4_ifdef([gl_ANSI_CXX], [test "$CXX" != no], [false]); then
diff --git a/m4/inttypes.m4 b/m4/inttypes.m4
index 224d0cdd8..f005ed1ab 100644
--- a/m4/inttypes.m4
+++ b/m4/inttypes.m4
@@ -1,4 +1,4 @@
-# inttypes.m4 serial 29
+# inttypes.m4 serial 30
 dnl Copyright (C) 2006-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -138,22 +138,22 @@ AC_DEFUN([gl_INTTYPES_MODULE_INDICATOR],
 
 AC_DEFUN([gl_INTTYPES_H_DEFAULTS],
 [
-  GNULIB_IMAXABS=0;      AC_SUBST([GNULIB_IMAXABS])
-  GNULIB_IMAXDIV=0;      AC_SUBST([GNULIB_IMAXDIV])
-  GNULIB_STRTOIMAX=0;    AC_SUBST([GNULIB_STRTOIMAX])
-  GNULIB_STRTOUMAX=0;    AC_SUBST([GNULIB_STRTOUMAX])
+  AC_SUBST([GNULIB_IMAXABS], [0])
+  AC_SUBST([GNULIB_IMAXDIV], [0])
+  AC_SUBST([GNULIB_STRTOIMAX], [0])
+  AC_SUBST([GNULIB_STRTOUMAX], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_DECL_IMAXABS=1;   AC_SUBST([HAVE_DECL_IMAXABS])
-  HAVE_DECL_IMAXDIV=1;   AC_SUBST([HAVE_DECL_IMAXDIV])
-  HAVE_DECL_STRTOIMAX=1; AC_SUBST([HAVE_DECL_STRTOIMAX])
-  HAVE_DECL_STRTOUMAX=1; AC_SUBST([HAVE_DECL_STRTOUMAX])
-  HAVE_IMAXDIV_T=1;      AC_SUBST([HAVE_IMAXDIV_T])
-  REPLACE_STRTOIMAX=0;   AC_SUBST([REPLACE_STRTOIMAX])
-  REPLACE_STRTOUMAX=0;   AC_SUBST([REPLACE_STRTOUMAX])
-  INT32_MAX_LT_INTMAX_MAX=1;  AC_SUBST([INT32_MAX_LT_INTMAX_MAX])
-  INT64_MAX_EQ_LONG_MAX='defined _LP64';  AC_SUBST([INT64_MAX_EQ_LONG_MAX])
-  PRI_MACROS_BROKEN=0;   AC_SUBST([PRI_MACROS_BROKEN])
-  PRIPTR_PREFIX=__PRIPTR_PREFIX;  AC_SUBST([PRIPTR_PREFIX])
-  UINT32_MAX_LT_UINTMAX_MAX=1;  AC_SUBST([UINT32_MAX_LT_UINTMAX_MAX])
-  UINT64_MAX_EQ_ULONG_MAX='defined _LP64';  AC_SUBST([UINT64_MAX_EQ_ULONG_MAX])
+  AC_SUBST([HAVE_DECL_IMAXABS], [1])
+  AC_SUBST([HAVE_DECL_IMAXDIV], [1])
+  AC_SUBST([HAVE_DECL_STRTOIMAX], [1])
+  AC_SUBST([HAVE_DECL_STRTOUMAX], [1])
+  AC_SUBST([HAVE_IMAXDIV_T], [1])
+  AC_SUBST([REPLACE_STRTOIMAX], [0])
+  AC_SUBST([REPLACE_STRTOUMAX], [0])
+  AC_SUBST([INT32_MAX_LT_INTMAX_MAX], [1])
+  AC_SUBST([INT64_MAX_EQ_LONG_MAX], ['defined _LP64'])
+  AC_SUBST([PRI_MACROS_BROKEN], [0])
+  AC_SUBST([PRIPTR_PREFIX], [__PRIPTR_PREFIX])
+  AC_SUBST([UINT32_MAX_LT_UINTMAX_MAX], [1])
+  AC_SUBST([UINT64_MAX_EQ_ULONG_MAX], ['defined _LP64'])
 ])
diff --git a/m4/langinfo_h.m4 b/m4/langinfo_h.m4
index ef92f84ac..b11ae544e 100644
--- a/m4/langinfo_h.m4
+++ b/m4/langinfo_h.m4
@@ -1,4 +1,4 @@
-# langinfo_h.m4 serial 8
+# langinfo_h.m4 serial 9
 dnl Copyright (C) 2009-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -113,8 +113,8 @@ AC_DEFUN([gl_LANGINFO_MODULE_INDICATOR],
 
 AC_DEFUN([gl_LANGINFO_H_DEFAULTS],
 [
-  GNULIB_NL_LANGINFO=0;  AC_SUBST([GNULIB_NL_LANGINFO])
+  AC_SUBST([GNULIB_NL_LANGINFO], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_NL_LANGINFO=1;    AC_SUBST([HAVE_NL_LANGINFO])
-  REPLACE_NL_LANGINFO=0; AC_SUBST([REPLACE_NL_LANGINFO])
+  AC_SUBST([HAVE_NL_LANGINFO], [1])
+  AC_SUBST([REPLACE_NL_LANGINFO], [0])
 ])
diff --git a/m4/locale_h.m4 b/m4/locale_h.m4
index 32494cf22..516719942 100644
--- a/m4/locale_h.m4
+++ b/m4/locale_h.m4
@@ -1,4 +1,4 @@
-# locale_h.m4 serial 24
+# locale_h.m4 serial 25
 dnl Copyright (C) 2007, 2009-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -140,19 +140,19 @@ AC_DEFUN([gl_LOCALE_MODULE_INDICATOR],
 
 AC_DEFUN([gl_LOCALE_H_DEFAULTS],
 [
-  GNULIB_LOCALECONV=0;     AC_SUBST([GNULIB_LOCALECONV])
-  GNULIB_SETLOCALE=0;      AC_SUBST([GNULIB_SETLOCALE])
-  GNULIB_SETLOCALE_NULL=0; AC_SUBST([GNULIB_SETLOCALE_NULL])
-  GNULIB_DUPLOCALE=0;      AC_SUBST([GNULIB_DUPLOCALE])
-  GNULIB_LOCALENAME=0;     AC_SUBST([GNULIB_LOCALENAME])
+  AC_SUBST([GNULIB_LOCALECONV], [0])
+  AC_SUBST([GNULIB_SETLOCALE], [0])
+  AC_SUBST([GNULIB_SETLOCALE_NULL], [0])
+  AC_SUBST([GNULIB_DUPLOCALE], [0])
+  AC_SUBST([GNULIB_LOCALENAME], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_NEWLOCALE=1;       AC_SUBST([HAVE_NEWLOCALE])
-  HAVE_DUPLOCALE=1;       AC_SUBST([HAVE_DUPLOCALE])
-  HAVE_FREELOCALE=1;      AC_SUBST([HAVE_FREELOCALE])
-  REPLACE_LOCALECONV=0;   AC_SUBST([REPLACE_LOCALECONV])
-  REPLACE_SETLOCALE=0;    AC_SUBST([REPLACE_SETLOCALE])
-  REPLACE_NEWLOCALE=0;    AC_SUBST([REPLACE_NEWLOCALE])
-  REPLACE_DUPLOCALE=0;    AC_SUBST([REPLACE_DUPLOCALE])
-  REPLACE_FREELOCALE=0;   AC_SUBST([REPLACE_FREELOCALE])
-  REPLACE_STRUCT_LCONV=0; AC_SUBST([REPLACE_STRUCT_LCONV])
+  AC_SUBST([HAVE_NEWLOCALE], [1])
+  AC_SUBST([HAVE_DUPLOCALE], [1])
+  AC_SUBST([HAVE_FREELOCALE], [1])
+  AC_SUBST([REPLACE_LOCALECONV], [0])
+  AC_SUBST([REPLACE_SETLOCALE], [0])
+  AC_SUBST([REPLACE_NEWLOCALE], [0])
+  AC_SUBST([REPLACE_DUPLOCALE], [0])
+  AC_SUBST([REPLACE_FREELOCALE], [0])
+  AC_SUBST([REPLACE_STRUCT_LCONV], [0])
 ])
diff --git a/m4/math_h.m4 b/m4/math_h.m4
index 1d0169f7c..ac4fe3c10 100644
--- a/m4/math_h.m4
+++ b/m4/math_h.m4
@@ -1,4 +1,4 @@
-# math_h.m4 serial 119
+# math_h.m4 serial 120
 dnl Copyright (C) 2007-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -64,277 +64,277 @@ AC_DEFUN([gl_MATH_MODULE_INDICATOR],
 
 AC_DEFUN([gl_MATH_H_DEFAULTS],
 [
-  GNULIB_ACOSF=0;      AC_SUBST([GNULIB_ACOSF])
-  GNULIB_ACOSL=0;      AC_SUBST([GNULIB_ACOSL])
-  GNULIB_ASINF=0;      AC_SUBST([GNULIB_ASINF])
-  GNULIB_ASINL=0;      AC_SUBST([GNULIB_ASINL])
-  GNULIB_ATANF=0;      AC_SUBST([GNULIB_ATANF])
-  GNULIB_ATANL=0;      AC_SUBST([GNULIB_ATANL])
-  GNULIB_ATAN2F=0;     AC_SUBST([GNULIB_ATAN2F])
-  GNULIB_CBRT=0;       AC_SUBST([GNULIB_CBRT])
-  GNULIB_CBRTF=0;      AC_SUBST([GNULIB_CBRTF])
-  GNULIB_CBRTL=0;      AC_SUBST([GNULIB_CBRTL])
-  GNULIB_CEIL=0;       AC_SUBST([GNULIB_CEIL])
-  GNULIB_CEILF=0;      AC_SUBST([GNULIB_CEILF])
-  GNULIB_CEILL=0;      AC_SUBST([GNULIB_CEILL])
-  GNULIB_COPYSIGN=0;   AC_SUBST([GNULIB_COPYSIGN])
-  GNULIB_COPYSIGNF=0;  AC_SUBST([GNULIB_COPYSIGNF])
-  GNULIB_COPYSIGNL=0;  AC_SUBST([GNULIB_COPYSIGNL])
-  GNULIB_COSF=0;       AC_SUBST([GNULIB_COSF])
-  GNULIB_COSL=0;       AC_SUBST([GNULIB_COSL])
-  GNULIB_COSHF=0;      AC_SUBST([GNULIB_COSHF])
-  GNULIB_EXPF=0;       AC_SUBST([GNULIB_EXPF])
-  GNULIB_EXPL=0;       AC_SUBST([GNULIB_EXPL])
-  GNULIB_EXP2=0;       AC_SUBST([GNULIB_EXP2])
-  GNULIB_EXP2F=0;      AC_SUBST([GNULIB_EXP2F])
-  GNULIB_EXP2L=0;      AC_SUBST([GNULIB_EXP2L])
-  GNULIB_EXPM1=0;      AC_SUBST([GNULIB_EXPM1])
-  GNULIB_EXPM1F=0;     AC_SUBST([GNULIB_EXPM1F])
-  GNULIB_EXPM1L=0;     AC_SUBST([GNULIB_EXPM1L])
-  GNULIB_FABSF=0;      AC_SUBST([GNULIB_FABSF])
-  GNULIB_FABSL=0;      AC_SUBST([GNULIB_FABSL])
-  GNULIB_FLOOR=0;      AC_SUBST([GNULIB_FLOOR])
-  GNULIB_FLOORF=0;     AC_SUBST([GNULIB_FLOORF])
-  GNULIB_FLOORL=0;     AC_SUBST([GNULIB_FLOORL])
-  GNULIB_FMA=0;        AC_SUBST([GNULIB_FMA])
-  GNULIB_FMAF=0;       AC_SUBST([GNULIB_FMAF])
-  GNULIB_FMAL=0;       AC_SUBST([GNULIB_FMAL])
-  GNULIB_FMOD=0;       AC_SUBST([GNULIB_FMOD])
-  GNULIB_FMODF=0;      AC_SUBST([GNULIB_FMODF])
-  GNULIB_FMODL=0;      AC_SUBST([GNULIB_FMODL])
-  GNULIB_FREXPF=0;     AC_SUBST([GNULIB_FREXPF])
-  GNULIB_FREXP=0;      AC_SUBST([GNULIB_FREXP])
-  GNULIB_FREXPL=0;     AC_SUBST([GNULIB_FREXPL])
-  GNULIB_HYPOT=0;      AC_SUBST([GNULIB_HYPOT])
-  GNULIB_HYPOTF=0;     AC_SUBST([GNULIB_HYPOTF])
-  GNULIB_HYPOTL=0;     AC_SUBST([GNULIB_HYPOTL])
-  GNULIB_ILOGB=0;      AC_SUBST([GNULIB_ILOGB])
-  GNULIB_ILOGBF=0;     AC_SUBST([GNULIB_ILOGBF])
-  GNULIB_ILOGBL=0;     AC_SUBST([GNULIB_ILOGBL])
-  GNULIB_ISFINITE=0;   AC_SUBST([GNULIB_ISFINITE])
-  GNULIB_ISINF=0;      AC_SUBST([GNULIB_ISINF])
-  GNULIB_ISNAN=0;      AC_SUBST([GNULIB_ISNAN])
-  GNULIB_ISNANF=0;     AC_SUBST([GNULIB_ISNANF])
-  GNULIB_ISNAND=0;     AC_SUBST([GNULIB_ISNAND])
-  GNULIB_ISNANL=0;     AC_SUBST([GNULIB_ISNANL])
-  GNULIB_LDEXPF=0;     AC_SUBST([GNULIB_LDEXPF])
-  GNULIB_LDEXPL=0;     AC_SUBST([GNULIB_LDEXPL])
-  GNULIB_LOG=0;        AC_SUBST([GNULIB_LOG])
-  GNULIB_LOGF=0;       AC_SUBST([GNULIB_LOGF])
-  GNULIB_LOGL=0;       AC_SUBST([GNULIB_LOGL])
-  GNULIB_LOG10=0;      AC_SUBST([GNULIB_LOG10])
-  GNULIB_LOG10F=0;     AC_SUBST([GNULIB_LOG10F])
-  GNULIB_LOG10L=0;     AC_SUBST([GNULIB_LOG10L])
-  GNULIB_LOG1P=0;      AC_SUBST([GNULIB_LOG1P])
-  GNULIB_LOG1PF=0;     AC_SUBST([GNULIB_LOG1PF])
-  GNULIB_LOG1PL=0;     AC_SUBST([GNULIB_LOG1PL])
-  GNULIB_LOG2=0;       AC_SUBST([GNULIB_LOG2])
-  GNULIB_LOG2F=0;      AC_SUBST([GNULIB_LOG2F])
-  GNULIB_LOG2L=0;      AC_SUBST([GNULIB_LOG2L])
-  GNULIB_LOGB=0;       AC_SUBST([GNULIB_LOGB])
-  GNULIB_LOGBF=0;      AC_SUBST([GNULIB_LOGBF])
-  GNULIB_LOGBL=0;      AC_SUBST([GNULIB_LOGBL])
-  GNULIB_MODF=0;       AC_SUBST([GNULIB_MODF])
-  GNULIB_MODFF=0;      AC_SUBST([GNULIB_MODFF])
-  GNULIB_MODFL=0;      AC_SUBST([GNULIB_MODFL])
-  GNULIB_POWF=0;       AC_SUBST([GNULIB_POWF])
-  GNULIB_REMAINDER=0;  AC_SUBST([GNULIB_REMAINDER])
-  GNULIB_REMAINDERF=0; AC_SUBST([GNULIB_REMAINDERF])
-  GNULIB_REMAINDERL=0; AC_SUBST([GNULIB_REMAINDERL])
-  GNULIB_RINT=0;       AC_SUBST([GNULIB_RINT])
-  GNULIB_RINTF=0;      AC_SUBST([GNULIB_RINTF])
-  GNULIB_RINTL=0;      AC_SUBST([GNULIB_RINTL])
-  GNULIB_ROUND=0;      AC_SUBST([GNULIB_ROUND])
-  GNULIB_ROUNDF=0;     AC_SUBST([GNULIB_ROUNDF])
-  GNULIB_ROUNDL=0;     AC_SUBST([GNULIB_ROUNDL])
-  GNULIB_SIGNBIT=0;    AC_SUBST([GNULIB_SIGNBIT])
-  GNULIB_SINF=0;       AC_SUBST([GNULIB_SINF])
-  GNULIB_SINL=0;       AC_SUBST([GNULIB_SINL])
-  GNULIB_SINHF=0;      AC_SUBST([GNULIB_SINHF])
-  GNULIB_SQRTF=0;      AC_SUBST([GNULIB_SQRTF])
-  GNULIB_SQRTL=0;      AC_SUBST([GNULIB_SQRTL])
-  GNULIB_TANF=0;       AC_SUBST([GNULIB_TANF])
-  GNULIB_TANL=0;       AC_SUBST([GNULIB_TANL])
-  GNULIB_TANHF=0;      AC_SUBST([GNULIB_TANHF])
-  GNULIB_TRUNC=0;      AC_SUBST([GNULIB_TRUNC])
-  GNULIB_TRUNCF=0;     AC_SUBST([GNULIB_TRUNCF])
-  GNULIB_TRUNCL=0;     AC_SUBST([GNULIB_TRUNCL])
+  AC_SUBST([GNULIB_ACOSF], [0])
+  AC_SUBST([GNULIB_ACOSL], [0])
+  AC_SUBST([GNULIB_ASINF], [0])
+  AC_SUBST([GNULIB_ASINL], [0])
+  AC_SUBST([GNULIB_ATANF], [0])
+  AC_SUBST([GNULIB_ATANL], [0])
+  AC_SUBST([GNULIB_ATAN2F], [0])
+  AC_SUBST([GNULIB_CBRT], [0])
+  AC_SUBST([GNULIB_CBRTF], [0])
+  AC_SUBST([GNULIB_CBRTL], [0])
+  AC_SUBST([GNULIB_CEIL], [0])
+  AC_SUBST([GNULIB_CEILF], [0])
+  AC_SUBST([GNULIB_CEILL], [0])
+  AC_SUBST([GNULIB_COPYSIGN], [0])
+  AC_SUBST([GNULIB_COPYSIGNF], [0])
+  AC_SUBST([GNULIB_COPYSIGNL], [0])
+  AC_SUBST([GNULIB_COSF], [0])
+  AC_SUBST([GNULIB_COSL], [0])
+  AC_SUBST([GNULIB_COSHF], [0])
+  AC_SUBST([GNULIB_EXPF], [0])
+  AC_SUBST([GNULIB_EXPL], [0])
+  AC_SUBST([GNULIB_EXP2], [0])
+  AC_SUBST([GNULIB_EXP2F], [0])
+  AC_SUBST([GNULIB_EXP2L], [0])
+  AC_SUBST([GNULIB_EXPM1], [0])
+  AC_SUBST([GNULIB_EXPM1F], [0])
+  AC_SUBST([GNULIB_EXPM1L], [0])
+  AC_SUBST([GNULIB_FABSF], [0])
+  AC_SUBST([GNULIB_FABSL], [0])
+  AC_SUBST([GNULIB_FLOOR], [0])
+  AC_SUBST([GNULIB_FLOORF], [0])
+  AC_SUBST([GNULIB_FLOORL], [0])
+  AC_SUBST([GNULIB_FMA], [0])
+  AC_SUBST([GNULIB_FMAF], [0])
+  AC_SUBST([GNULIB_FMAL], [0])
+  AC_SUBST([GNULIB_FMOD], [0])
+  AC_SUBST([GNULIB_FMODF], [0])
+  AC_SUBST([GNULIB_FMODL], [0])
+  AC_SUBST([GNULIB_FREXPF], [0])
+  AC_SUBST([GNULIB_FREXP], [0])
+  AC_SUBST([GNULIB_FREXPL], [0])
+  AC_SUBST([GNULIB_HYPOT], [0])
+  AC_SUBST([GNULIB_HYPOTF], [0])
+  AC_SUBST([GNULIB_HYPOTL], [0])
+  AC_SUBST([GNULIB_ILOGB], [0])
+  AC_SUBST([GNULIB_ILOGBF], [0])
+  AC_SUBST([GNULIB_ILOGBL], [0])
+  AC_SUBST([GNULIB_ISFINITE], [0])
+  AC_SUBST([GNULIB_ISINF], [0])
+  AC_SUBST([GNULIB_ISNAN], [0])
+  AC_SUBST([GNULIB_ISNANF], [0])
+  AC_SUBST([GNULIB_ISNAND], [0])
+  AC_SUBST([GNULIB_ISNANL], [0])
+  AC_SUBST([GNULIB_LDEXPF], [0])
+  AC_SUBST([GNULIB_LDEXPL], [0])
+  AC_SUBST([GNULIB_LOG], [0])
+  AC_SUBST([GNULIB_LOGF], [0])
+  AC_SUBST([GNULIB_LOGL], [0])
+  AC_SUBST([GNULIB_LOG10], [0])
+  AC_SUBST([GNULIB_LOG10F], [0])
+  AC_SUBST([GNULIB_LOG10L], [0])
+  AC_SUBST([GNULIB_LOG1P], [0])
+  AC_SUBST([GNULIB_LOG1PF], [0])
+  AC_SUBST([GNULIB_LOG1PL], [0])
+  AC_SUBST([GNULIB_LOG2], [0])
+  AC_SUBST([GNULIB_LOG2F], [0])
+  AC_SUBST([GNULIB_LOG2L], [0])
+  AC_SUBST([GNULIB_LOGB], [0])
+  AC_SUBST([GNULIB_LOGBF], [0])
+  AC_SUBST([GNULIB_LOGBL], [0])
+  AC_SUBST([GNULIB_MODF], [0])
+  AC_SUBST([GNULIB_MODFF], [0])
+  AC_SUBST([GNULIB_MODFL], [0])
+  AC_SUBST([GNULIB_POWF], [0])
+  AC_SUBST([GNULIB_REMAINDER], [0])
+  AC_SUBST([GNULIB_REMAINDERF], [0])
+  AC_SUBST([GNULIB_REMAINDERL], [0])
+  AC_SUBST([GNULIB_RINT], [0])
+  AC_SUBST([GNULIB_RINTF], [0])
+  AC_SUBST([GNULIB_RINTL], [0])
+  AC_SUBST([GNULIB_ROUND], [0])
+  AC_SUBST([GNULIB_ROUNDF], [0])
+  AC_SUBST([GNULIB_ROUNDL], [0])
+  AC_SUBST([GNULIB_SIGNBIT], [0])
+  AC_SUBST([GNULIB_SINF], [0])
+  AC_SUBST([GNULIB_SINL], [0])
+  AC_SUBST([GNULIB_SINHF], [0])
+  AC_SUBST([GNULIB_SQRTF], [0])
+  AC_SUBST([GNULIB_SQRTL], [0])
+  AC_SUBST([GNULIB_TANF], [0])
+  AC_SUBST([GNULIB_TANL], [0])
+  AC_SUBST([GNULIB_TANHF], [0])
+  AC_SUBST([GNULIB_TRUNC], [0])
+  AC_SUBST([GNULIB_TRUNCF], [0])
+  AC_SUBST([GNULIB_TRUNCL], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_ACOSF=1;                AC_SUBST([HAVE_ACOSF])
-  HAVE_ACOSL=1;                AC_SUBST([HAVE_ACOSL])
-  HAVE_ASINF=1;                AC_SUBST([HAVE_ASINF])
-  HAVE_ASINL=1;                AC_SUBST([HAVE_ASINL])
-  HAVE_ATANF=1;                AC_SUBST([HAVE_ATANF])
-  HAVE_ATANL=1;                AC_SUBST([HAVE_ATANL])
-  HAVE_ATAN2F=1;               AC_SUBST([HAVE_ATAN2F])
-  HAVE_CBRT=1;                 AC_SUBST([HAVE_CBRT])
-  HAVE_CBRTF=1;                AC_SUBST([HAVE_CBRTF])
-  HAVE_CBRTL=1;                AC_SUBST([HAVE_CBRTL])
-  HAVE_COPYSIGN=1;             AC_SUBST([HAVE_COPYSIGN])
-  HAVE_COPYSIGNL=1;            AC_SUBST([HAVE_COPYSIGNL])
-  HAVE_COSF=1;                 AC_SUBST([HAVE_COSF])
-  HAVE_COSL=1;                 AC_SUBST([HAVE_COSL])
-  HAVE_COSHF=1;                AC_SUBST([HAVE_COSHF])
-  HAVE_EXPF=1;                 AC_SUBST([HAVE_EXPF])
-  HAVE_EXPL=1;                 AC_SUBST([HAVE_EXPL])
-  HAVE_EXPM1=1;                AC_SUBST([HAVE_EXPM1])
-  HAVE_EXPM1F=1;               AC_SUBST([HAVE_EXPM1F])
-  HAVE_FABSF=1;                AC_SUBST([HAVE_FABSF])
-  HAVE_FABSL=1;                AC_SUBST([HAVE_FABSL])
-  HAVE_FMA=1;                  AC_SUBST([HAVE_FMA])
-  HAVE_FMAF=1;                 AC_SUBST([HAVE_FMAF])
-  HAVE_FMAL=1;                 AC_SUBST([HAVE_FMAL])
-  HAVE_FMODF=1;                AC_SUBST([HAVE_FMODF])
-  HAVE_FMODL=1;                AC_SUBST([HAVE_FMODL])
-  HAVE_FREXPF=1;               AC_SUBST([HAVE_FREXPF])
-  HAVE_HYPOTF=1;               AC_SUBST([HAVE_HYPOTF])
-  HAVE_HYPOTL=1;               AC_SUBST([HAVE_HYPOTL])
-  HAVE_ILOGB=1;                AC_SUBST([HAVE_ILOGB])
-  HAVE_ILOGBF=1;               AC_SUBST([HAVE_ILOGBF])
-  HAVE_ILOGBL=1;               AC_SUBST([HAVE_ILOGBL])
-  HAVE_ISNANF=1;               AC_SUBST([HAVE_ISNANF])
-  HAVE_ISNAND=1;               AC_SUBST([HAVE_ISNAND])
-  HAVE_ISNANL=1;               AC_SUBST([HAVE_ISNANL])
-  HAVE_LDEXPF=1;               AC_SUBST([HAVE_LDEXPF])
-  HAVE_LOGF=1;                 AC_SUBST([HAVE_LOGF])
-  HAVE_LOGL=1;                 AC_SUBST([HAVE_LOGL])
-  HAVE_LOG10F=1;               AC_SUBST([HAVE_LOG10F])
-  HAVE_LOG10L=1;               AC_SUBST([HAVE_LOG10L])
-  HAVE_LOG1P=1;                AC_SUBST([HAVE_LOG1P])
-  HAVE_LOG1PF=1;               AC_SUBST([HAVE_LOG1PF])
-  HAVE_LOG1PL=1;               AC_SUBST([HAVE_LOG1PL])
-  HAVE_LOGBF=1;                AC_SUBST([HAVE_LOGBF])
-  HAVE_LOGBL=1;                AC_SUBST([HAVE_LOGBL])
-  HAVE_MODFF=1;                AC_SUBST([HAVE_MODFF])
-  HAVE_MODFL=1;                AC_SUBST([HAVE_MODFL])
-  HAVE_POWF=1;                 AC_SUBST([HAVE_POWF])
-  HAVE_REMAINDER=1;            AC_SUBST([HAVE_REMAINDER])
-  HAVE_REMAINDERF=1;           AC_SUBST([HAVE_REMAINDERF])
-  HAVE_RINT=1;                 AC_SUBST([HAVE_RINT])
-  HAVE_RINTL=1;                AC_SUBST([HAVE_RINTL])
-  HAVE_SINF=1;                 AC_SUBST([HAVE_SINF])
-  HAVE_SINL=1;                 AC_SUBST([HAVE_SINL])
-  HAVE_SINHF=1;                AC_SUBST([HAVE_SINHF])
-  HAVE_SQRTF=1;                AC_SUBST([HAVE_SQRTF])
-  HAVE_SQRTL=1;                AC_SUBST([HAVE_SQRTL])
-  HAVE_TANF=1;                 AC_SUBST([HAVE_TANF])
-  HAVE_TANL=1;                 AC_SUBST([HAVE_TANL])
-  HAVE_TANHF=1;                AC_SUBST([HAVE_TANHF])
-  HAVE_DECL_ACOSL=1;           AC_SUBST([HAVE_DECL_ACOSL])
-  HAVE_DECL_ASINL=1;           AC_SUBST([HAVE_DECL_ASINL])
-  HAVE_DECL_ATANL=1;           AC_SUBST([HAVE_DECL_ATANL])
-  HAVE_DECL_CBRTF=1;           AC_SUBST([HAVE_DECL_CBRTF])
-  HAVE_DECL_CBRTL=1;           AC_SUBST([HAVE_DECL_CBRTL])
-  HAVE_DECL_CEILF=1;           AC_SUBST([HAVE_DECL_CEILF])
-  HAVE_DECL_CEILL=1;           AC_SUBST([HAVE_DECL_CEILL])
-  HAVE_DECL_COPYSIGNF=1;       AC_SUBST([HAVE_DECL_COPYSIGNF])
-  HAVE_DECL_COSL=1;            AC_SUBST([HAVE_DECL_COSL])
-  HAVE_DECL_EXPL=1;            AC_SUBST([HAVE_DECL_EXPL])
-  HAVE_DECL_EXP2=1;            AC_SUBST([HAVE_DECL_EXP2])
-  HAVE_DECL_EXP2F=1;           AC_SUBST([HAVE_DECL_EXP2F])
-  HAVE_DECL_EXP2L=1;           AC_SUBST([HAVE_DECL_EXP2L])
-  HAVE_DECL_EXPM1L=1;          AC_SUBST([HAVE_DECL_EXPM1L])
-  HAVE_DECL_FLOORF=1;          AC_SUBST([HAVE_DECL_FLOORF])
-  HAVE_DECL_FLOORL=1;          AC_SUBST([HAVE_DECL_FLOORL])
-  HAVE_DECL_FREXPL=1;          AC_SUBST([HAVE_DECL_FREXPL])
-  HAVE_DECL_LDEXPL=1;          AC_SUBST([HAVE_DECL_LDEXPL])
-  HAVE_DECL_LOGL=1;            AC_SUBST([HAVE_DECL_LOGL])
-  HAVE_DECL_LOG10L=1;          AC_SUBST([HAVE_DECL_LOG10L])
-  HAVE_DECL_LOG2=1;            AC_SUBST([HAVE_DECL_LOG2])
-  HAVE_DECL_LOG2F=1;           AC_SUBST([HAVE_DECL_LOG2F])
-  HAVE_DECL_LOG2L=1;           AC_SUBST([HAVE_DECL_LOG2L])
-  HAVE_DECL_LOGB=1;            AC_SUBST([HAVE_DECL_LOGB])
-  HAVE_DECL_REMAINDER=1;       AC_SUBST([HAVE_DECL_REMAINDER])
-  HAVE_DECL_REMAINDERL=1;      AC_SUBST([HAVE_DECL_REMAINDERL])
-  HAVE_DECL_RINTF=1;           AC_SUBST([HAVE_DECL_RINTF])
-  HAVE_DECL_ROUND=1;           AC_SUBST([HAVE_DECL_ROUND])
-  HAVE_DECL_ROUNDF=1;          AC_SUBST([HAVE_DECL_ROUNDF])
-  HAVE_DECL_ROUNDL=1;          AC_SUBST([HAVE_DECL_ROUNDL])
-  HAVE_DECL_SINL=1;            AC_SUBST([HAVE_DECL_SINL])
-  HAVE_DECL_SQRTL=1;           AC_SUBST([HAVE_DECL_SQRTL])
-  HAVE_DECL_TANL=1;            AC_SUBST([HAVE_DECL_TANL])
-  HAVE_DECL_TRUNC=1;           AC_SUBST([HAVE_DECL_TRUNC])
-  HAVE_DECL_TRUNCF=1;          AC_SUBST([HAVE_DECL_TRUNCF])
-  HAVE_DECL_TRUNCL=1;          AC_SUBST([HAVE_DECL_TRUNCL])
-  REPLACE_ACOSF=0;             AC_SUBST([REPLACE_ACOSF])
-  REPLACE_ASINF=0;             AC_SUBST([REPLACE_ASINF])
-  REPLACE_ATANF=0;             AC_SUBST([REPLACE_ATANF])
-  REPLACE_ATAN2F=0;            AC_SUBST([REPLACE_ATAN2F])
-  REPLACE_CBRTF=0;             AC_SUBST([REPLACE_CBRTF])
-  REPLACE_CBRTL=0;             AC_SUBST([REPLACE_CBRTL])
-  REPLACE_CEIL=0;              AC_SUBST([REPLACE_CEIL])
-  REPLACE_CEILF=0;             AC_SUBST([REPLACE_CEILF])
-  REPLACE_CEILL=0;             AC_SUBST([REPLACE_CEILL])
-  REPLACE_COSF=0;              AC_SUBST([REPLACE_COSF])
-  REPLACE_COSHF=0;             AC_SUBST([REPLACE_COSHF])
-  REPLACE_EXPF=0;              AC_SUBST([REPLACE_EXPF])
-  REPLACE_EXPL=0;              AC_SUBST([REPLACE_EXPL])
-  REPLACE_EXPM1=0;             AC_SUBST([REPLACE_EXPM1])
-  REPLACE_EXPM1F=0;            AC_SUBST([REPLACE_EXPM1F])
-  REPLACE_EXPM1L=0;            AC_SUBST([REPLACE_EXPM1L])
-  REPLACE_EXP2=0;              AC_SUBST([REPLACE_EXP2])
-  REPLACE_EXP2L=0;             AC_SUBST([REPLACE_EXP2L])
-  REPLACE_FABSL=0;             AC_SUBST([REPLACE_FABSL])
-  REPLACE_FLOOR=0;             AC_SUBST([REPLACE_FLOOR])
-  REPLACE_FLOORF=0;            AC_SUBST([REPLACE_FLOORF])
-  REPLACE_FLOORL=0;            AC_SUBST([REPLACE_FLOORL])
-  REPLACE_FMA=0;               AC_SUBST([REPLACE_FMA])
-  REPLACE_FMAF=0;              AC_SUBST([REPLACE_FMAF])
-  REPLACE_FMAL=0;              AC_SUBST([REPLACE_FMAL])
-  REPLACE_FMOD=0;              AC_SUBST([REPLACE_FMOD])
-  REPLACE_FMODF=0;             AC_SUBST([REPLACE_FMODF])
-  REPLACE_FMODL=0;             AC_SUBST([REPLACE_FMODL])
-  REPLACE_FREXPF=0;            AC_SUBST([REPLACE_FREXPF])
-  REPLACE_FREXP=0;             AC_SUBST([REPLACE_FREXP])
-  REPLACE_FREXPL=0;            AC_SUBST([REPLACE_FREXPL])
-  REPLACE_HUGE_VAL=0;          AC_SUBST([REPLACE_HUGE_VAL])
-  REPLACE_HYPOT=0;             AC_SUBST([REPLACE_HYPOT])
-  REPLACE_HYPOTF=0;            AC_SUBST([REPLACE_HYPOTF])
-  REPLACE_HYPOTL=0;            AC_SUBST([REPLACE_HYPOTL])
-  REPLACE_ILOGB=0;             AC_SUBST([REPLACE_ILOGB])
-  REPLACE_ILOGBF=0;            AC_SUBST([REPLACE_ILOGBF])
-  REPLACE_ILOGBL=0;            AC_SUBST([REPLACE_ILOGBL])
-  REPLACE_ISFINITE=0;          AC_SUBST([REPLACE_ISFINITE])
-  REPLACE_ISINF=0;             AC_SUBST([REPLACE_ISINF])
-  REPLACE_ISNAN=0;             AC_SUBST([REPLACE_ISNAN])
-  REPLACE_LDEXPL=0;            AC_SUBST([REPLACE_LDEXPL])
-  REPLACE_LOG=0;               AC_SUBST([REPLACE_LOG])
-  REPLACE_LOGF=0;              AC_SUBST([REPLACE_LOGF])
-  REPLACE_LOGL=0;              AC_SUBST([REPLACE_LOGL])
-  REPLACE_LOG10=0;             AC_SUBST([REPLACE_LOG10])
-  REPLACE_LOG10F=0;            AC_SUBST([REPLACE_LOG10F])
-  REPLACE_LOG10L=0;            AC_SUBST([REPLACE_LOG10L])
-  REPLACE_LOG1P=0;             AC_SUBST([REPLACE_LOG1P])
-  REPLACE_LOG1PF=0;            AC_SUBST([REPLACE_LOG1PF])
-  REPLACE_LOG1PL=0;            AC_SUBST([REPLACE_LOG1PL])
-  REPLACE_LOG2=0;              AC_SUBST([REPLACE_LOG2])
-  REPLACE_LOG2F=0;             AC_SUBST([REPLACE_LOG2F])
-  REPLACE_LOG2L=0;             AC_SUBST([REPLACE_LOG2L])
-  REPLACE_LOGB=0;              AC_SUBST([REPLACE_LOGB])
-  REPLACE_LOGBF=0;             AC_SUBST([REPLACE_LOGBF])
-  REPLACE_LOGBL=0;             AC_SUBST([REPLACE_LOGBL])
-  REPLACE_MODF=0;              AC_SUBST([REPLACE_MODF])
-  REPLACE_MODFF=0;             AC_SUBST([REPLACE_MODFF])
-  REPLACE_MODFL=0;             AC_SUBST([REPLACE_MODFL])
-  REPLACE_NAN=0;               AC_SUBST([REPLACE_NAN])
-  REPLACE_REMAINDER=0;         AC_SUBST([REPLACE_REMAINDER])
-  REPLACE_REMAINDERF=0;        AC_SUBST([REPLACE_REMAINDERF])
-  REPLACE_REMAINDERL=0;        AC_SUBST([REPLACE_REMAINDERL])
-  REPLACE_RINTL=0;             AC_SUBST([REPLACE_RINTL])
-  REPLACE_ROUND=0;             AC_SUBST([REPLACE_ROUND])
-  REPLACE_ROUNDF=0;            AC_SUBST([REPLACE_ROUNDF])
-  REPLACE_ROUNDL=0;            AC_SUBST([REPLACE_ROUNDL])
-  REPLACE_SIGNBIT=0;           AC_SUBST([REPLACE_SIGNBIT])
-  REPLACE_SIGNBIT_USING_GCC=0; AC_SUBST([REPLACE_SIGNBIT_USING_GCC])
-  REPLACE_SINF=0;              AC_SUBST([REPLACE_SINF])
-  REPLACE_SINHF=0;             AC_SUBST([REPLACE_SINHF])
-  REPLACE_SQRTF=0;             AC_SUBST([REPLACE_SQRTF])
-  REPLACE_SQRTL=0;             AC_SUBST([REPLACE_SQRTL])
-  REPLACE_TANF=0;              AC_SUBST([REPLACE_TANF])
-  REPLACE_TANHF=0;             AC_SUBST([REPLACE_TANHF])
-  REPLACE_TRUNC=0;             AC_SUBST([REPLACE_TRUNC])
-  REPLACE_TRUNCF=0;            AC_SUBST([REPLACE_TRUNCF])
-  REPLACE_TRUNCL=0;            AC_SUBST([REPLACE_TRUNCL])
+  AC_SUBST([HAVE_ACOSF], [1])
+  AC_SUBST([HAVE_ACOSL], [1])
+  AC_SUBST([HAVE_ASINF], [1])
+  AC_SUBST([HAVE_ASINL], [1])
+  AC_SUBST([HAVE_ATANF], [1])
+  AC_SUBST([HAVE_ATANL], [1])
+  AC_SUBST([HAVE_ATAN2F], [1])
+  AC_SUBST([HAVE_CBRT], [1])
+  AC_SUBST([HAVE_CBRTF], [1])
+  AC_SUBST([HAVE_CBRTL], [1])
+  AC_SUBST([HAVE_COPYSIGN], [1])
+  AC_SUBST([HAVE_COPYSIGNL], [1])
+  AC_SUBST([HAVE_COSF], [1])
+  AC_SUBST([HAVE_COSL], [1])
+  AC_SUBST([HAVE_COSHF], [1])
+  AC_SUBST([HAVE_EXPF], [1])
+  AC_SUBST([HAVE_EXPL], [1])
+  AC_SUBST([HAVE_EXPM1], [1])
+  AC_SUBST([HAVE_EXPM1F], [1])
+  AC_SUBST([HAVE_FABSF], [1])
+  AC_SUBST([HAVE_FABSL], [1])
+  AC_SUBST([HAVE_FMA], [1])
+  AC_SUBST([HAVE_FMAF], [1])
+  AC_SUBST([HAVE_FMAL], [1])
+  AC_SUBST([HAVE_FMODF], [1])
+  AC_SUBST([HAVE_FMODL], [1])
+  AC_SUBST([HAVE_FREXPF], [1])
+  AC_SUBST([HAVE_HYPOTF], [1])
+  AC_SUBST([HAVE_HYPOTL], [1])
+  AC_SUBST([HAVE_ILOGB], [1])
+  AC_SUBST([HAVE_ILOGBF], [1])
+  AC_SUBST([HAVE_ILOGBL], [1])
+  AC_SUBST([HAVE_ISNANF], [1])
+  AC_SUBST([HAVE_ISNAND], [1])
+  AC_SUBST([HAVE_ISNANL], [1])
+  AC_SUBST([HAVE_LDEXPF], [1])
+  AC_SUBST([HAVE_LOGF], [1])
+  AC_SUBST([HAVE_LOGL], [1])
+  AC_SUBST([HAVE_LOG10F], [1])
+  AC_SUBST([HAVE_LOG10L], [1])
+  AC_SUBST([HAVE_LOG1P], [1])
+  AC_SUBST([HAVE_LOG1PF], [1])
+  AC_SUBST([HAVE_LOG1PL], [1])
+  AC_SUBST([HAVE_LOGBF], [1])
+  AC_SUBST([HAVE_LOGBL], [1])
+  AC_SUBST([HAVE_MODFF], [1])
+  AC_SUBST([HAVE_MODFL], [1])
+  AC_SUBST([HAVE_POWF], [1])
+  AC_SUBST([HAVE_REMAINDER], [1])
+  AC_SUBST([HAVE_REMAINDERF], [1])
+  AC_SUBST([HAVE_RINT], [1])
+  AC_SUBST([HAVE_RINTL], [1])
+  AC_SUBST([HAVE_SINF], [1])
+  AC_SUBST([HAVE_SINL], [1])
+  AC_SUBST([HAVE_SINHF], [1])
+  AC_SUBST([HAVE_SQRTF], [1])
+  AC_SUBST([HAVE_SQRTL], [1])
+  AC_SUBST([HAVE_TANF], [1])
+  AC_SUBST([HAVE_TANL], [1])
+  AC_SUBST([HAVE_TANHF], [1])
+  AC_SUBST([HAVE_DECL_ACOSL], [1])
+  AC_SUBST([HAVE_DECL_ASINL], [1])
+  AC_SUBST([HAVE_DECL_ATANL], [1])
+  AC_SUBST([HAVE_DECL_CBRTF], [1])
+  AC_SUBST([HAVE_DECL_CBRTL], [1])
+  AC_SUBST([HAVE_DECL_CEILF], [1])
+  AC_SUBST([HAVE_DECL_CEILL], [1])
+  AC_SUBST([HAVE_DECL_COPYSIGNF], [1])
+  AC_SUBST([HAVE_DECL_COSL], [1])
+  AC_SUBST([HAVE_DECL_EXPL], [1])
+  AC_SUBST([HAVE_DECL_EXP2], [1])
+  AC_SUBST([HAVE_DECL_EXP2F], [1])
+  AC_SUBST([HAVE_DECL_EXP2L], [1])
+  AC_SUBST([HAVE_DECL_EXPM1L], [1])
+  AC_SUBST([HAVE_DECL_FLOORF], [1])
+  AC_SUBST([HAVE_DECL_FLOORL], [1])
+  AC_SUBST([HAVE_DECL_FREXPL], [1])
+  AC_SUBST([HAVE_DECL_LDEXPL], [1])
+  AC_SUBST([HAVE_DECL_LOGL], [1])
+  AC_SUBST([HAVE_DECL_LOG10L], [1])
+  AC_SUBST([HAVE_DECL_LOG2], [1])
+  AC_SUBST([HAVE_DECL_LOG2F], [1])
+  AC_SUBST([HAVE_DECL_LOG2L], [1])
+  AC_SUBST([HAVE_DECL_LOGB], [1])
+  AC_SUBST([HAVE_DECL_REMAINDER], [1])
+  AC_SUBST([HAVE_DECL_REMAINDERL], [1])
+  AC_SUBST([HAVE_DECL_RINTF], [1])
+  AC_SUBST([HAVE_DECL_ROUND], [1])
+  AC_SUBST([HAVE_DECL_ROUNDF], [1])
+  AC_SUBST([HAVE_DECL_ROUNDL], [1])
+  AC_SUBST([HAVE_DECL_SINL], [1])
+  AC_SUBST([HAVE_DECL_SQRTL], [1])
+  AC_SUBST([HAVE_DECL_TANL], [1])
+  AC_SUBST([HAVE_DECL_TRUNC], [1])
+  AC_SUBST([HAVE_DECL_TRUNCF], [1])
+  AC_SUBST([HAVE_DECL_TRUNCL], [1])
+  AC_SUBST([REPLACE_ACOSF], [0])
+  AC_SUBST([REPLACE_ASINF], [0])
+  AC_SUBST([REPLACE_ATANF], [0])
+  AC_SUBST([REPLACE_ATAN2F], [0])
+  AC_SUBST([REPLACE_CBRTF], [0])
+  AC_SUBST([REPLACE_CBRTL], [0])
+  AC_SUBST([REPLACE_CEIL], [0])
+  AC_SUBST([REPLACE_CEILF], [0])
+  AC_SUBST([REPLACE_CEILL], [0])
+  AC_SUBST([REPLACE_COSF], [0])
+  AC_SUBST([REPLACE_COSHF], [0])
+  AC_SUBST([REPLACE_EXPF], [0])
+  AC_SUBST([REPLACE_EXPL], [0])
+  AC_SUBST([REPLACE_EXPM1], [0])
+  AC_SUBST([REPLACE_EXPM1F], [0])
+  AC_SUBST([REPLACE_EXPM1L], [0])
+  AC_SUBST([REPLACE_EXP2], [0])
+  AC_SUBST([REPLACE_EXP2L], [0])
+  AC_SUBST([REPLACE_FABSL], [0])
+  AC_SUBST([REPLACE_FLOOR], [0])
+  AC_SUBST([REPLACE_FLOORF], [0])
+  AC_SUBST([REPLACE_FLOORL], [0])
+  AC_SUBST([REPLACE_FMA], [0])
+  AC_SUBST([REPLACE_FMAF], [0])
+  AC_SUBST([REPLACE_FMAL], [0])
+  AC_SUBST([REPLACE_FMOD], [0])
+  AC_SUBST([REPLACE_FMODF], [0])
+  AC_SUBST([REPLACE_FMODL], [0])
+  AC_SUBST([REPLACE_FREXPF], [0])
+  AC_SUBST([REPLACE_FREXP], [0])
+  AC_SUBST([REPLACE_FREXPL], [0])
+  AC_SUBST([REPLACE_HUGE_VAL], [0])
+  AC_SUBST([REPLACE_HYPOT], [0])
+  AC_SUBST([REPLACE_HYPOTF], [0])
+  AC_SUBST([REPLACE_HYPOTL], [0])
+  AC_SUBST([REPLACE_ILOGB], [0])
+  AC_SUBST([REPLACE_ILOGBF], [0])
+  AC_SUBST([REPLACE_ILOGBL], [0])
+  AC_SUBST([REPLACE_ISFINITE], [0])
+  AC_SUBST([REPLACE_ISINF], [0])
+  AC_SUBST([REPLACE_ISNAN], [0])
+  AC_SUBST([REPLACE_LDEXPL], [0])
+  AC_SUBST([REPLACE_LOG], [0])
+  AC_SUBST([REPLACE_LOGF], [0])
+  AC_SUBST([REPLACE_LOGL], [0])
+  AC_SUBST([REPLACE_LOG10], [0])
+  AC_SUBST([REPLACE_LOG10F], [0])
+  AC_SUBST([REPLACE_LOG10L], [0])
+  AC_SUBST([REPLACE_LOG1P], [0])
+  AC_SUBST([REPLACE_LOG1PF], [0])
+  AC_SUBST([REPLACE_LOG1PL], [0])
+  AC_SUBST([REPLACE_LOG2], [0])
+  AC_SUBST([REPLACE_LOG2F], [0])
+  AC_SUBST([REPLACE_LOG2L], [0])
+  AC_SUBST([REPLACE_LOGB], [0])
+  AC_SUBST([REPLACE_LOGBF], [0])
+  AC_SUBST([REPLACE_LOGBL], [0])
+  AC_SUBST([REPLACE_MODF], [0])
+  AC_SUBST([REPLACE_MODFF], [0])
+  AC_SUBST([REPLACE_MODFL], [0])
+  AC_SUBST([REPLACE_NAN], [0])
+  AC_SUBST([REPLACE_REMAINDER], [0])
+  AC_SUBST([REPLACE_REMAINDERF], [0])
+  AC_SUBST([REPLACE_REMAINDERL], [0])
+  AC_SUBST([REPLACE_RINTL], [0])
+  AC_SUBST([REPLACE_ROUND], [0])
+  AC_SUBST([REPLACE_ROUNDF], [0])
+  AC_SUBST([REPLACE_ROUNDL], [0])
+  AC_SUBST([REPLACE_SIGNBIT], [0])
+  AC_SUBST([REPLACE_SIGNBIT_USING_GCC], [0])
+  AC_SUBST([REPLACE_SINF], [0])
+  AC_SUBST([REPLACE_SINHF], [0])
+  AC_SUBST([REPLACE_SQRTF], [0])
+  AC_SUBST([REPLACE_SQRTL], [0])
+  AC_SUBST([REPLACE_TANF], [0])
+  AC_SUBST([REPLACE_TANHF], [0])
+  AC_SUBST([REPLACE_TRUNC], [0])
+  AC_SUBST([REPLACE_TRUNCF], [0])
+  AC_SUBST([REPLACE_TRUNCL], [0])
 ])
 
 # gl_LONG_DOUBLE_VS_DOUBLE
diff --git a/m4/monetary_h.m4 b/m4/monetary_h.m4
index 556a26591..42cce91cd 100644
--- a/m4/monetary_h.m4
+++ b/m4/monetary_h.m4
@@ -1,4 +1,4 @@
-# monetary_h.m4 serial 5
+# monetary_h.m4 serial 6
 dnl Copyright (C) 2017-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -56,8 +56,8 @@ AC_DEFUN([gl_MONETARY_MODULE_INDICATOR],
 
 AC_DEFUN([gl_MONETARY_H_DEFAULTS],
 [
-  GNULIB_STRFMON_L=0;      AC_SUBST([GNULIB_STRFMON_L])
+  AC_SUBST([GNULIB_STRFMON_L], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_STRFMON_L=1;        AC_SUBST([HAVE_STRFMON_L])
-  REPLACE_STRFMON_L=0;     AC_SUBST([REPLACE_STRFMON_L])
+  AC_SUBST([HAVE_STRFMON_L], [1])
+  AC_SUBST([REPLACE_STRFMON_L], [0])
 ])
diff --git a/m4/netdb_h.m4 b/m4/netdb_h.m4
index 143a2c885..9e3820c40 100644
--- a/m4/netdb_h.m4
+++ b/m4/netdb_h.m4
@@ -1,4 +1,4 @@
-# netdb_h.m4 serial 12
+# netdb_h.m4 serial 13
 dnl Copyright (C) 2008-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -32,13 +32,13 @@ AC_DEFUN([gl_NETDB_MODULE_INDICATOR],
 
 AC_DEFUN([gl_NETDB_H_DEFAULTS],
 [
-  GNULIB_GETADDRINFO=0; AC_SUBST([GNULIB_GETADDRINFO])
+  AC_SUBST([GNULIB_GETADDRINFO], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_STRUCT_ADDRINFO=1;   AC_SUBST([HAVE_STRUCT_ADDRINFO])
-  HAVE_DECL_FREEADDRINFO=1; AC_SUBST([HAVE_DECL_FREEADDRINFO])
-  HAVE_DECL_GAI_STRERROR=1; AC_SUBST([HAVE_DECL_GAI_STRERROR])
-  HAVE_DECL_GETADDRINFO=1;  AC_SUBST([HAVE_DECL_GETADDRINFO])
-  HAVE_DECL_GETNAMEINFO=1;  AC_SUBST([HAVE_DECL_GETNAMEINFO])
-  REPLACE_GAI_STRERROR=0;   AC_SUBST([REPLACE_GAI_STRERROR])
-  REPLACE_GETADDRINFO=0;    AC_SUBST([REPLACE_GETADDRINFO])
+  AC_SUBST([HAVE_STRUCT_ADDRINFO], [1])
+  AC_SUBST([HAVE_DECL_FREEADDRINFO], [1])
+  AC_SUBST([HAVE_DECL_GAI_STRERROR], [1])
+  AC_SUBST([HAVE_DECL_GETADDRINFO], [1])
+  AC_SUBST([HAVE_DECL_GETNAMEINFO], [1])
+  AC_SUBST([REPLACE_GAI_STRERROR], [0])
+  AC_SUBST([REPLACE_GETADDRINFO], [0])
 ])
diff --git a/m4/poll_h.m4 b/m4/poll_h.m4
index 41b04773a..3805a65c4 100644
--- a/m4/poll_h.m4
+++ b/m4/poll_h.m4
@@ -1,4 +1,4 @@
-# poll_h.m4 serial 3
+# poll_h.m4 serial 4
 dnl Copyright (C) 2010-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -42,8 +42,8 @@ AC_DEFUN([gl_POLL_MODULE_INDICATOR],
 
 AC_DEFUN([gl_POLL_H_DEFAULTS],
 [
-  GNULIB_POLL=0;        AC_SUBST([GNULIB_POLL])
+  AC_SUBST([GNULIB_POLL], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_POLL=1;          AC_SUBST([HAVE_POLL])
-  REPLACE_POLL=0;       AC_SUBST([REPLACE_POLL])
+  AC_SUBST([HAVE_POLL], [1])
+  AC_SUBST([REPLACE_POLL], [0])
 ])
diff --git a/m4/pthread_h.m4 b/m4/pthread_h.m4
index 5b5e7ba96..8f961c228 100644
--- a/m4/pthread_h.m4
+++ b/m4/pthread_h.m4
@@ -1,4 +1,4 @@
-# pthread_h.m4 serial 5
+# pthread_h.m4 serial 6
 dnl Copyright (C) 2009-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -148,121 +148,121 @@ AC_DEFUN([gl_PTHREAD_MODULE_INDICATOR],
 
 AC_DEFUN([gl_PTHREAD_H_DEFAULTS],
 [
-  GNULIB_PTHREAD_THREAD=0;               AC_SUBST([GNULIB_PTHREAD_THREAD])
-  GNULIB_PTHREAD_ONCE=0;                 AC_SUBST([GNULIB_PTHREAD_ONCE])
-  GNULIB_PTHREAD_MUTEX=0;                AC_SUBST([GNULIB_PTHREAD_MUTEX])
-  GNULIB_PTHREAD_RWLOCK=0;               AC_SUBST([GNULIB_PTHREAD_RWLOCK])
-  GNULIB_PTHREAD_COND=0;                 AC_SUBST([GNULIB_PTHREAD_COND])
-  GNULIB_PTHREAD_TSS=0;                  AC_SUBST([GNULIB_PTHREAD_TSS])
-  GNULIB_PTHREAD_SPIN=0;                 AC_SUBST([GNULIB_PTHREAD_SPIN])
-  GNULIB_PTHREAD_MUTEX_TIMEDLOCK=0;      
AC_SUBST([GNULIB_PTHREAD_MUTEX_TIMEDLOCK])
+  AC_SUBST([GNULIB_PTHREAD_THREAD], [0])
+  AC_SUBST([GNULIB_PTHREAD_ONCE], [0])
+  AC_SUBST([GNULIB_PTHREAD_MUTEX], [0])
+  AC_SUBST([GNULIB_PTHREAD_RWLOCK], [0])
+  AC_SUBST([GNULIB_PTHREAD_COND], [0])
+  AC_SUBST([GNULIB_PTHREAD_TSS], [0])
+  AC_SUBST([GNULIB_PTHREAD_SPIN], [0])
+  AC_SUBST([GNULIB_PTHREAD_MUTEX_TIMEDLOCK], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_PTHREAD_T=1;                      AC_SUBST([HAVE_PTHREAD_T])
-  HAVE_PTHREAD_SPINLOCK_T=1;             AC_SUBST([HAVE_PTHREAD_SPINLOCK_T])
-  HAVE_PTHREAD_CREATE_DETACHED=1;        
AC_SUBST([HAVE_PTHREAD_CREATE_DETACHED])
-  HAVE_PTHREAD_MUTEX_RECURSIVE=1;        
AC_SUBST([HAVE_PTHREAD_MUTEX_RECURSIVE])
-  HAVE_PTHREAD_MUTEX_ROBUST=1;           AC_SUBST([HAVE_PTHREAD_MUTEX_ROBUST])
-  HAVE_PTHREAD_PROCESS_SHARED=1;         
AC_SUBST([HAVE_PTHREAD_PROCESS_SHARED])
-  HAVE_PTHREAD_CREATE=1;                 AC_SUBST([HAVE_PTHREAD_CREATE])
-  HAVE_PTHREAD_ATTR_INIT=1;              AC_SUBST([HAVE_PTHREAD_ATTR_INIT])
-  HAVE_PTHREAD_ATTR_GETDETACHSTATE=1;    
AC_SUBST([HAVE_PTHREAD_ATTR_GETDETACHSTATE])
-  HAVE_PTHREAD_ATTR_SETDETACHSTATE=1;    
AC_SUBST([HAVE_PTHREAD_ATTR_SETDETACHSTATE])
-  HAVE_PTHREAD_ATTR_DESTROY=1;           AC_SUBST([HAVE_PTHREAD_ATTR_DESTROY])
-  HAVE_PTHREAD_SELF=1;                   AC_SUBST([HAVE_PTHREAD_SELF])
-  HAVE_PTHREAD_EQUAL=1;                  AC_SUBST([HAVE_PTHREAD_EQUAL])
-  HAVE_PTHREAD_DETACH=1;                 AC_SUBST([HAVE_PTHREAD_DETACH])
-  HAVE_PTHREAD_JOIN=1;                   AC_SUBST([HAVE_PTHREAD_JOIN])
-  HAVE_PTHREAD_EXIT=1;                   AC_SUBST([HAVE_PTHREAD_EXIT])
-  HAVE_PTHREAD_ONCE=1;                   AC_SUBST([HAVE_PTHREAD_ONCE])
-  HAVE_PTHREAD_MUTEX_INIT=1;             AC_SUBST([HAVE_PTHREAD_MUTEX_INIT])
-  HAVE_PTHREAD_MUTEXATTR_INIT=1;         
AC_SUBST([HAVE_PTHREAD_MUTEXATTR_INIT])
-  HAVE_PTHREAD_MUTEXATTR_GETTYPE=1;      
AC_SUBST([HAVE_PTHREAD_MUTEXATTR_GETTYPE])
-  HAVE_PTHREAD_MUTEXATTR_SETTYPE=1;      
AC_SUBST([HAVE_PTHREAD_MUTEXATTR_SETTYPE])
-  HAVE_PTHREAD_MUTEXATTR_GETROBUST=1;    
AC_SUBST([HAVE_PTHREAD_MUTEXATTR_GETROBUST])
-  HAVE_PTHREAD_MUTEXATTR_SETROBUST=1;    
AC_SUBST([HAVE_PTHREAD_MUTEXATTR_SETROBUST])
-  HAVE_PTHREAD_MUTEXATTR_DESTROY=1;      
AC_SUBST([HAVE_PTHREAD_MUTEXATTR_DESTROY])
-  HAVE_PTHREAD_MUTEX_LOCK=1;             AC_SUBST([HAVE_PTHREAD_MUTEX_LOCK])
-  HAVE_PTHREAD_MUTEX_TRYLOCK=1;          AC_SUBST([HAVE_PTHREAD_MUTEX_TRYLOCK])
-  HAVE_PTHREAD_MUTEX_TIMEDLOCK=1;        
AC_SUBST([HAVE_PTHREAD_MUTEX_TIMEDLOCK])
-  HAVE_PTHREAD_MUTEX_UNLOCK=1;           AC_SUBST([HAVE_PTHREAD_MUTEX_UNLOCK])
-  HAVE_PTHREAD_MUTEX_DESTROY=1;          AC_SUBST([HAVE_PTHREAD_MUTEX_DESTROY])
-  HAVE_PTHREAD_RWLOCK_INIT=1;            AC_SUBST([HAVE_PTHREAD_RWLOCK_INIT])
-  HAVE_PTHREAD_RWLOCKATTR_INIT=1;        
AC_SUBST([HAVE_PTHREAD_RWLOCKATTR_INIT])
-  HAVE_PTHREAD_RWLOCKATTR_DESTROY=1;     
AC_SUBST([HAVE_PTHREAD_RWLOCKATTR_DESTROY])
-  HAVE_PTHREAD_RWLOCK_RDLOCK=1;          AC_SUBST([HAVE_PTHREAD_RWLOCK_RDLOCK])
-  HAVE_PTHREAD_RWLOCK_WRLOCK=1;          AC_SUBST([HAVE_PTHREAD_RWLOCK_WRLOCK])
-  HAVE_PTHREAD_RWLOCK_TRYRDLOCK=1;       
AC_SUBST([HAVE_PTHREAD_RWLOCK_TRYRDLOCK])
-  HAVE_PTHREAD_RWLOCK_TRYWRLOCK=1;       
AC_SUBST([HAVE_PTHREAD_RWLOCK_TRYWRLOCK])
-  HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK=1;     
AC_SUBST([HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK])
-  HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK=1;     
AC_SUBST([HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK])
-  HAVE_PTHREAD_RWLOCK_UNLOCK=1;          AC_SUBST([HAVE_PTHREAD_RWLOCK_UNLOCK])
-  HAVE_PTHREAD_RWLOCK_DESTROY=1;         
AC_SUBST([HAVE_PTHREAD_RWLOCK_DESTROY])
-  HAVE_PTHREAD_COND_INIT=1;              AC_SUBST([HAVE_PTHREAD_COND_INIT])
-  HAVE_PTHREAD_CONDATTR_INIT=1;          AC_SUBST([HAVE_PTHREAD_CONDATTR_INIT])
-  HAVE_PTHREAD_CONDATTR_DESTROY=1;       
AC_SUBST([HAVE_PTHREAD_CONDATTR_DESTROY])
-  HAVE_PTHREAD_COND_WAIT=1;              AC_SUBST([HAVE_PTHREAD_COND_WAIT])
-  HAVE_PTHREAD_COND_TIMEDWAIT=1;         
AC_SUBST([HAVE_PTHREAD_COND_TIMEDWAIT])
-  HAVE_PTHREAD_COND_SIGNAL=1;            AC_SUBST([HAVE_PTHREAD_COND_SIGNAL])
-  HAVE_PTHREAD_COND_BROADCAST=1;         
AC_SUBST([HAVE_PTHREAD_COND_BROADCAST])
-  HAVE_PTHREAD_COND_DESTROY=1;           AC_SUBST([HAVE_PTHREAD_COND_DESTROY])
-  HAVE_PTHREAD_KEY_CREATE=1;             AC_SUBST([HAVE_PTHREAD_KEY_CREATE])
-  HAVE_PTHREAD_SETSPECIFIC=1;            AC_SUBST([HAVE_PTHREAD_SETSPECIFIC])
-  HAVE_PTHREAD_GETSPECIFIC=1;            AC_SUBST([HAVE_PTHREAD_GETSPECIFIC])
-  HAVE_PTHREAD_KEY_DELETE=1;             AC_SUBST([HAVE_PTHREAD_KEY_DELETE])
-  HAVE_PTHREAD_SPIN_INIT=1;              AC_SUBST([HAVE_PTHREAD_SPIN_INIT])
-  HAVE_PTHREAD_SPIN_LOCK=1;              AC_SUBST([HAVE_PTHREAD_SPIN_LOCK])
-  HAVE_PTHREAD_SPIN_TRYLOCK=1;           AC_SUBST([HAVE_PTHREAD_SPIN_TRYLOCK])
-  HAVE_PTHREAD_SPIN_UNLOCK=1;            AC_SUBST([HAVE_PTHREAD_SPIN_UNLOCK])
-  HAVE_PTHREAD_SPIN_DESTROY=1;           AC_SUBST([HAVE_PTHREAD_SPIN_DESTROY])
-  REPLACE_PTHREAD_CREATE=0;              AC_SUBST([REPLACE_PTHREAD_CREATE])
-  REPLACE_PTHREAD_ATTR_INIT=0;           AC_SUBST([REPLACE_PTHREAD_ATTR_INIT])
-  REPLACE_PTHREAD_ATTR_GETDETACHSTATE=0; 
AC_SUBST([REPLACE_PTHREAD_ATTR_GETDETACHSTATE])
-  REPLACE_PTHREAD_ATTR_SETDETACHSTATE=0; 
AC_SUBST([REPLACE_PTHREAD_ATTR_SETDETACHSTATE])
-  REPLACE_PTHREAD_ATTR_DESTROY=0;        
AC_SUBST([REPLACE_PTHREAD_ATTR_DESTROY])
-  REPLACE_PTHREAD_SELF=0;                AC_SUBST([REPLACE_PTHREAD_SELF])
-  REPLACE_PTHREAD_EQUAL=0;               AC_SUBST([REPLACE_PTHREAD_EQUAL])
-  REPLACE_PTHREAD_DETACH=0;              AC_SUBST([REPLACE_PTHREAD_DETACH])
-  REPLACE_PTHREAD_JOIN=0;                AC_SUBST([REPLACE_PTHREAD_JOIN])
-  REPLACE_PTHREAD_EXIT=0;                AC_SUBST([REPLACE_PTHREAD_EXIT])
-  REPLACE_PTHREAD_ONCE=0;                AC_SUBST([REPLACE_PTHREAD_ONCE])
-  REPLACE_PTHREAD_MUTEX_INIT=0;          AC_SUBST([REPLACE_PTHREAD_MUTEX_INIT])
-  REPLACE_PTHREAD_MUTEXATTR_INIT=0;      
AC_SUBST([REPLACE_PTHREAD_MUTEXATTR_INIT])
-  REPLACE_PTHREAD_MUTEXATTR_GETTYPE=0;   
AC_SUBST([REPLACE_PTHREAD_MUTEXATTR_GETTYPE])
-  REPLACE_PTHREAD_MUTEXATTR_SETTYPE=0;   
AC_SUBST([REPLACE_PTHREAD_MUTEXATTR_SETTYPE])
-  REPLACE_PTHREAD_MUTEXATTR_GETROBUST=0; 
AC_SUBST([REPLACE_PTHREAD_MUTEXATTR_GETROBUST])
-  REPLACE_PTHREAD_MUTEXATTR_SETROBUST=0; 
AC_SUBST([REPLACE_PTHREAD_MUTEXATTR_SETROBUST])
-  REPLACE_PTHREAD_MUTEXATTR_DESTROY=0;   
AC_SUBST([REPLACE_PTHREAD_MUTEXATTR_DESTROY])
-  REPLACE_PTHREAD_MUTEX_LOCK=0;          AC_SUBST([REPLACE_PTHREAD_MUTEX_LOCK])
-  REPLACE_PTHREAD_MUTEX_TRYLOCK=0;       
AC_SUBST([REPLACE_PTHREAD_MUTEX_TRYLOCK])
-  REPLACE_PTHREAD_MUTEX_TIMEDLOCK=0;     
AC_SUBST([REPLACE_PTHREAD_MUTEX_TIMEDLOCK])
-  REPLACE_PTHREAD_MUTEX_UNLOCK=0;        
AC_SUBST([REPLACE_PTHREAD_MUTEX_UNLOCK])
-  REPLACE_PTHREAD_MUTEX_DESTROY=0;       
AC_SUBST([REPLACE_PTHREAD_MUTEX_DESTROY])
-  REPLACE_PTHREAD_RWLOCK_INIT=0;         
AC_SUBST([REPLACE_PTHREAD_RWLOCK_INIT])
-  REPLACE_PTHREAD_RWLOCKATTR_INIT=0;     
AC_SUBST([REPLACE_PTHREAD_RWLOCKATTR_INIT])
-  REPLACE_PTHREAD_RWLOCKATTR_DESTROY=0;  
AC_SUBST([REPLACE_PTHREAD_RWLOCKATTR_DESTROY])
-  REPLACE_PTHREAD_RWLOCK_RDLOCK=0;       
AC_SUBST([REPLACE_PTHREAD_RWLOCK_RDLOCK])
-  REPLACE_PTHREAD_RWLOCK_WRLOCK=0;       
AC_SUBST([REPLACE_PTHREAD_RWLOCK_WRLOCK])
-  REPLACE_PTHREAD_RWLOCK_TRYRDLOCK=0;    
AC_SUBST([REPLACE_PTHREAD_RWLOCK_TRYRDLOCK])
-  REPLACE_PTHREAD_RWLOCK_TRYWRLOCK=0;    
AC_SUBST([REPLACE_PTHREAD_RWLOCK_TRYWRLOCK])
-  REPLACE_PTHREAD_RWLOCK_TIMEDRDLOCK=0;  
AC_SUBST([REPLACE_PTHREAD_RWLOCK_TIMEDRDLOCK])
-  REPLACE_PTHREAD_RWLOCK_TIMEDWRLOCK=0;  
AC_SUBST([REPLACE_PTHREAD_RWLOCK_TIMEDWRLOCK])
-  REPLACE_PTHREAD_RWLOCK_UNLOCK=0;       
AC_SUBST([REPLACE_PTHREAD_RWLOCK_UNLOCK])
-  REPLACE_PTHREAD_RWLOCK_DESTROY=0;      
AC_SUBST([REPLACE_PTHREAD_RWLOCK_DESTROY])
-  REPLACE_PTHREAD_COND_INIT=0;           AC_SUBST([REPLACE_PTHREAD_COND_INIT])
-  REPLACE_PTHREAD_CONDATTR_INIT=0;       
AC_SUBST([REPLACE_PTHREAD_CONDATTR_INIT])
-  REPLACE_PTHREAD_CONDATTR_DESTROY=0;    
AC_SUBST([REPLACE_PTHREAD_CONDATTR_DESTROY])
-  REPLACE_PTHREAD_COND_WAIT=0;           AC_SUBST([REPLACE_PTHREAD_COND_WAIT])
-  REPLACE_PTHREAD_COND_TIMEDWAIT=0;      
AC_SUBST([REPLACE_PTHREAD_COND_TIMEDWAIT])
-  REPLACE_PTHREAD_COND_SIGNAL=0;         
AC_SUBST([REPLACE_PTHREAD_COND_SIGNAL])
-  REPLACE_PTHREAD_COND_BROADCAST=0;      
AC_SUBST([REPLACE_PTHREAD_COND_BROADCAST])
-  REPLACE_PTHREAD_COND_DESTROY=0;        
AC_SUBST([REPLACE_PTHREAD_COND_DESTROY])
-  REPLACE_PTHREAD_KEY_CREATE=0;          AC_SUBST([REPLACE_PTHREAD_KEY_CREATE])
-  REPLACE_PTHREAD_SETSPECIFIC=0;         
AC_SUBST([REPLACE_PTHREAD_SETSPECIFIC])
-  REPLACE_PTHREAD_GETSPECIFIC=0;         
AC_SUBST([REPLACE_PTHREAD_GETSPECIFIC])
-  REPLACE_PTHREAD_KEY_DELETE=0;          AC_SUBST([REPLACE_PTHREAD_KEY_DELETE])
-  REPLACE_PTHREAD_SPIN_INIT=0;           AC_SUBST([REPLACE_PTHREAD_SPIN_INIT])
-  REPLACE_PTHREAD_SPIN_LOCK=0;           AC_SUBST([REPLACE_PTHREAD_SPIN_LOCK])
-  REPLACE_PTHREAD_SPIN_TRYLOCK=0;        
AC_SUBST([REPLACE_PTHREAD_SPIN_TRYLOCK])
-  REPLACE_PTHREAD_SPIN_UNLOCK=0;         
AC_SUBST([REPLACE_PTHREAD_SPIN_UNLOCK])
-  REPLACE_PTHREAD_SPIN_DESTROY=0;        
AC_SUBST([REPLACE_PTHREAD_SPIN_DESTROY])
+  AC_SUBST([HAVE_PTHREAD_T], [1])
+  AC_SUBST([HAVE_PTHREAD_SPINLOCK_T], [1])
+  AC_SUBST([HAVE_PTHREAD_CREATE_DETACHED], [1])
+  AC_SUBST([HAVE_PTHREAD_MUTEX_RECURSIVE], [1])
+  AC_SUBST([HAVE_PTHREAD_MUTEX_ROBUST], [1])
+  AC_SUBST([HAVE_PTHREAD_PROCESS_SHARED], [1])
+  AC_SUBST([HAVE_PTHREAD_CREATE], [1])
+  AC_SUBST([HAVE_PTHREAD_ATTR_INIT], [1])
+  AC_SUBST([HAVE_PTHREAD_ATTR_GETDETACHSTATE], [1])
+  AC_SUBST([HAVE_PTHREAD_ATTR_SETDETACHSTATE], [1])
+  AC_SUBST([HAVE_PTHREAD_ATTR_DESTROY], [1])
+  AC_SUBST([HAVE_PTHREAD_SELF], [1])
+  AC_SUBST([HAVE_PTHREAD_EQUAL], [1])
+  AC_SUBST([HAVE_PTHREAD_DETACH], [1])
+  AC_SUBST([HAVE_PTHREAD_JOIN], [1])
+  AC_SUBST([HAVE_PTHREAD_EXIT], [1])
+  AC_SUBST([HAVE_PTHREAD_ONCE], [1])
+  AC_SUBST([HAVE_PTHREAD_MUTEX_INIT], [1])
+  AC_SUBST([HAVE_PTHREAD_MUTEXATTR_INIT], [1])
+  AC_SUBST([HAVE_PTHREAD_MUTEXATTR_GETTYPE], [1])
+  AC_SUBST([HAVE_PTHREAD_MUTEXATTR_SETTYPE], [1])
+  AC_SUBST([HAVE_PTHREAD_MUTEXATTR_GETROBUST], [1])
+  AC_SUBST([HAVE_PTHREAD_MUTEXATTR_SETROBUST], [1])
+  AC_SUBST([HAVE_PTHREAD_MUTEXATTR_DESTROY], [1])
+  AC_SUBST([HAVE_PTHREAD_MUTEX_LOCK], [1])
+  AC_SUBST([HAVE_PTHREAD_MUTEX_TRYLOCK], [1])
+  AC_SUBST([HAVE_PTHREAD_MUTEX_TIMEDLOCK], [1])
+  AC_SUBST([HAVE_PTHREAD_MUTEX_UNLOCK], [1])
+  AC_SUBST([HAVE_PTHREAD_MUTEX_DESTROY], [1])
+  AC_SUBST([HAVE_PTHREAD_RWLOCK_INIT], [1])
+  AC_SUBST([HAVE_PTHREAD_RWLOCKATTR_INIT], [1])
+  AC_SUBST([HAVE_PTHREAD_RWLOCKATTR_DESTROY], [1])
+  AC_SUBST([HAVE_PTHREAD_RWLOCK_RDLOCK], [1])
+  AC_SUBST([HAVE_PTHREAD_RWLOCK_WRLOCK], [1])
+  AC_SUBST([HAVE_PTHREAD_RWLOCK_TRYRDLOCK], [1])
+  AC_SUBST([HAVE_PTHREAD_RWLOCK_TRYWRLOCK], [1])
+  AC_SUBST([HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK], [1])
+  AC_SUBST([HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK], [1])
+  AC_SUBST([HAVE_PTHREAD_RWLOCK_UNLOCK], [1])
+  AC_SUBST([HAVE_PTHREAD_RWLOCK_DESTROY], [1])
+  AC_SUBST([HAVE_PTHREAD_COND_INIT], [1])
+  AC_SUBST([HAVE_PTHREAD_CONDATTR_INIT], [1])
+  AC_SUBST([HAVE_PTHREAD_CONDATTR_DESTROY], [1])
+  AC_SUBST([HAVE_PTHREAD_COND_WAIT], [1])
+  AC_SUBST([HAVE_PTHREAD_COND_TIMEDWAIT], [1])
+  AC_SUBST([HAVE_PTHREAD_COND_SIGNAL], [1])
+  AC_SUBST([HAVE_PTHREAD_COND_BROADCAST], [1])
+  AC_SUBST([HAVE_PTHREAD_COND_DESTROY], [1])
+  AC_SUBST([HAVE_PTHREAD_KEY_CREATE], [1])
+  AC_SUBST([HAVE_PTHREAD_SETSPECIFIC], [1])
+  AC_SUBST([HAVE_PTHREAD_GETSPECIFIC], [1])
+  AC_SUBST([HAVE_PTHREAD_KEY_DELETE], [1])
+  AC_SUBST([HAVE_PTHREAD_SPIN_INIT], [1])
+  AC_SUBST([HAVE_PTHREAD_SPIN_LOCK], [1])
+  AC_SUBST([HAVE_PTHREAD_SPIN_TRYLOCK], [1])
+  AC_SUBST([HAVE_PTHREAD_SPIN_UNLOCK], [1])
+  AC_SUBST([HAVE_PTHREAD_SPIN_DESTROY], [1])
+  AC_SUBST([REPLACE_PTHREAD_CREATE], [0])
+  AC_SUBST([REPLACE_PTHREAD_ATTR_INIT], [0])
+  AC_SUBST([REPLACE_PTHREAD_ATTR_GETDETACHSTATE], [0])
+  AC_SUBST([REPLACE_PTHREAD_ATTR_SETDETACHSTATE], [0])
+  AC_SUBST([REPLACE_PTHREAD_ATTR_DESTROY], [0])
+  AC_SUBST([REPLACE_PTHREAD_SELF], [0])
+  AC_SUBST([REPLACE_PTHREAD_EQUAL], [0])
+  AC_SUBST([REPLACE_PTHREAD_DETACH], [0])
+  AC_SUBST([REPLACE_PTHREAD_JOIN], [0])
+  AC_SUBST([REPLACE_PTHREAD_EXIT], [0])
+  AC_SUBST([REPLACE_PTHREAD_ONCE], [0])
+  AC_SUBST([REPLACE_PTHREAD_MUTEX_INIT], [0])
+  AC_SUBST([REPLACE_PTHREAD_MUTEXATTR_INIT], [0])
+  AC_SUBST([REPLACE_PTHREAD_MUTEXATTR_GETTYPE], [0])
+  AC_SUBST([REPLACE_PTHREAD_MUTEXATTR_SETTYPE], [0])
+  AC_SUBST([REPLACE_PTHREAD_MUTEXATTR_GETROBUST], [0])
+  AC_SUBST([REPLACE_PTHREAD_MUTEXATTR_SETROBUST], [0])
+  AC_SUBST([REPLACE_PTHREAD_MUTEXATTR_DESTROY], [0])
+  AC_SUBST([REPLACE_PTHREAD_MUTEX_LOCK], [0])
+  AC_SUBST([REPLACE_PTHREAD_MUTEX_TRYLOCK], [0])
+  AC_SUBST([REPLACE_PTHREAD_MUTEX_TIMEDLOCK], [0])
+  AC_SUBST([REPLACE_PTHREAD_MUTEX_UNLOCK], [0])
+  AC_SUBST([REPLACE_PTHREAD_MUTEX_DESTROY], [0])
+  AC_SUBST([REPLACE_PTHREAD_RWLOCK_INIT], [0])
+  AC_SUBST([REPLACE_PTHREAD_RWLOCKATTR_INIT], [0])
+  AC_SUBST([REPLACE_PTHREAD_RWLOCKATTR_DESTROY], [0])
+  AC_SUBST([REPLACE_PTHREAD_RWLOCK_RDLOCK], [0])
+  AC_SUBST([REPLACE_PTHREAD_RWLOCK_WRLOCK], [0])
+  AC_SUBST([REPLACE_PTHREAD_RWLOCK_TRYRDLOCK], [0])
+  AC_SUBST([REPLACE_PTHREAD_RWLOCK_TRYWRLOCK], [0])
+  AC_SUBST([REPLACE_PTHREAD_RWLOCK_TIMEDRDLOCK], [0])
+  AC_SUBST([REPLACE_PTHREAD_RWLOCK_TIMEDWRLOCK], [0])
+  AC_SUBST([REPLACE_PTHREAD_RWLOCK_UNLOCK], [0])
+  AC_SUBST([REPLACE_PTHREAD_RWLOCK_DESTROY], [0])
+  AC_SUBST([REPLACE_PTHREAD_COND_INIT], [0])
+  AC_SUBST([REPLACE_PTHREAD_CONDATTR_INIT], [0])
+  AC_SUBST([REPLACE_PTHREAD_CONDATTR_DESTROY], [0])
+  AC_SUBST([REPLACE_PTHREAD_COND_WAIT], [0])
+  AC_SUBST([REPLACE_PTHREAD_COND_TIMEDWAIT], [0])
+  AC_SUBST([REPLACE_PTHREAD_COND_SIGNAL], [0])
+  AC_SUBST([REPLACE_PTHREAD_COND_BROADCAST], [0])
+  AC_SUBST([REPLACE_PTHREAD_COND_DESTROY], [0])
+  AC_SUBST([REPLACE_PTHREAD_KEY_CREATE], [0])
+  AC_SUBST([REPLACE_PTHREAD_SETSPECIFIC], [0])
+  AC_SUBST([REPLACE_PTHREAD_GETSPECIFIC], [0])
+  AC_SUBST([REPLACE_PTHREAD_KEY_DELETE], [0])
+  AC_SUBST([REPLACE_PTHREAD_SPIN_INIT], [0])
+  AC_SUBST([REPLACE_PTHREAD_SPIN_LOCK], [0])
+  AC_SUBST([REPLACE_PTHREAD_SPIN_TRYLOCK], [0])
+  AC_SUBST([REPLACE_PTHREAD_SPIN_UNLOCK], [0])
+  AC_SUBST([REPLACE_PTHREAD_SPIN_DESTROY], [0])
 ])
diff --git a/m4/pty_h.m4 b/m4/pty_h.m4
index e2784b03b..5cd92bd4f 100644
--- a/m4/pty_h.m4
+++ b/m4/pty_h.m4
@@ -1,4 +1,4 @@
-# pty_h.m4 serial 11
+# pty_h.m4 serial 12
 dnl Copyright (C) 2009-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -61,13 +61,13 @@ AC_DEFUN([gl_PTY_MODULE_INDICATOR],
 
 AC_DEFUN([gl_PTY_H_DEFAULTS],
 [
-  GNULIB_FORKPTY=0;     AC_SUBST([GNULIB_FORKPTY])
-  GNULIB_OPENPTY=0;     AC_SUBST([GNULIB_OPENPTY])
+  AC_SUBST([GNULIB_FORKPTY], [0])
+  AC_SUBST([GNULIB_OPENPTY], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_UTIL_H=0;        AC_SUBST([HAVE_UTIL_H])
-  HAVE_LIBUTIL_H=0;     AC_SUBST([HAVE_LIBUTIL_H])
-  HAVE_FORKPTY=1;       AC_SUBST([HAVE_FORKPTY])
-  HAVE_OPENPTY=1;       AC_SUBST([HAVE_OPENPTY])
-  REPLACE_FORKPTY=0;    AC_SUBST([REPLACE_FORKPTY])
-  REPLACE_OPENPTY=0;    AC_SUBST([REPLACE_OPENPTY])
+  AC_SUBST([HAVE_UTIL_H], [0])
+  AC_SUBST([HAVE_LIBUTIL_H], [0])
+  AC_SUBST([HAVE_FORKPTY], [1])
+  AC_SUBST([HAVE_OPENPTY], [1])
+  AC_SUBST([REPLACE_FORKPTY], [0])
+  AC_SUBST([REPLACE_OPENPTY], [0])
 ])
diff --git a/m4/sched_h.m4 b/m4/sched_h.m4
index af0c43de0..80caeb20d 100644
--- a/m4/sched_h.m4
+++ b/m4/sched_h.m4
@@ -84,8 +84,8 @@ AC_DEFUN([gl_SCHED_MODULE_INDICATOR],
 
 AC_DEFUN([gl_SCHED_H_DEFAULTS],
 [
-  GNULIB_SCHED_YIELD=0;  AC_SUBST([GNULIB_SCHED_YIELD])
+  AC_SUBST([GNULIB_SCHED_YIELD], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_SCHED_YIELD=1;    AC_SUBST([HAVE_SCHED_YIELD])
-  REPLACE_SCHED_YIELD=0; AC_SUBST([REPLACE_SCHED_YIELD])
+  AC_SUBST([HAVE_SCHED_YIELD], [1])
+  AC_SUBST([REPLACE_SCHED_YIELD], [0])
 ])
diff --git a/m4/search_h.m4 b/m4/search_h.m4
index f21e7ccda..a25b7777e 100644
--- a/m4/search_h.m4
+++ b/m4/search_h.m4
@@ -1,4 +1,4 @@
-# search_h.m4 serial 11
+# search_h.m4 serial 12
 dnl Copyright (C) 2007-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -55,9 +55,9 @@ AC_DEFUN([gl_SEARCH_MODULE_INDICATOR],
 
 AC_DEFUN([gl_SEARCH_H_DEFAULTS],
 [
-  GNULIB_TSEARCH=0; AC_SUBST([GNULIB_TSEARCH])
+  AC_SUBST([GNULIB_TSEARCH], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_TSEARCH=1;    AC_SUBST([HAVE_TSEARCH])
-  HAVE_TWALK=1;      AC_SUBST([HAVE_TWALK])
-  REPLACE_TSEARCH=0; AC_SUBST([REPLACE_TSEARCH])
+  AC_SUBST([HAVE_TSEARCH], [1])
+  AC_SUBST([HAVE_TWALK], [1])
+  AC_SUBST([REPLACE_TSEARCH], [0])
 ])
diff --git a/m4/signal_h.m4 b/m4/signal_h.m4
index b2629809f..8e8384366 100644
--- a/m4/signal_h.m4
+++ b/m4/signal_h.m4
@@ -1,4 +1,4 @@
-# signal_h.m4 serial 19
+# signal_h.m4 serial 20
 dnl Copyright (C) 2007-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -63,23 +63,21 @@ AC_DEFUN([gl_SIGNAL_MODULE_INDICATOR],
 
 AC_DEFUN([gl_SIGNAL_H_DEFAULTS],
 [
-  GNULIB_PTHREAD_SIGMASK=0;    AC_SUBST([GNULIB_PTHREAD_SIGMASK])
-  GNULIB_RAISE=0;              AC_SUBST([GNULIB_RAISE])
-  GNULIB_SIGNAL_H_SIGPIPE=0;   AC_SUBST([GNULIB_SIGNAL_H_SIGPIPE])
-  GNULIB_SIGPROCMASK=0;        AC_SUBST([GNULIB_SIGPROCMASK])
-  GNULIB_SIGACTION=0;          AC_SUBST([GNULIB_SIGACTION])
+  AC_SUBST([GNULIB_PTHREAD_SIGMASK], [0])
+  AC_SUBST([GNULIB_RAISE], [0])
+  AC_SUBST([GNULIB_SIGNAL_H_SIGPIPE], [0])
+  AC_SUBST([GNULIB_SIGPROCMASK], [0])
+  AC_SUBST([GNULIB_SIGACTION], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_POSIX_SIGNALBLOCKING=1; AC_SUBST([HAVE_POSIX_SIGNALBLOCKING])
-  HAVE_PTHREAD_SIGMASK=1;      AC_SUBST([HAVE_PTHREAD_SIGMASK])
-  HAVE_RAISE=1;                AC_SUBST([HAVE_RAISE])
-  HAVE_SIGSET_T=1;             AC_SUBST([HAVE_SIGSET_T])
-  HAVE_SIGINFO_T=1;            AC_SUBST([HAVE_SIGINFO_T])
-  HAVE_SIGACTION=1;            AC_SUBST([HAVE_SIGACTION])
-  HAVE_STRUCT_SIGACTION_SA_SIGACTION=1;
-                               AC_SUBST([HAVE_STRUCT_SIGACTION_SA_SIGACTION])
-  HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=1;
-                               AC_SUBST([HAVE_TYPE_VOLATILE_SIG_ATOMIC_T])
-  HAVE_SIGHANDLER_T=1;         AC_SUBST([HAVE_SIGHANDLER_T])
-  REPLACE_PTHREAD_SIGMASK=0;   AC_SUBST([REPLACE_PTHREAD_SIGMASK])
-  REPLACE_RAISE=0;             AC_SUBST([REPLACE_RAISE])
+  AC_SUBST([HAVE_POSIX_SIGNALBLOCKING], [1])
+  AC_SUBST([HAVE_PTHREAD_SIGMASK], [1])
+  AC_SUBST([HAVE_RAISE], [1])
+  AC_SUBST([HAVE_SIGSET_T], [1])
+  AC_SUBST([HAVE_SIGINFO_T], [1])
+  AC_SUBST([HAVE_SIGACTION], [1])
+  AC_SUBST([HAVE_STRUCT_SIGACTION_SA_SIGACTION], [1])
+  AC_SUBST([HAVE_TYPE_VOLATILE_SIG_ATOMIC_T], [1])
+  AC_SUBST([HAVE_SIGHANDLER_T], [1])
+  AC_SUBST([REPLACE_PTHREAD_SIGMASK], [0])
+  AC_SUBST([REPLACE_RAISE], [0])
 ])
diff --git a/m4/spawn_h.m4 b/m4/spawn_h.m4
index 781f9f496..27dd979cd 100644
--- a/m4/spawn_h.m4
+++ b/m4/spawn_h.m4
@@ -1,4 +1,4 @@
-# spawn_h.m4 serial 18
+# spawn_h.m4 serial 19
 dnl Copyright (C) 2008-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -90,47 +90,39 @@ AC_DEFUN([gl_SPAWN_MODULE_INDICATOR],
 
 AC_DEFUN([gl_SPAWN_H_DEFAULTS],
 [
-  GNULIB_POSIX_SPAWN=0;                        AC_SUBST([GNULIB_POSIX_SPAWN])
-  GNULIB_POSIX_SPAWNP=0;                       AC_SUBST([GNULIB_POSIX_SPAWNP])
-  GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT=0;      
AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT])
-  GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR=0;  
AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR])
-  GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=0;  
AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE])
-  GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=0;   
AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2])
-  GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR=0; 
AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR])
-  GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=0;   
AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN])
-  GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY=0;   
AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY])
-  GNULIB_POSIX_SPAWNATTR_INIT=0;               
AC_SUBST([GNULIB_POSIX_SPAWNATTR_INIT])
-  GNULIB_POSIX_SPAWNATTR_GETFLAGS=0;           
AC_SUBST([GNULIB_POSIX_SPAWNATTR_GETFLAGS])
-  GNULIB_POSIX_SPAWNATTR_SETFLAGS=0;           
AC_SUBST([GNULIB_POSIX_SPAWNATTR_SETFLAGS])
-  GNULIB_POSIX_SPAWNATTR_GETPGROUP=0;          
AC_SUBST([GNULIB_POSIX_SPAWNATTR_GETPGROUP])
-  GNULIB_POSIX_SPAWNATTR_SETPGROUP=0;          
AC_SUBST([GNULIB_POSIX_SPAWNATTR_SETPGROUP])
-  GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM=0;      
AC_SUBST([GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM])
-  GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM=0;      
AC_SUBST([GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM])
-  GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY=0;     
AC_SUBST([GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY])
-  GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY=0;     
AC_SUBST([GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY])
-  GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT=0;      
AC_SUBST([GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT])
-  GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT=0;      
AC_SUBST([GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT])
-  GNULIB_POSIX_SPAWNATTR_GETSIGMASK=0;         
AC_SUBST([GNULIB_POSIX_SPAWNATTR_GETSIGMASK])
-  GNULIB_POSIX_SPAWNATTR_SETSIGMASK=0;         
AC_SUBST([GNULIB_POSIX_SPAWNATTR_SETSIGMASK])
-  GNULIB_POSIX_SPAWNATTR_DESTROY=0;            
AC_SUBST([GNULIB_POSIX_SPAWNATTR_DESTROY])
+  AC_SUBST([GNULIB_POSIX_SPAWN], [0])
+  AC_SUBST([GNULIB_POSIX_SPAWNP], [0])
+  AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT], [0])
+  AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR], [0])
+  AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE], [0])
+  AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2], [0])
+  AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR], [0])
+  AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN], [0])
+  AC_SUBST([GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY], [0])
+  AC_SUBST([GNULIB_POSIX_SPAWNATTR_INIT], [0])
+  AC_SUBST([GNULIB_POSIX_SPAWNATTR_GETFLAGS], [0])
+  AC_SUBST([GNULIB_POSIX_SPAWNATTR_SETFLAGS], [0])
+  AC_SUBST([GNULIB_POSIX_SPAWNATTR_GETPGROUP], [0])
+  AC_SUBST([GNULIB_POSIX_SPAWNATTR_SETPGROUP], [0])
+  AC_SUBST([GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM], [0])
+  AC_SUBST([GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM], [0])
+  AC_SUBST([GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY], [0])
+  AC_SUBST([GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY], [0])
+  AC_SUBST([GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT], [0])
+  AC_SUBST([GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT], [0])
+  AC_SUBST([GNULIB_POSIX_SPAWNATTR_GETSIGMASK], [0])
+  AC_SUBST([GNULIB_POSIX_SPAWNATTR_SETSIGMASK], [0])
+  AC_SUBST([GNULIB_POSIX_SPAWNATTR_DESTROY], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_POSIX_SPAWN=1;        AC_SUBST([HAVE_POSIX_SPAWN])
-  HAVE_POSIX_SPAWNATTR_T=1;  AC_SUBST([HAVE_POSIX_SPAWNATTR_T])
-  HAVE_POSIX_SPAWN_FILE_ACTIONS_T=1;
-                             AC_SUBST([HAVE_POSIX_SPAWN_FILE_ACTIONS_T])
-  HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR=1;
-                             AC_SUBST([HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR])
-  HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR=1;
-                             
AC_SUBST([HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR])
-  REPLACE_POSIX_SPAWN=0;     AC_SUBST([REPLACE_POSIX_SPAWN])
-  REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR=0;
-                             
AC_SUBST([REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR])
-  REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE=0;
-                             
AC_SUBST([REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE])
-  REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2=0;
-                             
AC_SUBST([REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2])
-  REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR=0;
-                             
AC_SUBST([REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR])
-  REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN=0;
-                             
AC_SUBST([REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN])
+  AC_SUBST([HAVE_POSIX_SPAWN], [1])
+  AC_SUBST([HAVE_POSIX_SPAWNATTR_T], [1])
+  AC_SUBST([HAVE_POSIX_SPAWN_FILE_ACTIONS_T], [1])
+  AC_SUBST([HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR], [1])
+  AC_SUBST([HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR], [1])
+  AC_SUBST([REPLACE_POSIX_SPAWN], [0])
+  AC_SUBST([REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR], [0])
+  AC_SUBST([REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE], [0])
+  AC_SUBST([REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2], [0])
+  AC_SUBST([REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR], [0])
+  AC_SUBST([REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN], [0])
 ])
diff --git a/m4/stddef_h.m4 b/m4/stddef_h.m4
index 6bcfadb74..98ef56e4c 100644
--- a/m4/stddef_h.m4
+++ b/m4/stddef_h.m4
@@ -1,5 +1,5 @@
 dnl A placeholder for <stddef.h>, for platforms that have issues.
-# stddef_h.m4 serial 6
+# stddef_h.m4 serial 7
 dnl Copyright (C) 2009-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -66,7 +66,7 @@ AC_DEFUN([gl_STDDEF_MODULE_INDICATOR],
 AC_DEFUN([gl_STDDEF_H_DEFAULTS],
 [
   dnl Assume proper GNU behavior unless another module says otherwise.
-  REPLACE_NULL=0;                AC_SUBST([REPLACE_NULL])
-  HAVE_MAX_ALIGN_T=1;            AC_SUBST([HAVE_MAX_ALIGN_T])
-  HAVE_WCHAR_T=1;                AC_SUBST([HAVE_WCHAR_T])
+  AC_SUBST([REPLACE_NULL], [0])
+  AC_SUBST([HAVE_MAX_ALIGN_T], [1])
+  AC_SUBST([HAVE_WCHAR_T], [1])
 ])
diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4
index 5f968bc26..dca4f0bd5 100644
--- a/m4/stdio_h.m4
+++ b/m4/stdio_h.m4
@@ -1,4 +1,4 @@
-# stdio_h.m4 serial 50
+# stdio_h.m4 serial 51
 dnl Copyright (C) 2007-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -122,106 +122,106 @@ AC_DEFUN([gl_STDIO_MODULE_INDICATOR],
 
 AC_DEFUN([gl_STDIO_H_DEFAULTS],
 [
-  GNULIB_DPRINTF=0;              AC_SUBST([GNULIB_DPRINTF])
-  GNULIB_FCLOSE=0;               AC_SUBST([GNULIB_FCLOSE])
-  GNULIB_FDOPEN=0;               AC_SUBST([GNULIB_FDOPEN])
-  GNULIB_FFLUSH=0;               AC_SUBST([GNULIB_FFLUSH])
-  GNULIB_FGETC=0;                AC_SUBST([GNULIB_FGETC])
-  GNULIB_FGETS=0;                AC_SUBST([GNULIB_FGETS])
-  GNULIB_FOPEN=0;                AC_SUBST([GNULIB_FOPEN])
-  GNULIB_FPRINTF=0;              AC_SUBST([GNULIB_FPRINTF])
-  GNULIB_FPRINTF_POSIX=0;        AC_SUBST([GNULIB_FPRINTF_POSIX])
-  GNULIB_FPURGE=0;               AC_SUBST([GNULIB_FPURGE])
-  GNULIB_FPUTC=0;                AC_SUBST([GNULIB_FPUTC])
-  GNULIB_FPUTS=0;                AC_SUBST([GNULIB_FPUTS])
-  GNULIB_FREAD=0;                AC_SUBST([GNULIB_FREAD])
-  GNULIB_FREOPEN=0;              AC_SUBST([GNULIB_FREOPEN])
-  GNULIB_FSCANF=0;               AC_SUBST([GNULIB_FSCANF])
-  GNULIB_FSEEK=0;                AC_SUBST([GNULIB_FSEEK])
-  GNULIB_FSEEKO=0;               AC_SUBST([GNULIB_FSEEKO])
-  GNULIB_FTELL=0;                AC_SUBST([GNULIB_FTELL])
-  GNULIB_FTELLO=0;               AC_SUBST([GNULIB_FTELLO])
-  GNULIB_FWRITE=0;               AC_SUBST([GNULIB_FWRITE])
-  GNULIB_GETC=0;                 AC_SUBST([GNULIB_GETC])
-  GNULIB_GETCHAR=0;              AC_SUBST([GNULIB_GETCHAR])
-  GNULIB_GETDELIM=0;             AC_SUBST([GNULIB_GETDELIM])
-  GNULIB_GETLINE=0;              AC_SUBST([GNULIB_GETLINE])
-  GNULIB_OBSTACK_PRINTF=0;       AC_SUBST([GNULIB_OBSTACK_PRINTF])
-  GNULIB_OBSTACK_PRINTF_POSIX=0; AC_SUBST([GNULIB_OBSTACK_PRINTF_POSIX])
-  GNULIB_PCLOSE=0;               AC_SUBST([GNULIB_PCLOSE])
-  GNULIB_PERROR=0;               AC_SUBST([GNULIB_PERROR])
-  GNULIB_POPEN=0;                AC_SUBST([GNULIB_POPEN])
-  GNULIB_PRINTF=0;               AC_SUBST([GNULIB_PRINTF])
-  GNULIB_PRINTF_POSIX=0;         AC_SUBST([GNULIB_PRINTF_POSIX])
-  GNULIB_PUTC=0;                 AC_SUBST([GNULIB_PUTC])
-  GNULIB_PUTCHAR=0;              AC_SUBST([GNULIB_PUTCHAR])
-  GNULIB_PUTS=0;                 AC_SUBST([GNULIB_PUTS])
-  GNULIB_REMOVE=0;               AC_SUBST([GNULIB_REMOVE])
-  GNULIB_RENAME=0;               AC_SUBST([GNULIB_RENAME])
-  GNULIB_RENAMEAT=0;             AC_SUBST([GNULIB_RENAMEAT])
-  GNULIB_SCANF=0;                AC_SUBST([GNULIB_SCANF])
-  GNULIB_SNPRINTF=0;             AC_SUBST([GNULIB_SNPRINTF])
-  GNULIB_SPRINTF_POSIX=0;        AC_SUBST([GNULIB_SPRINTF_POSIX])
-  GNULIB_STDIO_H_NONBLOCKING=0;  AC_SUBST([GNULIB_STDIO_H_NONBLOCKING])
-  GNULIB_STDIO_H_SIGPIPE=0;      AC_SUBST([GNULIB_STDIO_H_SIGPIPE])
-  GNULIB_TMPFILE=0;              AC_SUBST([GNULIB_TMPFILE])
-  GNULIB_VASPRINTF=0;            AC_SUBST([GNULIB_VASPRINTF])
-  GNULIB_VFSCANF=0;              AC_SUBST([GNULIB_VFSCANF])
-  GNULIB_VSCANF=0;               AC_SUBST([GNULIB_VSCANF])
-  GNULIB_VDPRINTF=0;             AC_SUBST([GNULIB_VDPRINTF])
-  GNULIB_VFPRINTF=0;             AC_SUBST([GNULIB_VFPRINTF])
-  GNULIB_VFPRINTF_POSIX=0;       AC_SUBST([GNULIB_VFPRINTF_POSIX])
-  GNULIB_VPRINTF=0;              AC_SUBST([GNULIB_VPRINTF])
-  GNULIB_VPRINTF_POSIX=0;        AC_SUBST([GNULIB_VPRINTF_POSIX])
-  GNULIB_VSNPRINTF=0;            AC_SUBST([GNULIB_VSNPRINTF])
-  GNULIB_VSPRINTF_POSIX=0;       AC_SUBST([GNULIB_VSPRINTF_POSIX])
+  AC_SUBST([GNULIB_DPRINTF], [0])
+  AC_SUBST([GNULIB_FCLOSE], [0])
+  AC_SUBST([GNULIB_FDOPEN], [0])
+  AC_SUBST([GNULIB_FFLUSH], [0])
+  AC_SUBST([GNULIB_FGETC], [0])
+  AC_SUBST([GNULIB_FGETS], [0])
+  AC_SUBST([GNULIB_FOPEN], [0])
+  AC_SUBST([GNULIB_FPRINTF], [0])
+  AC_SUBST([GNULIB_FPRINTF_POSIX], [0])
+  AC_SUBST([GNULIB_FPURGE], [0])
+  AC_SUBST([GNULIB_FPUTC], [0])
+  AC_SUBST([GNULIB_FPUTS], [0])
+  AC_SUBST([GNULIB_FREAD], [0])
+  AC_SUBST([GNULIB_FREOPEN], [0])
+  AC_SUBST([GNULIB_FSCANF], [0])
+  AC_SUBST([GNULIB_FSEEK], [0])
+  AC_SUBST([GNULIB_FSEEKO], [0])
+  AC_SUBST([GNULIB_FTELL], [0])
+  AC_SUBST([GNULIB_FTELLO], [0])
+  AC_SUBST([GNULIB_FWRITE], [0])
+  AC_SUBST([GNULIB_GETC], [0])
+  AC_SUBST([GNULIB_GETCHAR], [0])
+  AC_SUBST([GNULIB_GETDELIM], [0])
+  AC_SUBST([GNULIB_GETLINE], [0])
+  AC_SUBST([GNULIB_OBSTACK_PRINTF], [0])
+  AC_SUBST([GNULIB_OBSTACK_PRINTF_POSIX], [0])
+  AC_SUBST([GNULIB_PCLOSE], [0])
+  AC_SUBST([GNULIB_PERROR], [0])
+  AC_SUBST([GNULIB_POPEN], [0])
+  AC_SUBST([GNULIB_PRINTF], [0])
+  AC_SUBST([GNULIB_PRINTF_POSIX], [0])
+  AC_SUBST([GNULIB_PUTC], [0])
+  AC_SUBST([GNULIB_PUTCHAR], [0])
+  AC_SUBST([GNULIB_PUTS], [0])
+  AC_SUBST([GNULIB_REMOVE], [0])
+  AC_SUBST([GNULIB_RENAME], [0])
+  AC_SUBST([GNULIB_RENAMEAT], [0])
+  AC_SUBST([GNULIB_SCANF], [0])
+  AC_SUBST([GNULIB_SNPRINTF], [0])
+  AC_SUBST([GNULIB_SPRINTF_POSIX], [0])
+  AC_SUBST([GNULIB_STDIO_H_NONBLOCKING], [0])
+  AC_SUBST([GNULIB_STDIO_H_SIGPIPE], [0])
+  AC_SUBST([GNULIB_TMPFILE], [0])
+  AC_SUBST([GNULIB_VASPRINTF], [0])
+  AC_SUBST([GNULIB_VFSCANF], [0])
+  AC_SUBST([GNULIB_VSCANF], [0])
+  AC_SUBST([GNULIB_VDPRINTF], [0])
+  AC_SUBST([GNULIB_VFPRINTF], [0])
+  AC_SUBST([GNULIB_VFPRINTF_POSIX], [0])
+  AC_SUBST([GNULIB_VPRINTF], [0])
+  AC_SUBST([GNULIB_VPRINTF_POSIX], [0])
+  AC_SUBST([GNULIB_VSNPRINTF], [0])
+  AC_SUBST([GNULIB_VSPRINTF_POSIX], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_DECL_FPURGE=1;            AC_SUBST([HAVE_DECL_FPURGE])
-  HAVE_DECL_FSEEKO=1;            AC_SUBST([HAVE_DECL_FSEEKO])
-  HAVE_DECL_FTELLO=1;            AC_SUBST([HAVE_DECL_FTELLO])
-  HAVE_DECL_GETDELIM=1;          AC_SUBST([HAVE_DECL_GETDELIM])
-  HAVE_DECL_GETLINE=1;           AC_SUBST([HAVE_DECL_GETLINE])
-  HAVE_DECL_OBSTACK_PRINTF=1;    AC_SUBST([HAVE_DECL_OBSTACK_PRINTF])
-  HAVE_DECL_SNPRINTF=1;          AC_SUBST([HAVE_DECL_SNPRINTF])
-  HAVE_DECL_VSNPRINTF=1;         AC_SUBST([HAVE_DECL_VSNPRINTF])
-  HAVE_DPRINTF=1;                AC_SUBST([HAVE_DPRINTF])
-  HAVE_FSEEKO=1;                 AC_SUBST([HAVE_FSEEKO])
-  HAVE_FTELLO=1;                 AC_SUBST([HAVE_FTELLO])
-  HAVE_PCLOSE=1;                 AC_SUBST([HAVE_PCLOSE])
-  HAVE_POPEN=1;                  AC_SUBST([HAVE_POPEN])
-  HAVE_RENAMEAT=1;               AC_SUBST([HAVE_RENAMEAT])
-  HAVE_VASPRINTF=1;              AC_SUBST([HAVE_VASPRINTF])
-  HAVE_VDPRINTF=1;               AC_SUBST([HAVE_VDPRINTF])
-  REPLACE_DPRINTF=0;             AC_SUBST([REPLACE_DPRINTF])
-  REPLACE_FCLOSE=0;              AC_SUBST([REPLACE_FCLOSE])
-  REPLACE_FDOPEN=0;              AC_SUBST([REPLACE_FDOPEN])
-  REPLACE_FFLUSH=0;              AC_SUBST([REPLACE_FFLUSH])
-  REPLACE_FOPEN=0;               AC_SUBST([REPLACE_FOPEN])
-  REPLACE_FPRINTF=0;             AC_SUBST([REPLACE_FPRINTF])
-  REPLACE_FPURGE=0;              AC_SUBST([REPLACE_FPURGE])
-  REPLACE_FREOPEN=0;             AC_SUBST([REPLACE_FREOPEN])
-  REPLACE_FSEEK=0;               AC_SUBST([REPLACE_FSEEK])
-  REPLACE_FSEEKO=0;              AC_SUBST([REPLACE_FSEEKO])
-  REPLACE_FTELL=0;               AC_SUBST([REPLACE_FTELL])
-  REPLACE_FTELLO=0;              AC_SUBST([REPLACE_FTELLO])
-  REPLACE_GETDELIM=0;            AC_SUBST([REPLACE_GETDELIM])
-  REPLACE_GETLINE=0;             AC_SUBST([REPLACE_GETLINE])
-  REPLACE_OBSTACK_PRINTF=0;      AC_SUBST([REPLACE_OBSTACK_PRINTF])
-  REPLACE_PERROR=0;              AC_SUBST([REPLACE_PERROR])
-  REPLACE_POPEN=0;               AC_SUBST([REPLACE_POPEN])
-  REPLACE_PRINTF=0;              AC_SUBST([REPLACE_PRINTF])
-  REPLACE_REMOVE=0;              AC_SUBST([REPLACE_REMOVE])
-  REPLACE_RENAME=0;              AC_SUBST([REPLACE_RENAME])
-  REPLACE_RENAMEAT=0;            AC_SUBST([REPLACE_RENAMEAT])
-  REPLACE_SNPRINTF=0;            AC_SUBST([REPLACE_SNPRINTF])
-  REPLACE_SPRINTF=0;             AC_SUBST([REPLACE_SPRINTF])
-  REPLACE_STDIO_READ_FUNCS=0;    AC_SUBST([REPLACE_STDIO_READ_FUNCS])
-  REPLACE_STDIO_WRITE_FUNCS=0;   AC_SUBST([REPLACE_STDIO_WRITE_FUNCS])
-  REPLACE_TMPFILE=0;             AC_SUBST([REPLACE_TMPFILE])
-  REPLACE_VASPRINTF=0;           AC_SUBST([REPLACE_VASPRINTF])
-  REPLACE_VDPRINTF=0;            AC_SUBST([REPLACE_VDPRINTF])
-  REPLACE_VFPRINTF=0;            AC_SUBST([REPLACE_VFPRINTF])
-  REPLACE_VPRINTF=0;             AC_SUBST([REPLACE_VPRINTF])
-  REPLACE_VSNPRINTF=0;           AC_SUBST([REPLACE_VSNPRINTF])
-  REPLACE_VSPRINTF=0;            AC_SUBST([REPLACE_VSPRINTF])
+  AC_SUBST([HAVE_DECL_FPURGE], [1])
+  AC_SUBST([HAVE_DECL_FSEEKO], [1])
+  AC_SUBST([HAVE_DECL_FTELLO], [1])
+  AC_SUBST([HAVE_DECL_GETDELIM], [1])
+  AC_SUBST([HAVE_DECL_GETLINE], [1])
+  AC_SUBST([HAVE_DECL_OBSTACK_PRINTF], [1])
+  AC_SUBST([HAVE_DECL_SNPRINTF], [1])
+  AC_SUBST([HAVE_DECL_VSNPRINTF], [1])
+  AC_SUBST([HAVE_DPRINTF], [1])
+  AC_SUBST([HAVE_FSEEKO], [1])
+  AC_SUBST([HAVE_FTELLO], [1])
+  AC_SUBST([HAVE_PCLOSE], [1])
+  AC_SUBST([HAVE_POPEN], [1])
+  AC_SUBST([HAVE_RENAMEAT], [1])
+  AC_SUBST([HAVE_VASPRINTF], [1])
+  AC_SUBST([HAVE_VDPRINTF], [1])
+  AC_SUBST([REPLACE_DPRINTF], [0])
+  AC_SUBST([REPLACE_FCLOSE], [0])
+  AC_SUBST([REPLACE_FDOPEN], [0])
+  AC_SUBST([REPLACE_FFLUSH], [0])
+  AC_SUBST([REPLACE_FOPEN], [0])
+  AC_SUBST([REPLACE_FPRINTF], [0])
+  AC_SUBST([REPLACE_FPURGE], [0])
+  AC_SUBST([REPLACE_FREOPEN], [0])
+  AC_SUBST([REPLACE_FSEEK], [0])
+  AC_SUBST([REPLACE_FSEEKO], [0])
+  AC_SUBST([REPLACE_FTELL], [0])
+  AC_SUBST([REPLACE_FTELLO], [0])
+  AC_SUBST([REPLACE_GETDELIM], [0])
+  AC_SUBST([REPLACE_GETLINE], [0])
+  AC_SUBST([REPLACE_OBSTACK_PRINTF], [0])
+  AC_SUBST([REPLACE_PERROR], [0])
+  AC_SUBST([REPLACE_POPEN], [0])
+  AC_SUBST([REPLACE_PRINTF], [0])
+  AC_SUBST([REPLACE_REMOVE], [0])
+  AC_SUBST([REPLACE_RENAME], [0])
+  AC_SUBST([REPLACE_RENAMEAT], [0])
+  AC_SUBST([REPLACE_SNPRINTF], [0])
+  AC_SUBST([REPLACE_SPRINTF], [0])
+  AC_SUBST([REPLACE_STDIO_READ_FUNCS], [0])
+  AC_SUBST([REPLACE_STDIO_WRITE_FUNCS], [0])
+  AC_SUBST([REPLACE_TMPFILE], [0])
+  AC_SUBST([REPLACE_VASPRINTF], [0])
+  AC_SUBST([REPLACE_VDPRINTF], [0])
+  AC_SUBST([REPLACE_VFPRINTF], [0])
+  AC_SUBST([REPLACE_VPRINTF], [0])
+  AC_SUBST([REPLACE_VSNPRINTF], [0])
+  AC_SUBST([REPLACE_VSPRINTF], [0])
 ])
diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4
index 743066a63..2e43b03f8 100644
--- a/m4/stdlib_h.m4
+++ b/m4/stdlib_h.m4
@@ -1,4 +1,4 @@
-# stdlib_h.m4 serial 49
+# stdlib_h.m4 serial 50
 dnl Copyright (C) 2007-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -42,97 +42,97 @@ AC_DEFUN([gl_STDLIB_MODULE_INDICATOR],
 
 AC_DEFUN([gl_STDLIB_H_DEFAULTS],
 [
-  GNULIB__EXIT=0;         AC_SUBST([GNULIB__EXIT])
-  GNULIB_ATOLL=0;         AC_SUBST([GNULIB_ATOLL])
-  GNULIB_CALLOC_POSIX=0;  AC_SUBST([GNULIB_CALLOC_POSIX])
-  GNULIB_CANONICALIZE_FILE_NAME=0;  AC_SUBST([GNULIB_CANONICALIZE_FILE_NAME])
-  GNULIB_GETLOADAVG=0;    AC_SUBST([GNULIB_GETLOADAVG])
-  GNULIB_GETSUBOPT=0;     AC_SUBST([GNULIB_GETSUBOPT])
-  GNULIB_GRANTPT=0;       AC_SUBST([GNULIB_GRANTPT])
-  GNULIB_MALLOC_POSIX=0;  AC_SUBST([GNULIB_MALLOC_POSIX])
-  GNULIB_MBTOWC=0;        AC_SUBST([GNULIB_MBTOWC])
-  GNULIB_MKDTEMP=0;       AC_SUBST([GNULIB_MKDTEMP])
-  GNULIB_MKOSTEMP=0;      AC_SUBST([GNULIB_MKOSTEMP])
-  GNULIB_MKOSTEMPS=0;     AC_SUBST([GNULIB_MKOSTEMPS])
-  GNULIB_MKSTEMP=0;       AC_SUBST([GNULIB_MKSTEMP])
-  GNULIB_MKSTEMPS=0;      AC_SUBST([GNULIB_MKSTEMPS])
-  GNULIB_POSIX_OPENPT=0;  AC_SUBST([GNULIB_POSIX_OPENPT])
-  GNULIB_PTSNAME=0;       AC_SUBST([GNULIB_PTSNAME])
-  GNULIB_PTSNAME_R=0;     AC_SUBST([GNULIB_PTSNAME_R])
-  GNULIB_PUTENV=0;        AC_SUBST([GNULIB_PUTENV])
-  GNULIB_QSORT_R=0;       AC_SUBST([GNULIB_QSORT_R])
-  GNULIB_RANDOM=0;        AC_SUBST([GNULIB_RANDOM])
-  GNULIB_RANDOM_R=0;      AC_SUBST([GNULIB_RANDOM_R])
-  GNULIB_REALLOCARRAY=0;  AC_SUBST([GNULIB_REALLOCARRAY])
-  GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX])
-  GNULIB_REALPATH=0;      AC_SUBST([GNULIB_REALPATH])
-  GNULIB_RPMATCH=0;       AC_SUBST([GNULIB_RPMATCH])
-  GNULIB_SECURE_GETENV=0; AC_SUBST([GNULIB_SECURE_GETENV])
-  GNULIB_SETENV=0;        AC_SUBST([GNULIB_SETENV])
-  GNULIB_STRTOD=0;        AC_SUBST([GNULIB_STRTOD])
-  GNULIB_STRTOLD=0;       AC_SUBST([GNULIB_STRTOLD])
-  GNULIB_STRTOLL=0;       AC_SUBST([GNULIB_STRTOLL])
-  GNULIB_STRTOULL=0;      AC_SUBST([GNULIB_STRTOULL])
-  GNULIB_SYSTEM_POSIX=0;  AC_SUBST([GNULIB_SYSTEM_POSIX])
-  GNULIB_UNLOCKPT=0;      AC_SUBST([GNULIB_UNLOCKPT])
-  GNULIB_UNSETENV=0;      AC_SUBST([GNULIB_UNSETENV])
-  GNULIB_WCTOMB=0;        AC_SUBST([GNULIB_WCTOMB])
+  AC_SUBST([GNULIB__EXIT], [0])
+  AC_SUBST([GNULIB_ATOLL], [0])
+  AC_SUBST([GNULIB_CALLOC_POSIX], [0])
+  AC_SUBST([GNULIB_CANONICALIZE_FILE_NAME], [0])
+  AC_SUBST([GNULIB_GETLOADAVG], [0])
+  AC_SUBST([GNULIB_GETSUBOPT], [0])
+  AC_SUBST([GNULIB_GRANTPT], [0])
+  AC_SUBST([GNULIB_MALLOC_POSIX], [0])
+  AC_SUBST([GNULIB_MBTOWC], [0])
+  AC_SUBST([GNULIB_MKDTEMP], [0])
+  AC_SUBST([GNULIB_MKOSTEMP], [0])
+  AC_SUBST([GNULIB_MKOSTEMPS], [0])
+  AC_SUBST([GNULIB_MKSTEMP], [0])
+  AC_SUBST([GNULIB_MKSTEMPS], [0])
+  AC_SUBST([GNULIB_POSIX_OPENPT], [0])
+  AC_SUBST([GNULIB_PTSNAME], [0])
+  AC_SUBST([GNULIB_PTSNAME_R], [0])
+  AC_SUBST([GNULIB_PUTENV], [0])
+  AC_SUBST([GNULIB_QSORT_R], [0])
+  AC_SUBST([GNULIB_RANDOM], [0])
+  AC_SUBST([GNULIB_RANDOM_R], [0])
+  AC_SUBST([GNULIB_REALLOCARRAY], [0])
+  AC_SUBST([GNULIB_REALLOC_POSIX], [0])
+  AC_SUBST([GNULIB_REALPATH], [0])
+  AC_SUBST([GNULIB_RPMATCH], [0])
+  AC_SUBST([GNULIB_SECURE_GETENV], [0])
+  AC_SUBST([GNULIB_SETENV], [0])
+  AC_SUBST([GNULIB_STRTOD], [0])
+  AC_SUBST([GNULIB_STRTOLD], [0])
+  AC_SUBST([GNULIB_STRTOLL], [0])
+  AC_SUBST([GNULIB_STRTOULL], [0])
+  AC_SUBST([GNULIB_SYSTEM_POSIX], [0])
+  AC_SUBST([GNULIB_UNLOCKPT], [0])
+  AC_SUBST([GNULIB_UNSETENV], [0])
+  AC_SUBST([GNULIB_WCTOMB], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE__EXIT=1;              AC_SUBST([HAVE__EXIT])
-  HAVE_ATOLL=1;              AC_SUBST([HAVE_ATOLL])
-  HAVE_CANONICALIZE_FILE_NAME=1;  AC_SUBST([HAVE_CANONICALIZE_FILE_NAME])
-  HAVE_DECL_GETLOADAVG=1;    AC_SUBST([HAVE_DECL_GETLOADAVG])
-  HAVE_GETSUBOPT=1;          AC_SUBST([HAVE_GETSUBOPT])
-  HAVE_GRANTPT=1;            AC_SUBST([HAVE_GRANTPT])
-  HAVE_INITSTATE=1;          AC_SUBST([HAVE_INITSTATE])
-  HAVE_DECL_INITSTATE=1;     AC_SUBST([HAVE_DECL_INITSTATE])
-  HAVE_MBTOWC=1;             AC_SUBST([HAVE_MBTOWC])
-  HAVE_MKDTEMP=1;            AC_SUBST([HAVE_MKDTEMP])
-  HAVE_MKOSTEMP=1;           AC_SUBST([HAVE_MKOSTEMP])
-  HAVE_MKOSTEMPS=1;          AC_SUBST([HAVE_MKOSTEMPS])
-  HAVE_MKSTEMP=1;            AC_SUBST([HAVE_MKSTEMP])
-  HAVE_MKSTEMPS=1;           AC_SUBST([HAVE_MKSTEMPS])
-  HAVE_POSIX_OPENPT=1;       AC_SUBST([HAVE_POSIX_OPENPT])
-  HAVE_PTSNAME=1;            AC_SUBST([HAVE_PTSNAME])
-  HAVE_PTSNAME_R=1;          AC_SUBST([HAVE_PTSNAME_R])
-  HAVE_QSORT_R=1;            AC_SUBST([HAVE_QSORT_R])
-  HAVE_RANDOM=1;             AC_SUBST([HAVE_RANDOM])
-  HAVE_RANDOM_H=1;           AC_SUBST([HAVE_RANDOM_H])
-  HAVE_RANDOM_R=1;           AC_SUBST([HAVE_RANDOM_R])
-  HAVE_REALLOCARRAY=1;       AC_SUBST([HAVE_REALLOCARRAY])
-  HAVE_REALPATH=1;           AC_SUBST([HAVE_REALPATH])
-  HAVE_RPMATCH=1;            AC_SUBST([HAVE_RPMATCH])
-  HAVE_SECURE_GETENV=1;      AC_SUBST([HAVE_SECURE_GETENV])
-  HAVE_SETENV=1;             AC_SUBST([HAVE_SETENV])
-  HAVE_DECL_SETENV=1;        AC_SUBST([HAVE_DECL_SETENV])
-  HAVE_SETSTATE=1;           AC_SUBST([HAVE_SETSTATE])
-  HAVE_DECL_SETSTATE=1;      AC_SUBST([HAVE_DECL_SETSTATE])
-  HAVE_STRTOD=1;             AC_SUBST([HAVE_STRTOD])
-  HAVE_STRTOLD=1;            AC_SUBST([HAVE_STRTOLD])
-  HAVE_STRTOLL=1;            AC_SUBST([HAVE_STRTOLL])
-  HAVE_STRTOULL=1;           AC_SUBST([HAVE_STRTOULL])
-  HAVE_STRUCT_RANDOM_DATA=1; AC_SUBST([HAVE_STRUCT_RANDOM_DATA])
-  HAVE_SYS_LOADAVG_H=0;      AC_SUBST([HAVE_SYS_LOADAVG_H])
-  HAVE_UNLOCKPT=1;           AC_SUBST([HAVE_UNLOCKPT])
-  HAVE_DECL_UNSETENV=1;      AC_SUBST([HAVE_DECL_UNSETENV])
-  REPLACE_CALLOC=0;          AC_SUBST([REPLACE_CALLOC])
-  REPLACE_CANONICALIZE_FILE_NAME=0;  AC_SUBST([REPLACE_CANONICALIZE_FILE_NAME])
-  REPLACE_INITSTATE=0;       AC_SUBST([REPLACE_INITSTATE])
-  REPLACE_MALLOC=0;          AC_SUBST([REPLACE_MALLOC])
-  REPLACE_MBTOWC=0;          AC_SUBST([REPLACE_MBTOWC])
-  REPLACE_MKSTEMP=0;         AC_SUBST([REPLACE_MKSTEMP])
-  REPLACE_PTSNAME=0;         AC_SUBST([REPLACE_PTSNAME])
-  REPLACE_PTSNAME_R=0;       AC_SUBST([REPLACE_PTSNAME_R])
-  REPLACE_PUTENV=0;          AC_SUBST([REPLACE_PUTENV])
-  REPLACE_QSORT_R=0;         AC_SUBST([REPLACE_QSORT_R])
-  REPLACE_RANDOM=0;          AC_SUBST([REPLACE_RANDOM])
-  REPLACE_RANDOM_R=0;        AC_SUBST([REPLACE_RANDOM_R])
-  REPLACE_REALLOC=0;         AC_SUBST([REPLACE_REALLOC])
-  REPLACE_REALPATH=0;        AC_SUBST([REPLACE_REALPATH])
-  REPLACE_SETENV=0;          AC_SUBST([REPLACE_SETENV])
-  REPLACE_SETSTATE=0;        AC_SUBST([REPLACE_SETSTATE])
-  REPLACE_STRTOD=0;          AC_SUBST([REPLACE_STRTOD])
-  REPLACE_STRTOLD=0;         AC_SUBST([REPLACE_STRTOLD])
-  REPLACE_UNSETENV=0;        AC_SUBST([REPLACE_UNSETENV])
-  REPLACE_WCTOMB=0;          AC_SUBST([REPLACE_WCTOMB])
+  AC_SUBST([HAVE__EXIT], [1])
+  AC_SUBST([HAVE_ATOLL], [1])
+  AC_SUBST([HAVE_CANONICALIZE_FILE_NAME], [1])
+  AC_SUBST([HAVE_DECL_GETLOADAVG], [1])
+  AC_SUBST([HAVE_GETSUBOPT], [1])
+  AC_SUBST([HAVE_GRANTPT], [1])
+  AC_SUBST([HAVE_INITSTATE], [1])
+  AC_SUBST([HAVE_DECL_INITSTATE], [1])
+  AC_SUBST([HAVE_MBTOWC], [1])
+  AC_SUBST([HAVE_MKDTEMP], [1])
+  AC_SUBST([HAVE_MKOSTEMP], [1])
+  AC_SUBST([HAVE_MKOSTEMPS], [1])
+  AC_SUBST([HAVE_MKSTEMP], [1])
+  AC_SUBST([HAVE_MKSTEMPS], [1])
+  AC_SUBST([HAVE_POSIX_OPENPT], [1])
+  AC_SUBST([HAVE_PTSNAME], [1])
+  AC_SUBST([HAVE_PTSNAME_R], [1])
+  AC_SUBST([HAVE_QSORT_R], [1])
+  AC_SUBST([HAVE_RANDOM], [1])
+  AC_SUBST([HAVE_RANDOM_H], [1])
+  AC_SUBST([HAVE_RANDOM_R], [1])
+  AC_SUBST([HAVE_REALLOCARRAY], [1])
+  AC_SUBST([HAVE_REALPATH], [1])
+  AC_SUBST([HAVE_RPMATCH], [1])
+  AC_SUBST([HAVE_SECURE_GETENV], [1])
+  AC_SUBST([HAVE_SETENV], [1])
+  AC_SUBST([HAVE_DECL_SETENV], [1])
+  AC_SUBST([HAVE_SETSTATE], [1])
+  AC_SUBST([HAVE_DECL_SETSTATE], [1])
+  AC_SUBST([HAVE_STRTOD], [1])
+  AC_SUBST([HAVE_STRTOLD], [1])
+  AC_SUBST([HAVE_STRTOLL], [1])
+  AC_SUBST([HAVE_STRTOULL], [1])
+  AC_SUBST([HAVE_STRUCT_RANDOM_DATA], [1])
+  AC_SUBST([HAVE_SYS_LOADAVG_H], [0])
+  AC_SUBST([HAVE_UNLOCKPT], [1])
+  AC_SUBST([HAVE_DECL_UNSETENV], [1])
+  AC_SUBST([REPLACE_CALLOC], [0])
+  AC_SUBST([REPLACE_CANONICALIZE_FILE_NAME], [0])
+  AC_SUBST([REPLACE_INITSTATE], [0])
+  AC_SUBST([REPLACE_MALLOC], [0])
+  AC_SUBST([REPLACE_MBTOWC], [0])
+  AC_SUBST([REPLACE_MKSTEMP], [0])
+  AC_SUBST([REPLACE_PTSNAME], [0])
+  AC_SUBST([REPLACE_PTSNAME_R], [0])
+  AC_SUBST([REPLACE_PUTENV], [0])
+  AC_SUBST([REPLACE_QSORT_R], [0])
+  AC_SUBST([REPLACE_RANDOM], [0])
+  AC_SUBST([REPLACE_RANDOM_R], [0])
+  AC_SUBST([REPLACE_REALLOC], [0])
+  AC_SUBST([REPLACE_REALPATH], [0])
+  AC_SUBST([REPLACE_SETENV], [0])
+  AC_SUBST([REPLACE_SETSTATE], [0])
+  AC_SUBST([REPLACE_STRTOD], [0])
+  AC_SUBST([REPLACE_STRTOLD], [0])
+  AC_SUBST([REPLACE_UNSETENV], [0])
+  AC_SUBST([REPLACE_WCTOMB], [0])
 ])
diff --git a/m4/string_h.m4 b/m4/string_h.m4
index cc51337f0..6a4381ebf 100644
--- a/m4/string_h.m4
+++ b/m4/string_h.m4
@@ -5,7 +5,7 @@
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 23
+# serial 24
 
 # Written by Paul Eggert.
 
@@ -44,80 +44,80 @@ AC_DEFUN([gl_STRING_MODULE_INDICATOR],
 
 AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS],
 [
-  GNULIB_EXPLICIT_BZERO=0; AC_SUBST([GNULIB_EXPLICIT_BZERO])
-  GNULIB_FFSL=0;        AC_SUBST([GNULIB_FFSL])
-  GNULIB_FFSLL=0;       AC_SUBST([GNULIB_FFSLL])
-  GNULIB_MEMCHR=0;      AC_SUBST([GNULIB_MEMCHR])
-  GNULIB_MEMMEM=0;      AC_SUBST([GNULIB_MEMMEM])
-  GNULIB_MEMPCPY=0;     AC_SUBST([GNULIB_MEMPCPY])
-  GNULIB_MEMRCHR=0;     AC_SUBST([GNULIB_MEMRCHR])
-  GNULIB_RAWMEMCHR=0;   AC_SUBST([GNULIB_RAWMEMCHR])
-  GNULIB_STPCPY=0;      AC_SUBST([GNULIB_STPCPY])
-  GNULIB_STPNCPY=0;     AC_SUBST([GNULIB_STPNCPY])
-  GNULIB_STRCHRNUL=0;   AC_SUBST([GNULIB_STRCHRNUL])
-  GNULIB_STRDUP=0;      AC_SUBST([GNULIB_STRDUP])
-  GNULIB_STRNCAT=0;     AC_SUBST([GNULIB_STRNCAT])
-  GNULIB_STRNDUP=0;     AC_SUBST([GNULIB_STRNDUP])
-  GNULIB_STRNLEN=0;     AC_SUBST([GNULIB_STRNLEN])
-  GNULIB_STRPBRK=0;     AC_SUBST([GNULIB_STRPBRK])
-  GNULIB_STRSEP=0;      AC_SUBST([GNULIB_STRSEP])
-  GNULIB_STRSTR=0;      AC_SUBST([GNULIB_STRSTR])
-  GNULIB_STRCASESTR=0;  AC_SUBST([GNULIB_STRCASESTR])
-  GNULIB_STRTOK_R=0;    AC_SUBST([GNULIB_STRTOK_R])
-  GNULIB_MBSLEN=0;      AC_SUBST([GNULIB_MBSLEN])
-  GNULIB_MBSNLEN=0;     AC_SUBST([GNULIB_MBSNLEN])
-  GNULIB_MBSCHR=0;      AC_SUBST([GNULIB_MBSCHR])
-  GNULIB_MBSRCHR=0;     AC_SUBST([GNULIB_MBSRCHR])
-  GNULIB_MBSSTR=0;      AC_SUBST([GNULIB_MBSSTR])
-  GNULIB_MBSCASECMP=0;  AC_SUBST([GNULIB_MBSCASECMP])
-  GNULIB_MBSNCASECMP=0; AC_SUBST([GNULIB_MBSNCASECMP])
-  GNULIB_MBSPCASECMP=0; AC_SUBST([GNULIB_MBSPCASECMP])
-  GNULIB_MBSCASESTR=0;  AC_SUBST([GNULIB_MBSCASESTR])
-  GNULIB_MBSCSPN=0;     AC_SUBST([GNULIB_MBSCSPN])
-  GNULIB_MBSPBRK=0;     AC_SUBST([GNULIB_MBSPBRK])
-  GNULIB_MBSSPN=0;      AC_SUBST([GNULIB_MBSSPN])
-  GNULIB_MBSSEP=0;      AC_SUBST([GNULIB_MBSSEP])
-  GNULIB_MBSTOK_R=0;    AC_SUBST([GNULIB_MBSTOK_R])
-  GNULIB_STRERROR=0;    AC_SUBST([GNULIB_STRERROR])
-  GNULIB_STRERROR_R=0;  AC_SUBST([GNULIB_STRERROR_R])
-  GNULIB_STRSIGNAL=0;   AC_SUBST([GNULIB_STRSIGNAL])
-  GNULIB_STRVERSCMP=0;  AC_SUBST([GNULIB_STRVERSCMP])
-  HAVE_MBSLEN=0;        AC_SUBST([HAVE_MBSLEN])
+  AC_SUBST([GNULIB_EXPLICIT_BZERO], [0])
+  AC_SUBST([GNULIB_FFSL], [0])
+  AC_SUBST([GNULIB_FFSLL], [0])
+  AC_SUBST([GNULIB_MEMCHR], [0])
+  AC_SUBST([GNULIB_MEMMEM], [0])
+  AC_SUBST([GNULIB_MEMPCPY], [0])
+  AC_SUBST([GNULIB_MEMRCHR], [0])
+  AC_SUBST([GNULIB_RAWMEMCHR], [0])
+  AC_SUBST([GNULIB_STPCPY], [0])
+  AC_SUBST([GNULIB_STPNCPY], [0])
+  AC_SUBST([GNULIB_STRCHRNUL], [0])
+  AC_SUBST([GNULIB_STRDUP], [0])
+  AC_SUBST([GNULIB_STRNCAT], [0])
+  AC_SUBST([GNULIB_STRNDUP], [0])
+  AC_SUBST([GNULIB_STRNLEN], [0])
+  AC_SUBST([GNULIB_STRPBRK], [0])
+  AC_SUBST([GNULIB_STRSEP], [0])
+  AC_SUBST([GNULIB_STRSTR], [0])
+  AC_SUBST([GNULIB_STRCASESTR], [0])
+  AC_SUBST([GNULIB_STRTOK_R], [0])
+  AC_SUBST([GNULIB_MBSLEN], [0])
+  AC_SUBST([GNULIB_MBSNLEN], [0])
+  AC_SUBST([GNULIB_MBSCHR], [0])
+  AC_SUBST([GNULIB_MBSRCHR], [0])
+  AC_SUBST([GNULIB_MBSSTR], [0])
+  AC_SUBST([GNULIB_MBSCASECMP], [0])
+  AC_SUBST([GNULIB_MBSNCASECMP], [0])
+  AC_SUBST([GNULIB_MBSPCASECMP], [0])
+  AC_SUBST([GNULIB_MBSCASESTR], [0])
+  AC_SUBST([GNULIB_MBSCSPN], [0])
+  AC_SUBST([GNULIB_MBSPBRK], [0])
+  AC_SUBST([GNULIB_MBSSPN], [0])
+  AC_SUBST([GNULIB_MBSSEP], [0])
+  AC_SUBST([GNULIB_MBSTOK_R], [0])
+  AC_SUBST([GNULIB_STRERROR], [0])
+  AC_SUBST([GNULIB_STRERROR_R], [0])
+  AC_SUBST([GNULIB_STRSIGNAL], [0])
+  AC_SUBST([GNULIB_STRVERSCMP], [0])
+  AC_SUBST([HAVE_MBSLEN], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_EXPLICIT_BZERO=1;        AC_SUBST([HAVE_EXPLICIT_BZERO])
-  HAVE_FFSL=1;                  AC_SUBST([HAVE_FFSL])
-  HAVE_FFSLL=1;                 AC_SUBST([HAVE_FFSLL])
-  HAVE_MEMCHR=1;                AC_SUBST([HAVE_MEMCHR])
-  HAVE_DECL_MEMMEM=1;           AC_SUBST([HAVE_DECL_MEMMEM])
-  HAVE_MEMPCPY=1;               AC_SUBST([HAVE_MEMPCPY])
-  HAVE_DECL_MEMRCHR=1;          AC_SUBST([HAVE_DECL_MEMRCHR])
-  HAVE_RAWMEMCHR=1;             AC_SUBST([HAVE_RAWMEMCHR])
-  HAVE_STPCPY=1;                AC_SUBST([HAVE_STPCPY])
-  HAVE_STPNCPY=1;               AC_SUBST([HAVE_STPNCPY])
-  HAVE_STRCHRNUL=1;             AC_SUBST([HAVE_STRCHRNUL])
-  HAVE_DECL_STRDUP=1;           AC_SUBST([HAVE_DECL_STRDUP])
-  HAVE_DECL_STRNDUP=1;          AC_SUBST([HAVE_DECL_STRNDUP])
-  HAVE_DECL_STRNLEN=1;          AC_SUBST([HAVE_DECL_STRNLEN])
-  HAVE_STRPBRK=1;               AC_SUBST([HAVE_STRPBRK])
-  HAVE_STRSEP=1;                AC_SUBST([HAVE_STRSEP])
-  HAVE_STRCASESTR=1;            AC_SUBST([HAVE_STRCASESTR])
-  HAVE_DECL_STRTOK_R=1;         AC_SUBST([HAVE_DECL_STRTOK_R])
-  HAVE_DECL_STRERROR_R=1;       AC_SUBST([HAVE_DECL_STRERROR_R])
-  HAVE_DECL_STRSIGNAL=1;        AC_SUBST([HAVE_DECL_STRSIGNAL])
-  HAVE_STRVERSCMP=1;            AC_SUBST([HAVE_STRVERSCMP])
-  REPLACE_MEMCHR=0;             AC_SUBST([REPLACE_MEMCHR])
-  REPLACE_MEMMEM=0;             AC_SUBST([REPLACE_MEMMEM])
-  REPLACE_STPNCPY=0;            AC_SUBST([REPLACE_STPNCPY])
-  REPLACE_STRCHRNUL=0;          AC_SUBST([REPLACE_STRCHRNUL])
-  REPLACE_STRDUP=0;             AC_SUBST([REPLACE_STRDUP])
-  REPLACE_STRNCAT=0;            AC_SUBST([REPLACE_STRNCAT])
-  REPLACE_STRNDUP=0;            AC_SUBST([REPLACE_STRNDUP])
-  REPLACE_STRNLEN=0;            AC_SUBST([REPLACE_STRNLEN])
-  REPLACE_STRSTR=0;             AC_SUBST([REPLACE_STRSTR])
-  REPLACE_STRCASESTR=0;         AC_SUBST([REPLACE_STRCASESTR])
-  REPLACE_STRTOK_R=0;           AC_SUBST([REPLACE_STRTOK_R])
-  REPLACE_STRERROR=0;           AC_SUBST([REPLACE_STRERROR])
-  REPLACE_STRERROR_R=0;         AC_SUBST([REPLACE_STRERROR_R])
-  REPLACE_STRSIGNAL=0;          AC_SUBST([REPLACE_STRSIGNAL])
-  UNDEFINE_STRTOK_R=0;          AC_SUBST([UNDEFINE_STRTOK_R])
+  AC_SUBST([HAVE_EXPLICIT_BZERO], [1])
+  AC_SUBST([HAVE_FFSL], [1])
+  AC_SUBST([HAVE_FFSLL], [1])
+  AC_SUBST([HAVE_MEMCHR], [1])
+  AC_SUBST([HAVE_DECL_MEMMEM], [1])
+  AC_SUBST([HAVE_MEMPCPY], [1])
+  AC_SUBST([HAVE_DECL_MEMRCHR], [1])
+  AC_SUBST([HAVE_RAWMEMCHR], [1])
+  AC_SUBST([HAVE_STPCPY], [1])
+  AC_SUBST([HAVE_STPNCPY], [1])
+  AC_SUBST([HAVE_STRCHRNUL], [1])
+  AC_SUBST([HAVE_DECL_STRDUP], [1])
+  AC_SUBST([HAVE_DECL_STRNDUP], [1])
+  AC_SUBST([HAVE_DECL_STRNLEN], [1])
+  AC_SUBST([HAVE_STRPBRK], [1])
+  AC_SUBST([HAVE_STRSEP], [1])
+  AC_SUBST([HAVE_STRCASESTR], [1])
+  AC_SUBST([HAVE_DECL_STRTOK_R], [1])
+  AC_SUBST([HAVE_DECL_STRERROR_R], [1])
+  AC_SUBST([HAVE_DECL_STRSIGNAL], [1])
+  AC_SUBST([HAVE_STRVERSCMP], [1])
+  AC_SUBST([REPLACE_MEMCHR], [0])
+  AC_SUBST([REPLACE_MEMMEM], [0])
+  AC_SUBST([REPLACE_STPNCPY], [0])
+  AC_SUBST([REPLACE_STRCHRNUL], [0])
+  AC_SUBST([REPLACE_STRDUP], [0])
+  AC_SUBST([REPLACE_STRNCAT], [0])
+  AC_SUBST([REPLACE_STRNDUP], [0])
+  AC_SUBST([REPLACE_STRNLEN], [0])
+  AC_SUBST([REPLACE_STRSTR], [0])
+  AC_SUBST([REPLACE_STRCASESTR], [0])
+  AC_SUBST([REPLACE_STRTOK_R], [0])
+  AC_SUBST([REPLACE_STRERROR], [0])
+  AC_SUBST([REPLACE_STRERROR_R], [0])
+  AC_SUBST([REPLACE_STRSIGNAL], [0])
+  AC_SUBST([UNDEFINE_STRTOK_R], [0])
 ])
diff --git a/m4/sys_file_h.m4 b/m4/sys_file_h.m4
index 045e01b9d..0122f5828 100644
--- a/m4/sys_file_h.m4
+++ b/m4/sys_file_h.m4
@@ -36,6 +36,6 @@ AC_DEFUN([gl_HEADER_SYS_FILE_MODULE_INDICATOR],
 
 AC_DEFUN([gl_HEADER_SYS_FILE_H_DEFAULTS],
 [
-  GNULIB_FLOCK=0;        AC_SUBST([GNULIB_FLOCK])
-  HAVE_FLOCK=1;          AC_SUBST([HAVE_FLOCK])
+  AC_SUBST([GNULIB_FLOCK], [0])
+  AC_SUBST([HAVE_FLOCK], [1])
 ])
diff --git a/m4/sys_ioctl_h.m4 b/m4/sys_ioctl_h.m4
index 303820ef3..e16c769f3 100644
--- a/m4/sys_ioctl_h.m4
+++ b/m4/sys_ioctl_h.m4
@@ -1,4 +1,4 @@
-# sys_ioctl_h.m4 serial 10
+# sys_ioctl_h.m4 serial 11
 dnl Copyright (C) 2008-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -55,10 +55,9 @@ AC_DEFUN([gl_SYS_IOCTL_MODULE_INDICATOR],
 
 AC_DEFUN([gl_SYS_IOCTL_H_DEFAULTS],
 [
-  GNULIB_IOCTL=0;         AC_SUBST([GNULIB_IOCTL])
+  AC_SUBST([GNULIB_IOCTL], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  SYS_IOCTL_H_HAVE_WINSOCK2_H=0; AC_SUBST([SYS_IOCTL_H_HAVE_WINSOCK2_H])
-  SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=0;
-                        AC_SUBST([SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS])
-  REPLACE_IOCTL=0;      AC_SUBST([REPLACE_IOCTL])
+  AC_SUBST([SYS_IOCTL_H_HAVE_WINSOCK2_H], [0])
+  AC_SUBST([SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS], [0])
+  AC_SUBST([REPLACE_IOCTL], [0])
 ])
diff --git a/m4/sys_resource_h.m4 b/m4/sys_resource_h.m4
index c173315a4..0373d24e0 100644
--- a/m4/sys_resource_h.m4
+++ b/m4/sys_resource_h.m4
@@ -1,4 +1,4 @@
-# sys_resource_h.m4 serial 2
+# sys_resource_h.m4 serial 3
 dnl Copyright (C) 2012-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -41,7 +41,7 @@ AC_DEFUN([gl_SYS_RESOURCE_MODULE_INDICATOR],
 
 AC_DEFUN([gl_SYS_RESOURCE_H_DEFAULTS],
 [
-  GNULIB_GETRUSAGE=0;     AC_SUBST([GNULIB_GETRUSAGE])
+  AC_SUBST([GNULIB_GETRUSAGE], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_GETRUSAGE=1;       AC_SUBST([HAVE_GETRUSAGE])
+  AC_SUBST([HAVE_GETRUSAGE], [1])
 ])
diff --git a/m4/sys_select_h.m4 b/m4/sys_select_h.m4
index fa19bb65f..bac746ff7 100644
--- a/m4/sys_select_h.m4
+++ b/m4/sys_select_h.m4
@@ -86,10 +86,10 @@ AC_DEFUN([gl_SYS_SELECT_MODULE_INDICATOR],
 
 AC_DEFUN([gl_SYS_SELECT_H_DEFAULTS],
 [
-  GNULIB_PSELECT=0; AC_SUBST([GNULIB_PSELECT])
-  GNULIB_SELECT=0; AC_SUBST([GNULIB_SELECT])
+  AC_SUBST([GNULIB_PSELECT], [0])
+  AC_SUBST([GNULIB_SELECT], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_PSELECT=1; AC_SUBST([HAVE_PSELECT])
-  REPLACE_PSELECT=0; AC_SUBST([REPLACE_PSELECT])
-  REPLACE_SELECT=0; AC_SUBST([REPLACE_SELECT])
+  AC_SUBST([HAVE_PSELECT], [1])
+  AC_SUBST([REPLACE_PSELECT], [0])
+  AC_SUBST([REPLACE_SELECT], [0])
 ])
diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4
index bf902f081..19bea61b9 100644
--- a/m4/sys_socket_h.m4
+++ b/m4/sys_socket_h.m4
@@ -167,24 +167,23 @@ AC_DEFUN([gl_SYS_SOCKET_MODULE_INDICATOR],
 
 AC_DEFUN([gl_SYS_SOCKET_H_DEFAULTS],
 [
-  GNULIB_SOCKET=0;      AC_SUBST([GNULIB_SOCKET])
-  GNULIB_CONNECT=0;     AC_SUBST([GNULIB_CONNECT])
-  GNULIB_ACCEPT=0;      AC_SUBST([GNULIB_ACCEPT])
-  GNULIB_BIND=0;        AC_SUBST([GNULIB_BIND])
-  GNULIB_GETPEERNAME=0; AC_SUBST([GNULIB_GETPEERNAME])
-  GNULIB_GETSOCKNAME=0; AC_SUBST([GNULIB_GETSOCKNAME])
-  GNULIB_GETSOCKOPT=0;  AC_SUBST([GNULIB_GETSOCKOPT])
-  GNULIB_LISTEN=0;      AC_SUBST([GNULIB_LISTEN])
-  GNULIB_RECV=0;        AC_SUBST([GNULIB_RECV])
-  GNULIB_SEND=0;        AC_SUBST([GNULIB_SEND])
-  GNULIB_RECVFROM=0;    AC_SUBST([GNULIB_RECVFROM])
-  GNULIB_SENDTO=0;      AC_SUBST([GNULIB_SENDTO])
-  GNULIB_SETSOCKOPT=0;  AC_SUBST([GNULIB_SETSOCKOPT])
-  GNULIB_SHUTDOWN=0;    AC_SUBST([GNULIB_SHUTDOWN])
-  GNULIB_ACCEPT4=0;     AC_SUBST([GNULIB_ACCEPT4])
-  HAVE_STRUCT_SOCKADDR_STORAGE=1; AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE])
-  HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=1;
-                        AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY])
-  HAVE_SA_FAMILY_T=1;   AC_SUBST([HAVE_SA_FAMILY_T])
-  HAVE_ACCEPT4=1;       AC_SUBST([HAVE_ACCEPT4])
+  AC_SUBST([GNULIB_SOCKET], [0])
+  AC_SUBST([GNULIB_CONNECT], [0])
+  AC_SUBST([GNULIB_ACCEPT], [0])
+  AC_SUBST([GNULIB_BIND], [0])
+  AC_SUBST([GNULIB_GETPEERNAME], [0])
+  AC_SUBST([GNULIB_GETSOCKNAME], [0])
+  AC_SUBST([GNULIB_GETSOCKOPT], [0])
+  AC_SUBST([GNULIB_LISTEN], [0])
+  AC_SUBST([GNULIB_RECV], [0])
+  AC_SUBST([GNULIB_SEND], [0])
+  AC_SUBST([GNULIB_RECVFROM], [0])
+  AC_SUBST([GNULIB_SENDTO], [0])
+  AC_SUBST([GNULIB_SETSOCKOPT], [0])
+  AC_SUBST([GNULIB_SHUTDOWN], [0])
+  AC_SUBST([GNULIB_ACCEPT4], [0])
+  AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE], [1])
+  AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY], [1])
+  AC_SUBST([HAVE_SA_FAMILY_T], [1])
+  AC_SUBST([HAVE_ACCEPT4], [1])
 ])
diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4
index 3efba5a7b..abc469c6c 100644
--- a/m4/sys_stat_h.m4
+++ b/m4/sys_stat_h.m4
@@ -1,4 +1,4 @@
-# sys_stat_h.m4 serial 33   -*- Autoconf -*-
+# sys_stat_h.m4 serial 34   -*- Autoconf -*-
 dnl Copyright (C) 2006-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -64,40 +64,40 @@ AC_DEFUN([gl_SYS_STAT_MODULE_INDICATOR],
 AC_DEFUN([gl_SYS_STAT_H_DEFAULTS],
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR
-  GNULIB_FCHMODAT=0;    AC_SUBST([GNULIB_FCHMODAT])
-  GNULIB_FSTAT=0;       AC_SUBST([GNULIB_FSTAT])
-  GNULIB_FSTATAT=0;     AC_SUBST([GNULIB_FSTATAT])
-  GNULIB_FUTIMENS=0;    AC_SUBST([GNULIB_FUTIMENS])
-  GNULIB_LCHMOD=0;      AC_SUBST([GNULIB_LCHMOD])
-  GNULIB_LSTAT=0;       AC_SUBST([GNULIB_LSTAT])
-  GNULIB_MKDIRAT=0;     AC_SUBST([GNULIB_MKDIRAT])
-  GNULIB_MKFIFO=0;      AC_SUBST([GNULIB_MKFIFO])
-  GNULIB_MKFIFOAT=0;    AC_SUBST([GNULIB_MKFIFOAT])
-  GNULIB_MKNOD=0;       AC_SUBST([GNULIB_MKNOD])
-  GNULIB_MKNODAT=0;     AC_SUBST([GNULIB_MKNODAT])
-  GNULIB_STAT=0;        AC_SUBST([GNULIB_STAT])
-  GNULIB_UTIMENSAT=0;   AC_SUBST([GNULIB_UTIMENSAT])
-  GNULIB_OVERRIDES_STRUCT_STAT=0; AC_SUBST([GNULIB_OVERRIDES_STRUCT_STAT])
+  AC_SUBST([GNULIB_FCHMODAT], [0])
+  AC_SUBST([GNULIB_FSTAT], [0])
+  AC_SUBST([GNULIB_FSTATAT], [0])
+  AC_SUBST([GNULIB_FUTIMENS], [0])
+  AC_SUBST([GNULIB_LCHMOD], [0])
+  AC_SUBST([GNULIB_LSTAT], [0])
+  AC_SUBST([GNULIB_MKDIRAT], [0])
+  AC_SUBST([GNULIB_MKFIFO], [0])
+  AC_SUBST([GNULIB_MKFIFOAT], [0])
+  AC_SUBST([GNULIB_MKNOD], [0])
+  AC_SUBST([GNULIB_MKNODAT], [0])
+  AC_SUBST([GNULIB_STAT], [0])
+  AC_SUBST([GNULIB_UTIMENSAT], [0])
+  AC_SUBST([GNULIB_OVERRIDES_STRUCT_STAT], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_FCHMODAT=1;      AC_SUBST([HAVE_FCHMODAT])
-  HAVE_FSTATAT=1;       AC_SUBST([HAVE_FSTATAT])
-  HAVE_FUTIMENS=1;      AC_SUBST([HAVE_FUTIMENS])
-  HAVE_LCHMOD=1;        AC_SUBST([HAVE_LCHMOD])
-  HAVE_LSTAT=1;         AC_SUBST([HAVE_LSTAT])
-  HAVE_MKDIRAT=1;       AC_SUBST([HAVE_MKDIRAT])
-  HAVE_MKFIFO=1;        AC_SUBST([HAVE_MKFIFO])
-  HAVE_MKFIFOAT=1;      AC_SUBST([HAVE_MKFIFOAT])
-  HAVE_MKNOD=1;         AC_SUBST([HAVE_MKNOD])
-  HAVE_MKNODAT=1;       AC_SUBST([HAVE_MKNODAT])
-  HAVE_UTIMENSAT=1;     AC_SUBST([HAVE_UTIMENSAT])
-  REPLACE_FCHMODAT=0;   AC_SUBST([REPLACE_FCHMODAT])
-  REPLACE_FSTAT=0;      AC_SUBST([REPLACE_FSTAT])
-  REPLACE_FSTATAT=0;    AC_SUBST([REPLACE_FSTATAT])
-  REPLACE_FUTIMENS=0;   AC_SUBST([REPLACE_FUTIMENS])
-  REPLACE_LSTAT=0;      AC_SUBST([REPLACE_LSTAT])
-  REPLACE_MKDIR=0;      AC_SUBST([REPLACE_MKDIR])
-  REPLACE_MKFIFO=0;     AC_SUBST([REPLACE_MKFIFO])
-  REPLACE_MKNOD=0;      AC_SUBST([REPLACE_MKNOD])
-  REPLACE_STAT=0;       AC_SUBST([REPLACE_STAT])
-  REPLACE_UTIMENSAT=0;  AC_SUBST([REPLACE_UTIMENSAT])
+  AC_SUBST([HAVE_FCHMODAT], [1])
+  AC_SUBST([HAVE_FSTATAT], [1])
+  AC_SUBST([HAVE_FUTIMENS], [1])
+  AC_SUBST([HAVE_LCHMOD], [1])
+  AC_SUBST([HAVE_LSTAT], [1])
+  AC_SUBST([HAVE_MKDIRAT], [1])
+  AC_SUBST([HAVE_MKFIFO], [1])
+  AC_SUBST([HAVE_MKFIFOAT], [1])
+  AC_SUBST([HAVE_MKNOD], [1])
+  AC_SUBST([HAVE_MKNODAT], [1])
+  AC_SUBST([HAVE_UTIMENSAT], [1])
+  AC_SUBST([REPLACE_FCHMODAT], [0])
+  AC_SUBST([REPLACE_FSTAT], [0])
+  AC_SUBST([REPLACE_FSTATAT], [0])
+  AC_SUBST([REPLACE_FUTIMENS], [0])
+  AC_SUBST([REPLACE_LSTAT], [0])
+  AC_SUBST([REPLACE_MKDIR], [0])
+  AC_SUBST([REPLACE_MKFIFO], [0])
+  AC_SUBST([REPLACE_MKNOD], [0])
+  AC_SUBST([REPLACE_STAT], [0])
+  AC_SUBST([REPLACE_UTIMENSAT], [0])
 ])
diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4
index 8fc859924..56ee6681c 100644
--- a/m4/sys_time_h.m4
+++ b/m4/sys_time_h.m4
@@ -1,5 +1,5 @@
 # Configure a replacement for <sys/time.h>.
-# serial 9
+# serial 10
 
 # Copyright (C) 2007, 2009-2020 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -100,11 +100,11 @@ AC_DEFUN([gl_SYS_TIME_MODULE_INDICATOR],
 
 AC_DEFUN([gl_HEADER_SYS_TIME_H_DEFAULTS],
 [
-  GNULIB_GETTIMEOFDAY=0;     AC_SUBST([GNULIB_GETTIMEOFDAY])
+  AC_SUBST([GNULIB_GETTIMEOFDAY], [0])
   dnl Assume POSIX behavior unless another module says otherwise.
-  HAVE_GETTIMEOFDAY=1;       AC_SUBST([HAVE_GETTIMEOFDAY])
-  HAVE_STRUCT_TIMEVAL=1;     AC_SUBST([HAVE_STRUCT_TIMEVAL])
-  HAVE_SYS_TIME_H=1;         AC_SUBST([HAVE_SYS_TIME_H])
-  REPLACE_GETTIMEOFDAY=0;    AC_SUBST([REPLACE_GETTIMEOFDAY])
-  REPLACE_STRUCT_TIMEVAL=0;  AC_SUBST([REPLACE_STRUCT_TIMEVAL])
+  AC_SUBST([HAVE_GETTIMEOFDAY], [1])
+  AC_SUBST([HAVE_STRUCT_TIMEVAL], [1])
+  AC_SUBST([HAVE_SYS_TIME_H], [1])
+  AC_SUBST([REPLACE_GETTIMEOFDAY], [0])
+  AC_SUBST([REPLACE_STRUCT_TIMEVAL], [0])
 ])
diff --git a/m4/sys_utsname_h.m4 b/m4/sys_utsname_h.m4
index 943048ed7..2be390b53 100644
--- a/m4/sys_utsname_h.m4
+++ b/m4/sys_utsname_h.m4
@@ -47,8 +47,8 @@ AC_DEFUN([gl_SYS_UTSNAME_MODULE_INDICATOR],
 
 AC_DEFUN([gl_SYS_UTSNAME_H_DEFAULTS],
 [
-  GNULIB_UNAME=0;         AC_SUBST([GNULIB_UNAME])
+  AC_SUBST([GNULIB_UNAME], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_UNAME=1;           AC_SUBST([HAVE_UNAME])
-  HAVE_STRUCT_UTSNAME=1;  AC_SUBST([HAVE_STRUCT_UTSNAME])
+  AC_SUBST([HAVE_UNAME], [1])
+  AC_SUBST([HAVE_STRUCT_UTSNAME], [1])
 ])
diff --git a/m4/termios_h.m4 b/m4/termios_h.m4
index 758629ff6..d568ea273 100644
--- a/m4/termios_h.m4
+++ b/m4/termios_h.m4
@@ -36,8 +36,8 @@ AC_DEFUN([gl_TERMIOS_MODULE_INDICATOR],
 
 AC_DEFUN([gl_TERMIOS_H_DEFAULTS],
 [
-  GNULIB_TCGETSID=0;      AC_SUBST([GNULIB_TCGETSID])
+  AC_SUBST([GNULIB_TCGETSID], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_DECL_TCGETSID=1;   AC_SUBST([HAVE_DECL_TCGETSID])
-  HAVE_TERMIOS_H=1;       AC_SUBST([HAVE_TERMIOS_H])
+  AC_SUBST([HAVE_DECL_TCGETSID], [1])
+  AC_SUBST([HAVE_TERMIOS_H], [1])
 ])
diff --git a/m4/threads.m4 b/m4/threads.m4
index 862a0c596..bcb4c6b46 100644
--- a/m4/threads.m4
+++ b/m4/threads.m4
@@ -148,16 +148,16 @@ AC_DEFUN([gl_THREADS_MODULE_INDICATOR],
 
 AC_DEFUN([gl_THREADS_H_DEFAULTS],
 [
-  GNULIB_CND=0;           AC_SUBST([GNULIB_CND])
-  GNULIB_MTX=0;           AC_SUBST([GNULIB_MTX])
-  GNULIB_THRD=0;          AC_SUBST([GNULIB_THRD])
-  GNULIB_TSS=0;           AC_SUBST([GNULIB_TSS])
+  AC_SUBST([GNULIB_CND], [0])
+  AC_SUBST([GNULIB_MTX], [0])
+  AC_SUBST([GNULIB_THRD], [0])
+  AC_SUBST([GNULIB_TSS], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_THREAD_LOCAL=1;    AC_SUBST([HAVE_THREAD_LOCAL])
-  BROKEN_THRD_START_T=0;  AC_SUBST([BROKEN_THRD_START_T])
-  REPLACE_THRD_CREATE=0;  AC_SUBST([REPLACE_THRD_CREATE])
-  REPLACE_THRD_CURRENT=0; AC_SUBST([REPLACE_THRD_CURRENT])
-  REPLACE_THRD_DETACH=0;  AC_SUBST([REPLACE_THRD_DETACH])
-  REPLACE_THRD_EQUAL=0;   AC_SUBST([REPLACE_THRD_EQUAL])
-  REPLACE_THRD_JOIN=0;    AC_SUBST([REPLACE_THRD_JOIN])
+  AC_SUBST([HAVE_THREAD_LOCAL], [1])
+  AC_SUBST([BROKEN_THRD_START_T], [0])
+  AC_SUBST([REPLACE_THRD_CREATE], [0])
+  AC_SUBST([REPLACE_THRD_CURRENT], [0])
+  AC_SUBST([REPLACE_THRD_DETACH], [0])
+  AC_SUBST([REPLACE_THRD_EQUAL], [0])
+  AC_SUBST([REPLACE_THRD_JOIN], [0])
 ])
diff --git a/m4/time_h.m4 b/m4/time_h.m4
index d0f89327c..3ccdd319f 100644
--- a/m4/time_h.m4
+++ b/m4/time_h.m4
@@ -2,7 +2,7 @@
 
 # Copyright (C) 2000-2001, 2003-2007, 2009-2020 Free Software Foundation, Inc.
 
-# serial 12
+# serial 13
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -106,34 +106,34 @@ AC_DEFUN([gl_TIME_MODULE_INDICATOR],
 
 AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS],
 [
-  GNULIB_CTIME=0;                        AC_SUBST([GNULIB_CTIME])
-  GNULIB_MKTIME=0;                       AC_SUBST([GNULIB_MKTIME])
-  GNULIB_LOCALTIME=0;                    AC_SUBST([GNULIB_LOCALTIME])
-  GNULIB_NANOSLEEP=0;                    AC_SUBST([GNULIB_NANOSLEEP])
-  GNULIB_STRFTIME=0;                     AC_SUBST([GNULIB_STRFTIME])
-  GNULIB_STRPTIME=0;                     AC_SUBST([GNULIB_STRPTIME])
-  GNULIB_TIMEGM=0;                       AC_SUBST([GNULIB_TIMEGM])
-  GNULIB_TIME_R=0;                       AC_SUBST([GNULIB_TIME_R])
-  GNULIB_TIME_RZ=0;                      AC_SUBST([GNULIB_TIME_RZ])
-  GNULIB_TZSET=0;                        AC_SUBST([GNULIB_TZSET])
+  AC_SUBST([GNULIB_CTIME], [0])
+  AC_SUBST([GNULIB_MKTIME], [0])
+  AC_SUBST([GNULIB_LOCALTIME], [0])
+  AC_SUBST([GNULIB_NANOSLEEP], [0])
+  AC_SUBST([GNULIB_STRFTIME], [0])
+  AC_SUBST([GNULIB_STRPTIME], [0])
+  AC_SUBST([GNULIB_TIMEGM], [0])
+  AC_SUBST([GNULIB_TIME_R], [0])
+  AC_SUBST([GNULIB_TIME_RZ], [0])
+  AC_SUBST([GNULIB_TZSET], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_DECL_LOCALTIME_R=1;               AC_SUBST([HAVE_DECL_LOCALTIME_R])
-  HAVE_NANOSLEEP=1;                      AC_SUBST([HAVE_NANOSLEEP])
-  HAVE_STRPTIME=1;                       AC_SUBST([HAVE_STRPTIME])
-  HAVE_TIMEGM=1;                         AC_SUBST([HAVE_TIMEGM])
-  HAVE_TZSET=1;                          AC_SUBST([HAVE_TZSET])
+  AC_SUBST([HAVE_DECL_LOCALTIME_R], [1])
+  AC_SUBST([HAVE_NANOSLEEP], [1])
+  AC_SUBST([HAVE_STRPTIME], [1])
+  AC_SUBST([HAVE_TIMEGM], [1])
+  AC_SUBST([HAVE_TZSET], [1])
   dnl Even GNU libc does not have timezone_t yet.
-  HAVE_TIMEZONE_T=0;                     AC_SUBST([HAVE_TIMEZONE_T])
+  AC_SUBST([HAVE_TIMEZONE_T], [0])
   dnl If another module says to replace or to not replace, do that.
   dnl Otherwise, replace only if someone compiles with -DGNULIB_PORTCHECK;
   dnl this lets maintainers check for portability.
-  REPLACE_CTIME=GNULIB_PORTCHECK;        AC_SUBST([REPLACE_CTIME])
-  REPLACE_LOCALTIME_R=GNULIB_PORTCHECK;  AC_SUBST([REPLACE_LOCALTIME_R])
-  REPLACE_MKTIME=GNULIB_PORTCHECK;       AC_SUBST([REPLACE_MKTIME])
-  REPLACE_NANOSLEEP=GNULIB_PORTCHECK;    AC_SUBST([REPLACE_NANOSLEEP])
-  REPLACE_STRFTIME=GNULIB_PORTCHECK;     AC_SUBST([REPLACE_STRFTIME])
-  REPLACE_TIMEGM=GNULIB_PORTCHECK;       AC_SUBST([REPLACE_TIMEGM])
-  REPLACE_TZSET=GNULIB_PORTCHECK;        AC_SUBST([REPLACE_TZSET])
+  AC_SUBST([REPLACE_CTIME], [GNULIB_PORTCHECK])
+  AC_SUBST([REPLACE_LOCALTIME_R], [GNULIB_PORTCHECK])
+  AC_SUBST([REPLACE_MKTIME], [GNULIB_PORTCHECK])
+  AC_SUBST([REPLACE_NANOSLEEP], [GNULIB_PORTCHECK])
+  AC_SUBST([REPLACE_STRFTIME], [GNULIB_PORTCHECK])
+  AC_SUBST([REPLACE_TIMEGM], [GNULIB_PORTCHECK])
+  AC_SUBST([REPLACE_TZSET], [GNULIB_PORTCHECK])
 
   dnl Hack so that the time module doesn't depend on the sys_time module.
   dnl First, default GNULIB_GETTIMEOFDAY to 0 if sys_time is absent.
@@ -141,6 +141,6 @@ AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS],
   dnl Second, it's OK to not use GNULIB_PORTCHECK for REPLACE_GMTIME
   dnl and REPLACE_LOCALTIME, as portability to Solaris 2.6 and earlier
   dnl is no longer a big deal.
-  REPLACE_GMTIME=0;                      AC_SUBST([REPLACE_GMTIME])
-  REPLACE_LOCALTIME=0;                   AC_SUBST([REPLACE_LOCALTIME])
+  AC_SUBST([REPLACE_GMTIME], [0])
+  AC_SUBST([REPLACE_LOCALTIME], [0])
 ])
diff --git a/m4/uchar.m4 b/m4/uchar.m4
index 0875caa36..1006ddc60 100644
--- a/m4/uchar.m4
+++ b/m4/uchar.m4
@@ -1,4 +1,4 @@
-# uchar.m4 serial 14
+# uchar.m4 serial 15
 dnl Copyright (C) 2019-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -95,33 +95,33 @@ AC_DEFUN([gl_UCHAR_MODULE_INDICATOR],
 
 AC_DEFUN([gl_UCHAR_H_DEFAULTS],
 [
-  GNULIB_OVERRIDES_CHAR16_T=0; AC_SUBST([GNULIB_OVERRIDES_CHAR16_T])
-  GNULIB_OVERRIDES_CHAR32_T=0; AC_SUBST([GNULIB_OVERRIDES_CHAR32_T])
-  GNULIB_BTOC32=0;             AC_SUBST([GNULIB_BTOC32])
-  GNULIB_C32ISALNUM=0;         AC_SUBST([GNULIB_C32ISALNUM])
-  GNULIB_C32ISALPHA=0;         AC_SUBST([GNULIB_C32ISALPHA])
-  GNULIB_C32ISBLANK=0;         AC_SUBST([GNULIB_C32ISBLANK])
-  GNULIB_C32ISCNTRL=0;         AC_SUBST([GNULIB_C32ISCNTRL])
-  GNULIB_C32ISDIGIT=0;         AC_SUBST([GNULIB_C32ISDIGIT])
-  GNULIB_C32ISGRAPH=0;         AC_SUBST([GNULIB_C32ISGRAPH])
-  GNULIB_C32ISLOWER=0;         AC_SUBST([GNULIB_C32ISLOWER])
-  GNULIB_C32ISPRINT=0;         AC_SUBST([GNULIB_C32ISPRINT])
-  GNULIB_C32ISPUNCT=0;         AC_SUBST([GNULIB_C32ISPUNCT])
-  GNULIB_C32ISSPACE=0;         AC_SUBST([GNULIB_C32ISSPACE])
-  GNULIB_C32ISUPPER=0;         AC_SUBST([GNULIB_C32ISUPPER])
-  GNULIB_C32ISXDIGIT=0;        AC_SUBST([GNULIB_C32ISXDIGIT])
-  GNULIB_C32RTOMB=0;           AC_SUBST([GNULIB_C32RTOMB])
-  GNULIB_C32SNRTOMBS=0;        AC_SUBST([GNULIB_C32SNRTOMBS])
-  GNULIB_C32SRTOMBS=0;         AC_SUBST([GNULIB_C32SRTOMBS])
-  GNULIB_C32STOMBS=0;          AC_SUBST([GNULIB_C32STOMBS])
-  GNULIB_C32TOB=0;             AC_SUBST([GNULIB_C32TOB])
-  GNULIB_MBRTOC32=0;           AC_SUBST([GNULIB_MBRTOC32])
-  GNULIB_MBSNRTOC32S=0;        AC_SUBST([GNULIB_MBSNRTOC32S])
-  GNULIB_MBSRTOC32S=0;         AC_SUBST([GNULIB_MBSRTOC32S])
-  GNULIB_MBSTOC32S=0;          AC_SUBST([GNULIB_MBSTOC32S])
+  AC_SUBST([GNULIB_OVERRIDES_CHAR16_T], [0])
+  AC_SUBST([GNULIB_OVERRIDES_CHAR32_T], [0])
+  AC_SUBST([GNULIB_BTOC32], [0])
+  AC_SUBST([GNULIB_C32ISALNUM], [0])
+  AC_SUBST([GNULIB_C32ISALPHA], [0])
+  AC_SUBST([GNULIB_C32ISBLANK], [0])
+  AC_SUBST([GNULIB_C32ISCNTRL], [0])
+  AC_SUBST([GNULIB_C32ISDIGIT], [0])
+  AC_SUBST([GNULIB_C32ISGRAPH], [0])
+  AC_SUBST([GNULIB_C32ISLOWER], [0])
+  AC_SUBST([GNULIB_C32ISPRINT], [0])
+  AC_SUBST([GNULIB_C32ISPUNCT], [0])
+  AC_SUBST([GNULIB_C32ISSPACE], [0])
+  AC_SUBST([GNULIB_C32ISUPPER], [0])
+  AC_SUBST([GNULIB_C32ISXDIGIT], [0])
+  AC_SUBST([GNULIB_C32RTOMB], [0])
+  AC_SUBST([GNULIB_C32SNRTOMBS], [0])
+  AC_SUBST([GNULIB_C32SRTOMBS], [0])
+  AC_SUBST([GNULIB_C32STOMBS], [0])
+  AC_SUBST([GNULIB_C32TOB], [0])
+  AC_SUBST([GNULIB_MBRTOC32], [0])
+  AC_SUBST([GNULIB_MBSNRTOC32S], [0])
+  AC_SUBST([GNULIB_MBSRTOC32S], [0])
+  AC_SUBST([GNULIB_MBSTOC32S], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_C32RTOMB=1;             AC_SUBST([HAVE_C32RTOMB])
-  HAVE_MBRTOC32=1;             AC_SUBST([HAVE_MBRTOC32])
-  REPLACE_C32RTOMB=0;          AC_SUBST([REPLACE_C32RTOMB])
-  REPLACE_MBRTOC32=0;          AC_SUBST([REPLACE_MBRTOC32])
+  AC_SUBST([HAVE_C32RTOMB], [1])
+  AC_SUBST([HAVE_MBRTOC32], [1])
+  AC_SUBST([REPLACE_C32RTOMB], [0])
+  AC_SUBST([REPLACE_MBRTOC32], [0])
 ])
diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4
index e776f3bd4..39dcf6d3f 100644
--- a/m4/unistd_h.m4
+++ b/m4/unistd_h.m4
@@ -1,4 +1,4 @@
-# unistd_h.m4 serial 78
+# unistd_h.m4 serial 79
 dnl Copyright (C) 2006-2020 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -63,142 +63,141 @@ AC_DEFUN([gl_UNISTD_MODULE_INDICATOR],
 
 AC_DEFUN([gl_UNISTD_H_DEFAULTS],
 [
-  GNULIB_ACCESS=0;               AC_SUBST([GNULIB_ACCESS])
-  GNULIB_CHDIR=0;                AC_SUBST([GNULIB_CHDIR])
-  GNULIB_CHOWN=0;                AC_SUBST([GNULIB_CHOWN])
-  GNULIB_CLOSE=0;                AC_SUBST([GNULIB_CLOSE])
-  GNULIB_COPY_FILE_RANGE=0;      AC_SUBST([GNULIB_COPY_FILE_RANGE])
-  GNULIB_DUP=0;                  AC_SUBST([GNULIB_DUP])
-  GNULIB_DUP2=0;                 AC_SUBST([GNULIB_DUP2])
-  GNULIB_DUP3=0;                 AC_SUBST([GNULIB_DUP3])
-  GNULIB_ENVIRON=0;              AC_SUBST([GNULIB_ENVIRON])
-  GNULIB_EUIDACCESS=0;           AC_SUBST([GNULIB_EUIDACCESS])
-  GNULIB_FACCESSAT=0;            AC_SUBST([GNULIB_FACCESSAT])
-  GNULIB_FCHDIR=0;               AC_SUBST([GNULIB_FCHDIR])
-  GNULIB_FCHOWNAT=0;             AC_SUBST([GNULIB_FCHOWNAT])
-  GNULIB_FDATASYNC=0;            AC_SUBST([GNULIB_FDATASYNC])
-  GNULIB_FSYNC=0;                AC_SUBST([GNULIB_FSYNC])
-  GNULIB_FTRUNCATE=0;            AC_SUBST([GNULIB_FTRUNCATE])
-  GNULIB_GETCWD=0;               AC_SUBST([GNULIB_GETCWD])
-  GNULIB_GETDOMAINNAME=0;        AC_SUBST([GNULIB_GETDOMAINNAME])
-  GNULIB_GETDTABLESIZE=0;        AC_SUBST([GNULIB_GETDTABLESIZE])
-  GNULIB_GETGROUPS=0;            AC_SUBST([GNULIB_GETGROUPS])
-  GNULIB_GETHOSTNAME=0;          AC_SUBST([GNULIB_GETHOSTNAME])
-  GNULIB_GETLOGIN=0;             AC_SUBST([GNULIB_GETLOGIN])
-  GNULIB_GETLOGIN_R=0;           AC_SUBST([GNULIB_GETLOGIN_R])
-  GNULIB_GETOPT_POSIX=0;         AC_SUBST([GNULIB_GETOPT_POSIX])
-  GNULIB_GETPAGESIZE=0;          AC_SUBST([GNULIB_GETPAGESIZE])
-  GNULIB_GETPASS=0;              AC_SUBST([GNULIB_GETPASS])
-  GNULIB_GETUSERSHELL=0;         AC_SUBST([GNULIB_GETUSERSHELL])
-  GNULIB_GROUP_MEMBER=0;         AC_SUBST([GNULIB_GROUP_MEMBER])
-  GNULIB_ISATTY=0;               AC_SUBST([GNULIB_ISATTY])
-  GNULIB_LCHOWN=0;               AC_SUBST([GNULIB_LCHOWN])
-  GNULIB_LINK=0;                 AC_SUBST([GNULIB_LINK])
-  GNULIB_LINKAT=0;               AC_SUBST([GNULIB_LINKAT])
-  GNULIB_LSEEK=0;                AC_SUBST([GNULIB_LSEEK])
-  GNULIB_PIPE=0;                 AC_SUBST([GNULIB_PIPE])
-  GNULIB_PIPE2=0;                AC_SUBST([GNULIB_PIPE2])
-  GNULIB_PREAD=0;                AC_SUBST([GNULIB_PREAD])
-  GNULIB_PWRITE=0;               AC_SUBST([GNULIB_PWRITE])
-  GNULIB_READ=0;                 AC_SUBST([GNULIB_READ])
-  GNULIB_READLINK=0;             AC_SUBST([GNULIB_READLINK])
-  GNULIB_READLINKAT=0;           AC_SUBST([GNULIB_READLINKAT])
-  GNULIB_RMDIR=0;                AC_SUBST([GNULIB_RMDIR])
-  GNULIB_SETHOSTNAME=0;          AC_SUBST([GNULIB_SETHOSTNAME])
-  GNULIB_SLEEP=0;                AC_SUBST([GNULIB_SLEEP])
-  GNULIB_SYMLINK=0;              AC_SUBST([GNULIB_SYMLINK])
-  GNULIB_SYMLINKAT=0;            AC_SUBST([GNULIB_SYMLINKAT])
-  GNULIB_TRUNCATE=0;             AC_SUBST([GNULIB_TRUNCATE])
-  GNULIB_TTYNAME_R=0;            AC_SUBST([GNULIB_TTYNAME_R])
-  GNULIB_UNISTD_H_NONBLOCKING=0; AC_SUBST([GNULIB_UNISTD_H_NONBLOCKING])
-  GNULIB_UNISTD_H_SIGPIPE=0;     AC_SUBST([GNULIB_UNISTD_H_SIGPIPE])
-  GNULIB_UNLINK=0;               AC_SUBST([GNULIB_UNLINK])
-  GNULIB_UNLINKAT=0;             AC_SUBST([GNULIB_UNLINKAT])
-  GNULIB_USLEEP=0;               AC_SUBST([GNULIB_USLEEP])
-  GNULIB_WRITE=0;                AC_SUBST([GNULIB_WRITE])
+  AC_SUBST([GNULIB_ACCESS], [0])
+  AC_SUBST([GNULIB_CHDIR], [0])
+  AC_SUBST([GNULIB_CHOWN], [0])
+  AC_SUBST([GNULIB_CLOSE], [0])
+  AC_SUBST([GNULIB_COPY_FILE_RANGE], [0])
+  AC_SUBST([GNULIB_DUP], [0])
+  AC_SUBST([GNULIB_DUP2], [0])
+  AC_SUBST([GNULIB_DUP3], [0])
+  AC_SUBST([GNULIB_ENVIRON], [0])
+  AC_SUBST([GNULIB_EUIDACCESS], [0])
+  AC_SUBST([GNULIB_FACCESSAT], [0])
+  AC_SUBST([GNULIB_FCHDIR], [0])
+  AC_SUBST([GNULIB_FCHOWNAT], [0])
+  AC_SUBST([GNULIB_FDATASYNC], [0])
+  AC_SUBST([GNULIB_FSYNC], [0])
+  AC_SUBST([GNULIB_FTRUNCATE], [0])
+  AC_SUBST([GNULIB_GETCWD], [0])
+  AC_SUBST([GNULIB_GETDOMAINNAME], [0])
+  AC_SUBST([GNULIB_GETDTABLESIZE], [0])
+  AC_SUBST([GNULIB_GETGROUPS], [0])
+  AC_SUBST([GNULIB_GETHOSTNAME], [0])
+  AC_SUBST([GNULIB_GETLOGIN], [0])
+  AC_SUBST([GNULIB_GETLOGIN_R], [0])
+  AC_SUBST([GNULIB_GETOPT_POSIX], [0])
+  AC_SUBST([GNULIB_GETPAGESIZE], [0])
+  AC_SUBST([GNULIB_GETPASS], [0])
+  AC_SUBST([GNULIB_GETUSERSHELL], [0])
+  AC_SUBST([GNULIB_GROUP_MEMBER], [0])
+  AC_SUBST([GNULIB_ISATTY], [0])
+  AC_SUBST([GNULIB_LCHOWN], [0])
+  AC_SUBST([GNULIB_LINK], [0])
+  AC_SUBST([GNULIB_LINKAT], [0])
+  AC_SUBST([GNULIB_LSEEK], [0])
+  AC_SUBST([GNULIB_PIPE], [0])
+  AC_SUBST([GNULIB_PIPE2], [0])
+  AC_SUBST([GNULIB_PREAD], [0])
+  AC_SUBST([GNULIB_PWRITE], [0])
+  AC_SUBST([GNULIB_READ], [0])
+  AC_SUBST([GNULIB_READLINK], [0])
+  AC_SUBST([GNULIB_READLINKAT], [0])
+  AC_SUBST([GNULIB_RMDIR], [0])
+  AC_SUBST([GNULIB_SETHOSTNAME], [0])
+  AC_SUBST([GNULIB_SLEEP], [0])
+  AC_SUBST([GNULIB_SYMLINK], [0])
+  AC_SUBST([GNULIB_SYMLINKAT], [0])
+  AC_SUBST([GNULIB_TRUNCATE], [0])
+  AC_SUBST([GNULIB_TTYNAME_R], [0])
+  AC_SUBST([GNULIB_UNISTD_H_NONBLOCKING], [0])
+  AC_SUBST([GNULIB_UNISTD_H_SIGPIPE], [0])
+  AC_SUBST([GNULIB_UNLINK], [0])
+  AC_SUBST([GNULIB_UNLINKAT], [0])
+  AC_SUBST([GNULIB_USLEEP], [0])
+  AC_SUBST([GNULIB_WRITE], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_CHOWN=1;           AC_SUBST([HAVE_CHOWN])
-  HAVE_COPY_FILE_RANGE=1; AC_SUBST([HAVE_COPY_FILE_RANGE])
-  HAVE_DUP2=1;            AC_SUBST([HAVE_DUP2])
-  HAVE_DUP3=1;            AC_SUBST([HAVE_DUP3])
-  HAVE_EUIDACCESS=1;      AC_SUBST([HAVE_EUIDACCESS])
-  HAVE_FACCESSAT=1;       AC_SUBST([HAVE_FACCESSAT])
-  HAVE_FCHDIR=1;          AC_SUBST([HAVE_FCHDIR])
-  HAVE_FCHOWNAT=1;        AC_SUBST([HAVE_FCHOWNAT])
-  HAVE_FDATASYNC=1;       AC_SUBST([HAVE_FDATASYNC])
-  HAVE_FSYNC=1;           AC_SUBST([HAVE_FSYNC])
-  HAVE_FTRUNCATE=1;       AC_SUBST([HAVE_FTRUNCATE])
-  HAVE_GETDTABLESIZE=1;   AC_SUBST([HAVE_GETDTABLESIZE])
-  HAVE_GETGROUPS=1;       AC_SUBST([HAVE_GETGROUPS])
-  HAVE_GETHOSTNAME=1;     AC_SUBST([HAVE_GETHOSTNAME])
-  HAVE_GETLOGIN=1;        AC_SUBST([HAVE_GETLOGIN])
-  HAVE_GETPAGESIZE=1;     AC_SUBST([HAVE_GETPAGESIZE])
-  HAVE_GETPASS=1;         AC_SUBST([HAVE_GETPASS])
-  HAVE_GROUP_MEMBER=1;    AC_SUBST([HAVE_GROUP_MEMBER])
-  HAVE_LCHOWN=1;          AC_SUBST([HAVE_LCHOWN])
-  HAVE_LINK=1;            AC_SUBST([HAVE_LINK])
-  HAVE_LINKAT=1;          AC_SUBST([HAVE_LINKAT])
-  HAVE_PIPE=1;            AC_SUBST([HAVE_PIPE])
-  HAVE_PIPE2=1;           AC_SUBST([HAVE_PIPE2])
-  HAVE_PREAD=1;           AC_SUBST([HAVE_PREAD])
-  HAVE_PWRITE=1;          AC_SUBST([HAVE_PWRITE])
-  HAVE_READLINK=1;        AC_SUBST([HAVE_READLINK])
-  HAVE_READLINKAT=1;      AC_SUBST([HAVE_READLINKAT])
-  HAVE_SETHOSTNAME=1;     AC_SUBST([HAVE_SETHOSTNAME])
-  HAVE_SLEEP=1;           AC_SUBST([HAVE_SLEEP])
-  HAVE_SYMLINK=1;         AC_SUBST([HAVE_SYMLINK])
-  HAVE_SYMLINKAT=1;       AC_SUBST([HAVE_SYMLINKAT])
-  HAVE_UNLINKAT=1;        AC_SUBST([HAVE_UNLINKAT])
-  HAVE_USLEEP=1;          AC_SUBST([HAVE_USLEEP])
-  HAVE_DECL_ENVIRON=1;    AC_SUBST([HAVE_DECL_ENVIRON])
-  HAVE_DECL_FCHDIR=1;     AC_SUBST([HAVE_DECL_FCHDIR])
-  HAVE_DECL_FDATASYNC=1;  AC_SUBST([HAVE_DECL_FDATASYNC])
-  HAVE_DECL_GETDOMAINNAME=1; AC_SUBST([HAVE_DECL_GETDOMAINNAME])
-  HAVE_DECL_GETLOGIN=1;   AC_SUBST([HAVE_DECL_GETLOGIN])
-  HAVE_DECL_GETLOGIN_R=1; AC_SUBST([HAVE_DECL_GETLOGIN_R])
-  HAVE_DECL_GETPAGESIZE=1; AC_SUBST([HAVE_DECL_GETPAGESIZE])
-  HAVE_DECL_GETUSERSHELL=1; AC_SUBST([HAVE_DECL_GETUSERSHELL])
-  HAVE_DECL_SETHOSTNAME=1; AC_SUBST([HAVE_DECL_SETHOSTNAME])
-  HAVE_DECL_TRUNCATE=1;   AC_SUBST([HAVE_DECL_TRUNCATE])
-  HAVE_DECL_TTYNAME_R=1;  AC_SUBST([HAVE_DECL_TTYNAME_R])
-  HAVE_OS_H=0;            AC_SUBST([HAVE_OS_H])
-  HAVE_SYS_PARAM_H=0;     AC_SUBST([HAVE_SYS_PARAM_H])
-  REPLACE_ACCESS=0;       AC_SUBST([REPLACE_ACCESS])
-  REPLACE_CHOWN=0;        AC_SUBST([REPLACE_CHOWN])
-  REPLACE_CLOSE=0;        AC_SUBST([REPLACE_CLOSE])
-  REPLACE_DUP=0;          AC_SUBST([REPLACE_DUP])
-  REPLACE_DUP2=0;         AC_SUBST([REPLACE_DUP2])
-  REPLACE_FACCESSAT=0;    AC_SUBST([REPLACE_FACCESSAT])
-  REPLACE_FCHOWNAT=0;     AC_SUBST([REPLACE_FCHOWNAT])
-  REPLACE_FTRUNCATE=0;    AC_SUBST([REPLACE_FTRUNCATE])
-  REPLACE_GETCWD=0;       AC_SUBST([REPLACE_GETCWD])
-  REPLACE_GETDOMAINNAME=0; AC_SUBST([REPLACE_GETDOMAINNAME])
-  REPLACE_GETDTABLESIZE=0; AC_SUBST([REPLACE_GETDTABLESIZE])
-  REPLACE_GETLOGIN_R=0;   AC_SUBST([REPLACE_GETLOGIN_R])
-  REPLACE_GETGROUPS=0;    AC_SUBST([REPLACE_GETGROUPS])
-  REPLACE_GETPAGESIZE=0;  AC_SUBST([REPLACE_GETPAGESIZE])
-  REPLACE_GETPASS=0;      AC_SUBST([REPLACE_GETPASS])
-  REPLACE_ISATTY=0;       AC_SUBST([REPLACE_ISATTY])
-  REPLACE_LCHOWN=0;       AC_SUBST([REPLACE_LCHOWN])
-  REPLACE_LINK=0;         AC_SUBST([REPLACE_LINK])
-  REPLACE_LINKAT=0;       AC_SUBST([REPLACE_LINKAT])
-  REPLACE_LSEEK=0;        AC_SUBST([REPLACE_LSEEK])
-  REPLACE_PREAD=0;        AC_SUBST([REPLACE_PREAD])
-  REPLACE_PWRITE=0;       AC_SUBST([REPLACE_PWRITE])
-  REPLACE_READ=0;         AC_SUBST([REPLACE_READ])
-  REPLACE_READLINK=0;     AC_SUBST([REPLACE_READLINK])
-  REPLACE_READLINKAT=0;   AC_SUBST([REPLACE_READLINKAT])
-  REPLACE_RMDIR=0;        AC_SUBST([REPLACE_RMDIR])
-  REPLACE_SLEEP=0;        AC_SUBST([REPLACE_SLEEP])
-  REPLACE_SYMLINK=0;      AC_SUBST([REPLACE_SYMLINK])
-  REPLACE_SYMLINKAT=0;    AC_SUBST([REPLACE_SYMLINKAT])
-  REPLACE_TRUNCATE=0;     AC_SUBST([REPLACE_TRUNCATE])
-  REPLACE_TTYNAME_R=0;    AC_SUBST([REPLACE_TTYNAME_R])
-  REPLACE_UNLINK=0;       AC_SUBST([REPLACE_UNLINK])
-  REPLACE_UNLINKAT=0;     AC_SUBST([REPLACE_UNLINKAT])
-  REPLACE_USLEEP=0;       AC_SUBST([REPLACE_USLEEP])
-  REPLACE_WRITE=0;        AC_SUBST([REPLACE_WRITE])
-  UNISTD_H_HAVE_WINSOCK2_H=0; AC_SUBST([UNISTD_H_HAVE_WINSOCK2_H])
-  UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=0;
-                           AC_SUBST([UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS])
+  AC_SUBST([HAVE_CHOWN], [1])
+  AC_SUBST([HAVE_COPY_FILE_RANGE], [1])
+  AC_SUBST([HAVE_DUP2], [1])
+  AC_SUBST([HAVE_DUP3], [1])
+  AC_SUBST([HAVE_EUIDACCESS], [1])
+  AC_SUBST([HAVE_FACCESSAT], [1])
+  AC_SUBST([HAVE_FCHDIR], [1])
+  AC_SUBST([HAVE_FCHOWNAT], [1])
+  AC_SUBST([HAVE_FDATASYNC], [1])
+  AC_SUBST([HAVE_FSYNC], [1])
+  AC_SUBST([HAVE_FTRUNCATE], [1])
+  AC_SUBST([HAVE_GETDTABLESIZE], [1])
+  AC_SUBST([HAVE_GETGROUPS], [1])
+  AC_SUBST([HAVE_GETHOSTNAME], [1])
+  AC_SUBST([HAVE_GETLOGIN], [1])
+  AC_SUBST([HAVE_GETPAGESIZE], [1])
+  AC_SUBST([HAVE_GETPASS], [1])
+  AC_SUBST([HAVE_GROUP_MEMBER], [1])
+  AC_SUBST([HAVE_LCHOWN], [1])
+  AC_SUBST([HAVE_LINK], [1])
+  AC_SUBST([HAVE_LINKAT], [1])
+  AC_SUBST([HAVE_PIPE], [1])
+  AC_SUBST([HAVE_PIPE2], [1])
+  AC_SUBST([HAVE_PREAD], [1])
+  AC_SUBST([HAVE_PWRITE], [1])
+  AC_SUBST([HAVE_READLINK], [1])
+  AC_SUBST([HAVE_READLINKAT], [1])
+  AC_SUBST([HAVE_SETHOSTNAME], [1])
+  AC_SUBST([HAVE_SLEEP], [1])
+  AC_SUBST([HAVE_SYMLINK], [1])
+  AC_SUBST([HAVE_SYMLINKAT], [1])
+  AC_SUBST([HAVE_UNLINKAT], [1])
+  AC_SUBST([HAVE_USLEEP], [1])
+  AC_SUBST([HAVE_DECL_ENVIRON], [1])
+  AC_SUBST([HAVE_DECL_FCHDIR], [1])
+  AC_SUBST([HAVE_DECL_FDATASYNC], [1])
+  AC_SUBST([HAVE_DECL_GETDOMAINNAME], [1])
+  AC_SUBST([HAVE_DECL_GETLOGIN], [1])
+  AC_SUBST([HAVE_DECL_GETLOGIN_R], [1])
+  AC_SUBST([HAVE_DECL_GETPAGESIZE], [1])
+  AC_SUBST([HAVE_DECL_GETUSERSHELL], [1])
+  AC_SUBST([HAVE_DECL_SETHOSTNAME], [1])
+  AC_SUBST([HAVE_DECL_TRUNCATE], [1])
+  AC_SUBST([HAVE_DECL_TTYNAME_R], [1])
+  AC_SUBST([HAVE_OS_H], [0])
+  AC_SUBST([HAVE_SYS_PARAM_H], [0])
+  AC_SUBST([REPLACE_ACCESS], [0])
+  AC_SUBST([REPLACE_CHOWN], [0])
+  AC_SUBST([REPLACE_CLOSE], [0])
+  AC_SUBST([REPLACE_DUP], [0])
+  AC_SUBST([REPLACE_DUP2], [0])
+  AC_SUBST([REPLACE_FACCESSAT], [0])
+  AC_SUBST([REPLACE_FCHOWNAT], [0])
+  AC_SUBST([REPLACE_FTRUNCATE], [0])
+  AC_SUBST([REPLACE_GETCWD], [0])
+  AC_SUBST([REPLACE_GETDOMAINNAME], [0])
+  AC_SUBST([REPLACE_GETDTABLESIZE], [0])
+  AC_SUBST([REPLACE_GETLOGIN_R], [0])
+  AC_SUBST([REPLACE_GETGROUPS], [0])
+  AC_SUBST([REPLACE_GETPAGESIZE], [0])
+  AC_SUBST([REPLACE_GETPASS], [0])
+  AC_SUBST([REPLACE_ISATTY], [0])
+  AC_SUBST([REPLACE_LCHOWN], [0])
+  AC_SUBST([REPLACE_LINK], [0])
+  AC_SUBST([REPLACE_LINKAT], [0])
+  AC_SUBST([REPLACE_LSEEK], [0])
+  AC_SUBST([REPLACE_PREAD], [0])
+  AC_SUBST([REPLACE_PWRITE], [0])
+  AC_SUBST([REPLACE_READ], [0])
+  AC_SUBST([REPLACE_READLINK], [0])
+  AC_SUBST([REPLACE_READLINKAT], [0])
+  AC_SUBST([REPLACE_RMDIR], [0])
+  AC_SUBST([REPLACE_SLEEP], [0])
+  AC_SUBST([REPLACE_SYMLINK], [0])
+  AC_SUBST([REPLACE_SYMLINKAT], [0])
+  AC_SUBST([REPLACE_TRUNCATE], [0])
+  AC_SUBST([REPLACE_TTYNAME_R], [0])
+  AC_SUBST([REPLACE_UNLINK], [0])
+  AC_SUBST([REPLACE_UNLINKAT], [0])
+  AC_SUBST([REPLACE_USLEEP], [0])
+  AC_SUBST([REPLACE_WRITE], [0])
+  AC_SUBST([UNISTD_H_HAVE_WINSOCK2_H], [0])
+  AC_SUBST([UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS], [0])
 ])
diff --git a/m4/utime_h.m4 b/m4/utime_h.m4
index 2a73636f5..86ee42c37 100644
--- a/m4/utime_h.m4
+++ b/m4/utime_h.m4
@@ -61,8 +61,8 @@ AC_DEFUN([gl_UTIME_MODULE_INDICATOR],
 
 AC_DEFUN([gl_UTIME_H_DEFAULTS],
 [
-  GNULIB_UTIME=0;            AC_SUBST([GNULIB_UTIME])
+  AC_SUBST([GNULIB_UTIME], [0])
   dnl Assume POSIX behavior unless another module says otherwise.
-  HAVE_UTIME=1;              AC_SUBST([HAVE_UTIME])
-  REPLACE_UTIME=0;           AC_SUBST([REPLACE_UTIME])
+  AC_SUBST([HAVE_UTIME], [1])
+  AC_SUBST([REPLACE_UTIME], [0])
 ])
diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4
index be09020b1..046ce2b30 100644
--- a/m4/wchar_h.m4
+++ b/m4/wchar_h.m4
@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is 
preserved.
 
 dnl Written by Eric Blake.
 
-# wchar_h.m4 serial 45
+# wchar_h.m4 serial 46
 
 AC_DEFUN([gl_WCHAR_H],
 [
@@ -144,100 +144,100 @@ AC_DEFUN([gl_WCHAR_MODULE_INDICATOR],
 
 AC_DEFUN([gl_WCHAR_H_DEFAULTS],
 [
-  GNULIB_BTOWC=0;       AC_SUBST([GNULIB_BTOWC])
-  GNULIB_WCTOB=0;       AC_SUBST([GNULIB_WCTOB])
-  GNULIB_MBSINIT=0;     AC_SUBST([GNULIB_MBSINIT])
-  GNULIB_MBRTOWC=0;     AC_SUBST([GNULIB_MBRTOWC])
-  GNULIB_MBRLEN=0;      AC_SUBST([GNULIB_MBRLEN])
-  GNULIB_MBSRTOWCS=0;   AC_SUBST([GNULIB_MBSRTOWCS])
-  GNULIB_MBSNRTOWCS=0;  AC_SUBST([GNULIB_MBSNRTOWCS])
-  GNULIB_WCRTOMB=0;     AC_SUBST([GNULIB_WCRTOMB])
-  GNULIB_WCSRTOMBS=0;   AC_SUBST([GNULIB_WCSRTOMBS])
-  GNULIB_WCSNRTOMBS=0;  AC_SUBST([GNULIB_WCSNRTOMBS])
-  GNULIB_WCWIDTH=0;     AC_SUBST([GNULIB_WCWIDTH])
-  GNULIB_WMEMCHR=0;     AC_SUBST([GNULIB_WMEMCHR])
-  GNULIB_WMEMCMP=0;     AC_SUBST([GNULIB_WMEMCMP])
-  GNULIB_WMEMCPY=0;     AC_SUBST([GNULIB_WMEMCPY])
-  GNULIB_WMEMMOVE=0;    AC_SUBST([GNULIB_WMEMMOVE])
-  GNULIB_WMEMSET=0;     AC_SUBST([GNULIB_WMEMSET])
-  GNULIB_WCSLEN=0;      AC_SUBST([GNULIB_WCSLEN])
-  GNULIB_WCSNLEN=0;     AC_SUBST([GNULIB_WCSNLEN])
-  GNULIB_WCSCPY=0;      AC_SUBST([GNULIB_WCSCPY])
-  GNULIB_WCPCPY=0;      AC_SUBST([GNULIB_WCPCPY])
-  GNULIB_WCSNCPY=0;     AC_SUBST([GNULIB_WCSNCPY])
-  GNULIB_WCPNCPY=0;     AC_SUBST([GNULIB_WCPNCPY])
-  GNULIB_WCSCAT=0;      AC_SUBST([GNULIB_WCSCAT])
-  GNULIB_WCSNCAT=0;     AC_SUBST([GNULIB_WCSNCAT])
-  GNULIB_WCSCMP=0;      AC_SUBST([GNULIB_WCSCMP])
-  GNULIB_WCSNCMP=0;     AC_SUBST([GNULIB_WCSNCMP])
-  GNULIB_WCSCASECMP=0;  AC_SUBST([GNULIB_WCSCASECMP])
-  GNULIB_WCSNCASECMP=0; AC_SUBST([GNULIB_WCSNCASECMP])
-  GNULIB_WCSCOLL=0;     AC_SUBST([GNULIB_WCSCOLL])
-  GNULIB_WCSXFRM=0;     AC_SUBST([GNULIB_WCSXFRM])
-  GNULIB_WCSDUP=0;      AC_SUBST([GNULIB_WCSDUP])
-  GNULIB_WCSCHR=0;      AC_SUBST([GNULIB_WCSCHR])
-  GNULIB_WCSRCHR=0;     AC_SUBST([GNULIB_WCSRCHR])
-  GNULIB_WCSCSPN=0;     AC_SUBST([GNULIB_WCSCSPN])
-  GNULIB_WCSSPN=0;      AC_SUBST([GNULIB_WCSSPN])
-  GNULIB_WCSPBRK=0;     AC_SUBST([GNULIB_WCSPBRK])
-  GNULIB_WCSSTR=0;      AC_SUBST([GNULIB_WCSSTR])
-  GNULIB_WCSTOK=0;      AC_SUBST([GNULIB_WCSTOK])
-  GNULIB_WCSWIDTH=0;    AC_SUBST([GNULIB_WCSWIDTH])
-  GNULIB_WCSFTIME=0;    AC_SUBST([GNULIB_WCSFTIME])
+  AC_SUBST([GNULIB_BTOWC], [0])
+  AC_SUBST([GNULIB_WCTOB], [0])
+  AC_SUBST([GNULIB_MBSINIT], [0])
+  AC_SUBST([GNULIB_MBRTOWC], [0])
+  AC_SUBST([GNULIB_MBRLEN], [0])
+  AC_SUBST([GNULIB_MBSRTOWCS], [0])
+  AC_SUBST([GNULIB_MBSNRTOWCS], [0])
+  AC_SUBST([GNULIB_WCRTOMB], [0])
+  AC_SUBST([GNULIB_WCSRTOMBS], [0])
+  AC_SUBST([GNULIB_WCSNRTOMBS], [0])
+  AC_SUBST([GNULIB_WCWIDTH], [0])
+  AC_SUBST([GNULIB_WMEMCHR], [0])
+  AC_SUBST([GNULIB_WMEMCMP], [0])
+  AC_SUBST([GNULIB_WMEMCPY], [0])
+  AC_SUBST([GNULIB_WMEMMOVE], [0])
+  AC_SUBST([GNULIB_WMEMSET], [0])
+  AC_SUBST([GNULIB_WCSLEN], [0])
+  AC_SUBST([GNULIB_WCSNLEN], [0])
+  AC_SUBST([GNULIB_WCSCPY], [0])
+  AC_SUBST([GNULIB_WCPCPY], [0])
+  AC_SUBST([GNULIB_WCSNCPY], [0])
+  AC_SUBST([GNULIB_WCPNCPY], [0])
+  AC_SUBST([GNULIB_WCSCAT], [0])
+  AC_SUBST([GNULIB_WCSNCAT], [0])
+  AC_SUBST([GNULIB_WCSCMP], [0])
+  AC_SUBST([GNULIB_WCSNCMP], [0])
+  AC_SUBST([GNULIB_WCSCASECMP], [0])
+  AC_SUBST([GNULIB_WCSNCASECMP], [0])
+  AC_SUBST([GNULIB_WCSCOLL], [0])
+  AC_SUBST([GNULIB_WCSXFRM], [0])
+  AC_SUBST([GNULIB_WCSDUP], [0])
+  AC_SUBST([GNULIB_WCSCHR], [0])
+  AC_SUBST([GNULIB_WCSRCHR], [0])
+  AC_SUBST([GNULIB_WCSCSPN], [0])
+  AC_SUBST([GNULIB_WCSSPN], [0])
+  AC_SUBST([GNULIB_WCSPBRK], [0])
+  AC_SUBST([GNULIB_WCSSTR], [0])
+  AC_SUBST([GNULIB_WCSTOK], [0])
+  AC_SUBST([GNULIB_WCSWIDTH], [0])
+  AC_SUBST([GNULIB_WCSFTIME], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_BTOWC=1;         AC_SUBST([HAVE_BTOWC])
-  HAVE_MBSINIT=1;       AC_SUBST([HAVE_MBSINIT])
-  HAVE_MBRTOWC=1;       AC_SUBST([HAVE_MBRTOWC])
-  HAVE_MBRLEN=1;        AC_SUBST([HAVE_MBRLEN])
-  HAVE_MBSRTOWCS=1;     AC_SUBST([HAVE_MBSRTOWCS])
-  HAVE_MBSNRTOWCS=1;    AC_SUBST([HAVE_MBSNRTOWCS])
-  HAVE_WCRTOMB=1;       AC_SUBST([HAVE_WCRTOMB])
-  HAVE_WCSRTOMBS=1;     AC_SUBST([HAVE_WCSRTOMBS])
-  HAVE_WCSNRTOMBS=1;    AC_SUBST([HAVE_WCSNRTOMBS])
-  HAVE_WMEMCHR=1;       AC_SUBST([HAVE_WMEMCHR])
-  HAVE_WMEMCMP=1;       AC_SUBST([HAVE_WMEMCMP])
-  HAVE_WMEMCPY=1;       AC_SUBST([HAVE_WMEMCPY])
-  HAVE_WMEMMOVE=1;      AC_SUBST([HAVE_WMEMMOVE])
-  HAVE_WMEMSET=1;       AC_SUBST([HAVE_WMEMSET])
-  HAVE_WCSLEN=1;        AC_SUBST([HAVE_WCSLEN])
-  HAVE_WCSNLEN=1;       AC_SUBST([HAVE_WCSNLEN])
-  HAVE_WCSCPY=1;        AC_SUBST([HAVE_WCSCPY])
-  HAVE_WCPCPY=1;        AC_SUBST([HAVE_WCPCPY])
-  HAVE_WCSNCPY=1;       AC_SUBST([HAVE_WCSNCPY])
-  HAVE_WCPNCPY=1;       AC_SUBST([HAVE_WCPNCPY])
-  HAVE_WCSCAT=1;        AC_SUBST([HAVE_WCSCAT])
-  HAVE_WCSNCAT=1;       AC_SUBST([HAVE_WCSNCAT])
-  HAVE_WCSCMP=1;        AC_SUBST([HAVE_WCSCMP])
-  HAVE_WCSNCMP=1;       AC_SUBST([HAVE_WCSNCMP])
-  HAVE_WCSCASECMP=1;    AC_SUBST([HAVE_WCSCASECMP])
-  HAVE_WCSNCASECMP=1;   AC_SUBST([HAVE_WCSNCASECMP])
-  HAVE_WCSCOLL=1;       AC_SUBST([HAVE_WCSCOLL])
-  HAVE_WCSXFRM=1;       AC_SUBST([HAVE_WCSXFRM])
-  HAVE_WCSDUP=1;        AC_SUBST([HAVE_WCSDUP])
-  HAVE_WCSCHR=1;        AC_SUBST([HAVE_WCSCHR])
-  HAVE_WCSRCHR=1;       AC_SUBST([HAVE_WCSRCHR])
-  HAVE_WCSCSPN=1;       AC_SUBST([HAVE_WCSCSPN])
-  HAVE_WCSSPN=1;        AC_SUBST([HAVE_WCSSPN])
-  HAVE_WCSPBRK=1;       AC_SUBST([HAVE_WCSPBRK])
-  HAVE_WCSSTR=1;        AC_SUBST([HAVE_WCSSTR])
-  HAVE_WCSTOK=1;        AC_SUBST([HAVE_WCSTOK])
-  HAVE_WCSWIDTH=1;      AC_SUBST([HAVE_WCSWIDTH])
-  HAVE_WCSFTIME=1;      AC_SUBST([HAVE_WCSFTIME])
-  HAVE_DECL_WCTOB=1;    AC_SUBST([HAVE_DECL_WCTOB])
-  HAVE_DECL_WCWIDTH=1;  AC_SUBST([HAVE_DECL_WCWIDTH])
-  REPLACE_MBSTATE_T=0;  AC_SUBST([REPLACE_MBSTATE_T])
-  REPLACE_BTOWC=0;      AC_SUBST([REPLACE_BTOWC])
-  REPLACE_WCTOB=0;      AC_SUBST([REPLACE_WCTOB])
-  REPLACE_MBSINIT=0;    AC_SUBST([REPLACE_MBSINIT])
-  REPLACE_MBRTOWC=0;    AC_SUBST([REPLACE_MBRTOWC])
-  REPLACE_MBRLEN=0;     AC_SUBST([REPLACE_MBRLEN])
-  REPLACE_MBSRTOWCS=0;  AC_SUBST([REPLACE_MBSRTOWCS])
-  REPLACE_MBSNRTOWCS=0; AC_SUBST([REPLACE_MBSNRTOWCS])
-  REPLACE_WCRTOMB=0;    AC_SUBST([REPLACE_WCRTOMB])
-  REPLACE_WCSRTOMBS=0;  AC_SUBST([REPLACE_WCSRTOMBS])
-  REPLACE_WCSNRTOMBS=0; AC_SUBST([REPLACE_WCSNRTOMBS])
-  REPLACE_WCWIDTH=0;    AC_SUBST([REPLACE_WCWIDTH])
-  REPLACE_WCSWIDTH=0;   AC_SUBST([REPLACE_WCSWIDTH])
-  REPLACE_WCSFTIME=0;   AC_SUBST([REPLACE_WCSFTIME])
-  REPLACE_WCSTOK=0;     AC_SUBST([REPLACE_WCSTOK])
+  AC_SUBST([HAVE_BTOWC], [1])
+  AC_SUBST([HAVE_MBSINIT], [1])
+  AC_SUBST([HAVE_MBRTOWC], [1])
+  AC_SUBST([HAVE_MBRLEN], [1])
+  AC_SUBST([HAVE_MBSRTOWCS], [1])
+  AC_SUBST([HAVE_MBSNRTOWCS], [1])
+  AC_SUBST([HAVE_WCRTOMB], [1])
+  AC_SUBST([HAVE_WCSRTOMBS], [1])
+  AC_SUBST([HAVE_WCSNRTOMBS], [1])
+  AC_SUBST([HAVE_WMEMCHR], [1])
+  AC_SUBST([HAVE_WMEMCMP], [1])
+  AC_SUBST([HAVE_WMEMCPY], [1])
+  AC_SUBST([HAVE_WMEMMOVE], [1])
+  AC_SUBST([HAVE_WMEMSET], [1])
+  AC_SUBST([HAVE_WCSLEN], [1])
+  AC_SUBST([HAVE_WCSNLEN], [1])
+  AC_SUBST([HAVE_WCSCPY], [1])
+  AC_SUBST([HAVE_WCPCPY], [1])
+  AC_SUBST([HAVE_WCSNCPY], [1])
+  AC_SUBST([HAVE_WCPNCPY], [1])
+  AC_SUBST([HAVE_WCSCAT], [1])
+  AC_SUBST([HAVE_WCSNCAT], [1])
+  AC_SUBST([HAVE_WCSCMP], [1])
+  AC_SUBST([HAVE_WCSNCMP], [1])
+  AC_SUBST([HAVE_WCSCASECMP], [1])
+  AC_SUBST([HAVE_WCSNCASECMP], [1])
+  AC_SUBST([HAVE_WCSCOLL], [1])
+  AC_SUBST([HAVE_WCSXFRM], [1])
+  AC_SUBST([HAVE_WCSDUP], [1])
+  AC_SUBST([HAVE_WCSCHR], [1])
+  AC_SUBST([HAVE_WCSRCHR], [1])
+  AC_SUBST([HAVE_WCSCSPN], [1])
+  AC_SUBST([HAVE_WCSSPN], [1])
+  AC_SUBST([HAVE_WCSPBRK], [1])
+  AC_SUBST([HAVE_WCSSTR], [1])
+  AC_SUBST([HAVE_WCSTOK], [1])
+  AC_SUBST([HAVE_WCSWIDTH], [1])
+  AC_SUBST([HAVE_WCSFTIME], [1])
+  AC_SUBST([HAVE_DECL_WCTOB], [1])
+  AC_SUBST([HAVE_DECL_WCWIDTH], [1])
+  AC_SUBST([REPLACE_MBSTATE_T], [0])
+  AC_SUBST([REPLACE_BTOWC], [0])
+  AC_SUBST([REPLACE_WCTOB], [0])
+  AC_SUBST([REPLACE_MBSINIT], [0])
+  AC_SUBST([REPLACE_MBRTOWC], [0])
+  AC_SUBST([REPLACE_MBRLEN], [0])
+  AC_SUBST([REPLACE_MBSRTOWCS], [0])
+  AC_SUBST([REPLACE_MBSNRTOWCS], [0])
+  AC_SUBST([REPLACE_WCRTOMB], [0])
+  AC_SUBST([REPLACE_WCSRTOMBS], [0])
+  AC_SUBST([REPLACE_WCSNRTOMBS], [0])
+  AC_SUBST([REPLACE_WCWIDTH], [0])
+  AC_SUBST([REPLACE_WCSWIDTH], [0])
+  AC_SUBST([REPLACE_WCSFTIME], [0])
+  AC_SUBST([REPLACE_WCSTOK], [0])
 ])
diff --git a/m4/wctype_h.m4 b/m4/wctype_h.m4
index 5c844b60a..3c4ac3fbd 100644
--- a/m4/wctype_h.m4
+++ b/m4/wctype_h.m4
@@ -203,18 +203,18 @@ AC_DEFUN([gl_WCTYPE_MODULE_INDICATOR],
 
 AC_DEFUN([gl_WCTYPE_H_DEFAULTS],
 [
-  GNULIB_ISWBLANK=0;    AC_SUBST([GNULIB_ISWBLANK])
-  GNULIB_ISWDIGIT=0;    AC_SUBST([GNULIB_ISWDIGIT])
-  GNULIB_ISWXDIGIT=0;   AC_SUBST([GNULIB_ISWXDIGIT])
-  GNULIB_WCTYPE=0;      AC_SUBST([GNULIB_WCTYPE])
-  GNULIB_ISWCTYPE=0;    AC_SUBST([GNULIB_ISWCTYPE])
-  GNULIB_WCTRANS=0;     AC_SUBST([GNULIB_WCTRANS])
-  GNULIB_TOWCTRANS=0;   AC_SUBST([GNULIB_TOWCTRANS])
+  AC_SUBST([GNULIB_ISWBLANK], [0])
+  AC_SUBST([GNULIB_ISWDIGIT], [0])
+  AC_SUBST([GNULIB_ISWXDIGIT], [0])
+  AC_SUBST([GNULIB_WCTYPE], [0])
+  AC_SUBST([GNULIB_ISWCTYPE], [0])
+  AC_SUBST([GNULIB_WCTRANS], [0])
+  AC_SUBST([GNULIB_TOWCTRANS], [0])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_ISWBLANK=1;      AC_SUBST([HAVE_ISWBLANK])
-  HAVE_WCTYPE_T=1;      AC_SUBST([HAVE_WCTYPE_T])
-  HAVE_WCTRANS_T=1;     AC_SUBST([HAVE_WCTRANS_T])
-  REPLACE_ISWBLANK=0;   AC_SUBST([REPLACE_ISWBLANK])
-  REPLACE_ISWDIGIT=0;   AC_SUBST([REPLACE_ISWDIGIT])
-  REPLACE_ISWXDIGIT=0;  AC_SUBST([REPLACE_ISWXDIGIT])
+  AC_SUBST([HAVE_ISWBLANK], [1])
+  AC_SUBST([HAVE_WCTYPE_T], [1])
+  AC_SUBST([HAVE_WCTRANS_T], [1])
+  AC_SUBST([REPLACE_ISWBLANK], [0])
+  AC_SUBST([REPLACE_ISWDIGIT], [0])
+  AC_SUBST([REPLACE_ISWXDIGIT], [0])
 ])




reply via email to

[Prev in Thread] Current Thread [Next in Thread]