bug-gnulib
[Top][All Lists]
Advanced

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

simplify GNULIB_* variable initializations


From: Bruno Haible
Subject: simplify GNULIB_* variable initializations
Date: Sun, 11 Apr 2021 02:42:10 +0200
User-agent: KMail/5.1.3 (Linux/4.4.0-206-generic; KDE/5.18.0; x86_64; ; )

This patch prepares further changes regarding GNULIB_* variables.


2021-04-10  Bruno Haible  <bruno@clisp.org>

        Simplify GNULIB_* variable initializations.
        * modules/gnulib-common.m4 (gl_MODULE_INDICATOR_INIT_VARIABLE): New
        macro.
        * m4/arpa_inet_h.m4 (gl_ARPA_INET_H_DEFAULTS): Use it.
        * m4/ctype.m4 (gl_CTYPE_H_DEFAULTS): Likewise.
        * m4/dirent_h.m4 (gl_DIRENT_H_DEFAULTS): Likewise.
        * m4/fcntl_h.m4 (gl_FCNTL_H_DEFAULTS): Likewise.
        * m4/fnmatch_h.m4 (gl_FNMATCH_H_DEFAULTS): Likewise.
        * m4/glob_h.m4 (gl_GLOB_H_DEFAULTS): Likewise.
        * m4/iconv_h.m4 (gl_ICONV_H_DEFAULTS): Likewise.
        * m4/inttypes.m4 (gl_INTTYPES_H_DEFAULTS): Likewise.
        * m4/langinfo_h.m4 (gl_LANGINFO_H_DEFAULTS): Likewise.
        * m4/locale_h.m4 (gl_LOCALE_H_DEFAULTS): Likewise.
        * m4/malloc_h.m4 (gl_MALLOC_H_DEFAULTS): Likewise.
        * m4/math_h.m4 (gl_MATH_H_DEFAULTS): Likewise.
        * m4/monetary_h.m4 (gl_MONETARY_H_DEFAULTS): Likewise.
        * m4/netdb_h.m4 (gl_NETDB_H_DEFAULTS): Likewise.
        * m4/poll_h.m4 (gl_POLL_H_DEFAULTS): Likewise.
        * m4/pthread_h.m4 (gl_PTHREAD_H_DEFAULTS): Likewise.
        * m4/pty_h.m4 (gl_PTY_H_DEFAULTS): Likewise.
        * m4/sched_h.m4 (gl_SCHED_H_DEFAULTS): Likewise.
        * m4/search_h.m4 (gl_SEARCH_H_DEFAULTS): Likewise.
        * m4/signal_h.m4 (gl_SIGNAL_H_DEFAULTS): Likewise.
        * m4/spawn_h.m4 (gl_SPAWN_H_DEFAULTS): Likewise.
        * m4/stdio_h.m4 (gl_STDIO_H_DEFAULTS): Likewise.
        * m4/stdlib_h.m4 (gl_STDLIB_H_DEFAULTS): Likewise.
        * m4/string_h.m4 (gl_HEADER_STRING_H_DEFAULTS): Likewise.
        * m4/strings_h.m4 (gl_HEADER_STRINGS_H_DEFAULTS): Likewise.
        * m4/sys_file_h.m4 (gl_HEADER_SYS_FILE_H_DEFAULTS): Likewise.
        * m4/sys_ioctl_h.m4 (gl_SYS_IOCTL_H_DEFAULTS): Likewise.
        * m4/sys_random_h.m4 (gl_SYS_RANDOM_H_DEFAULTS): Likewise.
        * m4/sys_resource_h.m4 (gl_SYS_RESOURCE_H_DEFAULTS): Likewise.
        * m4/sys_select_h.m4 (gl_SYS_SELECT_H_DEFAULTS): Likewise.
        * m4/sys_socket_h.m4 (gl_SYS_SOCKET_H_DEFAULTS): Likewise.
        * m4/sys_stat_h.m4 (gl_SYS_STAT_H_DEFAULTS): Likewise.
        * m4/sys_time_h.m4 (gl_HEADER_SYS_TIME_H_DEFAULTS): Likewise.
        * m4/sys_times_h.m4 (gl_SYS_TIMES_H_DEFAULTS): Likewise.
        * m4/sys_utsname_h.m4 (gl_SYS_UTSNAME_H_DEFAULTS): Likewise.
        * m4/sys_wait_h.m4 (gl_SYS_WAIT_H_DEFAULTS): Likewise.
        * m4/termios_h.m4 (gl_TERMIOS_H_DEFAULTS): Likewise.
        * m4/threads.m4 (gl_THREADS_H_DEFAULTS): Likewise.
        * m4/time_h.m4 (gl_HEADER_TIME_H_DEFAULTS): Likewise.
        * m4/uchar.m4 (gl_UCHAR_H_DEFAULTS): Likewise.
        * m4/unistd_h.m4 (gl_UNISTD_H_DEFAULTS): Likewise.
        * m4/utime_h.m4 (gl_UTIME_H_DEFAULTS): Likewise.
        * m4/wchar_h.m4 (gl_WCHAR_H_DEFAULTS): Likewise.
        * m4/wctype_h.m4 (gl_WCTYPE_H_DEFAULTS): Likewise.

diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
index f2eff10..8faec20 100644
--- a/m4/gnulib-common.m4
+++ b/m4/gnulib-common.m4
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 63
+# gnulib-common.m4 serial 64
 dnl Copyright (C) 2007-2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -357,6 +357,16 @@ AC_DEFUN([gl_COMMON_BODY], [
   export LIBC_FATAL_STDERR_
 ])
 
+# gl_MODULE_INDICATOR_INIT_VARIABLE([variablename])
+# gl_MODULE_INDICATOR_INIT_VARIABLE([variablename], [initialvalue])
+# initializes the shell variable that indicates the presence of the given 
module
+# as a C preprocessor expression.
+AC_DEFUN([gl_MODULE_INDICATOR_INIT_VARIABLE],
+[
+  [$1]=m4_if([$2], , [0], [$2])
+  AC_SUBST([$1])
+])
+
 # gl_MODULE_INDICATOR_CONDITION
 # expands to a C preprocessor expression that evaluates to 1 or 0, depending
 # whether a gnulib module that has been requested shall be considered present
diff --git a/m4/arpa_inet_h.m4 b/m4/arpa_inet_h.m4
index c4e386d..75be935 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-2021 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,8 +49,8 @@ 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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_INET_NTOP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_INET_PTON])
   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])
diff --git a/m4/ctype.m4 b/m4/ctype.m4
index 06efe61..309c2e6 100644
--- a/m4/ctype.m4
+++ b/m4/ctype.m4
@@ -1,4 +1,4 @@
-# ctype_h.m4 serial 6
+# ctype_h.m4 serial 7
 dnl Copyright (C) 2009-2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -26,7 +26,7 @@ AC_DEFUN([gl_CTYPE_MODULE_INDICATOR],
 
 AC_DEFUN([gl_CTYPE_H_DEFAULTS],
 [
-  GNULIB_ISBLANK=0; AC_SUBST([GNULIB_ISBLANK])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISBLANK])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_ISBLANK=1;   AC_SUBST([HAVE_ISBLANK])
 ])
diff --git a/m4/dirent_h.m4 b/m4/dirent_h.m4
index 6d86142..c3589df 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-2021 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,14 +39,14 @@ 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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPENDIR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READDIR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REWINDDIR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CLOSEDIR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DIRFD])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDOPENDIR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SCANDIR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ALPHASORT])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_OPENDIR=1;       AC_SUBST([HAVE_OPENDIR])
   HAVE_READDIR=1;       AC_SUBST([HAVE_READDIR])
diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4
index e63a82f..3a82840 100644
--- a/m4/fcntl_h.m4
+++ b/m4/fcntl_h.m4
@@ -1,4 +1,4 @@
-# serial 17
+# serial 18
 # Configure fcntl.h.
 dnl Copyright (C) 2006-2007, 2009-2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -37,14 +37,14 @@ 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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CREAT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCNTL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NONBLOCKING])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPEN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPENAT])
   dnl Support Microsoft deprecated alias function names by default.
-  GNULIB_MDA_CREAT=1;    AC_SUBST([GNULIB_MDA_CREAT])
-  GNULIB_MDA_OPEN=1;     AC_SUBST([GNULIB_MDA_OPEN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CREAT], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_OPEN], [1])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_FCNTL=1;          AC_SUBST([HAVE_FCNTL])
   HAVE_OPENAT=1;         AC_SUBST([HAVE_OPENAT])
diff --git a/m4/fnmatch_h.m4 b/m4/fnmatch_h.m4
index 7840b4a..cdda621 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-2021 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,7 +68,7 @@ AC_DEFUN([gl_FNMATCH_MODULE_INDICATOR],
 
 AC_DEFUN([gl_FNMATCH_H_DEFAULTS],
 [
-  GNULIB_FNMATCH=0;          AC_SUBST([GNULIB_FNMATCH])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FNMATCH])
   dnl Assume POSIX behavior unless another module says otherwise.
   HAVE_FNMATCH=1;            AC_SUBST([HAVE_FNMATCH])
   REPLACE_FNMATCH=0;         AC_SUBST([REPLACE_FNMATCH])
diff --git a/m4/glob_h.m4 b/m4/glob_h.m4
index ef4c9cc..cb2c5f7 100644
--- a/m4/glob_h.m4
+++ b/m4/glob_h.m4
@@ -1,4 +1,4 @@
-# glob_h.m4 serial 5
+# glob_h.m4 serial 6
 dnl Copyright (C) 2018-2021 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,7 +63,7 @@ AC_DEFUN([gl_GLOB_MODULE_INDICATOR],
 
 AC_DEFUN([gl_GLOB_H_DEFAULTS],
 [
-  GNULIB_GLOB=0;             AC_SUBST([GNULIB_GLOB])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GLOB])
   dnl Assume POSIX and GNU behavior unless another module says otherwise.
   HAVE_GLOB=1;               AC_SUBST([HAVE_GLOB])
   HAVE_GLOB_PATTERN_P=1;     AC_SUBST([HAVE_GLOB_PATTERN_P])
diff --git a/m4/iconv_h.m4 b/m4/iconv_h.m4
index ab8e283..bdbb79f 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-2021 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,7 +39,7 @@ 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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ICONV])
   dnl Assume proper GNU behavior unless another module says otherwise.
   ICONV_CONST=;         AC_SUBST([ICONV_CONST])
   REPLACE_ICONV=0;      AC_SUBST([REPLACE_ICONV])
diff --git a/m4/inttypes.m4 b/m4/inttypes.m4
index f56e94a..0a816ae 100644
--- a/m4/inttypes.m4
+++ b/m4/inttypes.m4
@@ -1,4 +1,4 @@
-# inttypes.m4 serial 32
+# inttypes.m4 serial 33
 dnl Copyright (C) 2006-2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -145,10 +145,10 @@ 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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_IMAXABS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_IMAXDIV])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOIMAX])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOUMAX])
   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])
diff --git a/m4/langinfo_h.m4 b/m4/langinfo_h.m4
index 950fe20..d7fd95c 100644
--- a/m4/langinfo_h.m4
+++ b/m4/langinfo_h.m4
@@ -1,4 +1,4 @@
-# langinfo_h.m4 serial 9
+# langinfo_h.m4 serial 10
 dnl Copyright (C) 2009-2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -115,7 +115,7 @@ AC_DEFUN([gl_LANGINFO_MODULE_INDICATOR],
 
 AC_DEFUN([gl_LANGINFO_H_DEFAULTS],
 [
-  GNULIB_NL_LANGINFO=0;  AC_SUBST([GNULIB_NL_LANGINFO])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NL_LANGINFO])
   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])
diff --git a/m4/locale_h.m4 b/m4/locale_h.m4
index 7b50aa7..7a08334 100644
--- a/m4/locale_h.m4
+++ b/m4/locale_h.m4
@@ -1,4 +1,4 @@
-# locale_h.m4 serial 25
+# locale_h.m4 serial 26
 dnl Copyright (C) 2007, 2009-2021 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,11 +140,11 @@ 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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALECONV])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETLOCALE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETLOCALE_NULL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUPLOCALE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALENAME])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_NEWLOCALE=1;       AC_SUBST([HAVE_NEWLOCALE])
   HAVE_DUPLOCALE=1;       AC_SUBST([HAVE_DUPLOCALE])
diff --git a/m4/malloc_h.m4 b/m4/malloc_h.m4
index d3112f5..4e64b51 100644
--- a/m4/malloc_h.m4
+++ b/m4/malloc_h.m4
@@ -1,4 +1,4 @@
-# malloc_h.m4 serial 1
+# malloc_h.m4 serial 2
 dnl Copyright (C) 2020-2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -40,7 +40,7 @@ AC_DEFUN([gl_MALLOC_MODULE_INDICATOR],
 
 AC_DEFUN([gl_MALLOC_H_DEFAULTS],
 [
-  GNULIB_MEMALIGN=0;      AC_SUBST([GNULIB_MEMALIGN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMALIGN])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_MEMALIGN=1;        AC_SUBST([HAVE_MEMALIGN])
   REPLACE_MEMALIGN=0;     AC_SUBST([REPLACE_MEMALIGN])
diff --git a/m4/math_h.m4 b/m4/math_h.m4
index a9ba5e6..1cd81c9 100644
--- a/m4/math_h.m4
+++ b/m4/math_h.m4
@@ -1,4 +1,4 @@
-# math_h.m4 serial 122
+# math_h.m4 serial 123
 dnl Copyright (C) 2007-2021 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,108 +64,108 @@ 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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACOSF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACOSL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ASINF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ASINL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATANF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATANL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATAN2F])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CBRT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CBRTF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CBRTL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CEIL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CEILF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CEILL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPYSIGN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPYSIGNF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPYSIGNL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COSF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COSL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COSHF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXP2])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXP2F])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXP2L])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPM1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPM1F])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPM1L])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FABSF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FABSL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOOR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOORF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOORL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMA])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMAF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMAL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMOD])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMODF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FMODL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXPF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXPL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOTF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOTL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGB])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGBF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ILOGBL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISFINITE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISINF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNAN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNANF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNAND])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNANL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LDEXPF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LDEXPL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG10])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG10F])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG10L])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG1P])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG1PF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG1PL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG2])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG2F])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG2L])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGB])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGBF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGBL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODFF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODFL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POWF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMAINDER])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMAINDERF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMAINDERL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RINT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RINTF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RINTL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUND])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUNDF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUNDL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNBIT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINHF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SQRTF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SQRTL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANHF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNC])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCL])
   dnl Support Microsoft deprecated alias function names by default.
-  GNULIB_MDA_J0=1;     AC_SUBST([GNULIB_MDA_J0])
-  GNULIB_MDA_J1=1;     AC_SUBST([GNULIB_MDA_J1])
-  GNULIB_MDA_JN=1;     AC_SUBST([GNULIB_MDA_JN])
-  GNULIB_MDA_Y0=1;     AC_SUBST([GNULIB_MDA_Y0])
-  GNULIB_MDA_Y1=1;     AC_SUBST([GNULIB_MDA_Y1])
-  GNULIB_MDA_YN=1;     AC_SUBST([GNULIB_MDA_YN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_J0], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_J1], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_JN], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_Y0], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_Y1], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_YN], [1])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_ACOSF=1;                     AC_SUBST([HAVE_ACOSF])
   HAVE_ACOSL=1;                     AC_SUBST([HAVE_ACOSL])
diff --git a/m4/monetary_h.m4 b/m4/monetary_h.m4
index 5afa1f6..f42bf0a 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-2021 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,7 +56,7 @@ AC_DEFUN([gl_MONETARY_MODULE_INDICATOR],
 
 AC_DEFUN([gl_MONETARY_H_DEFAULTS],
 [
-  GNULIB_STRFMON_L=0;      AC_SUBST([GNULIB_STRFMON_L])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRFMON_L])
   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])
diff --git a/m4/netdb_h.m4 b/m4/netdb_h.m4
index db84c78..b52243b 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-2021 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,7 +32,7 @@ AC_DEFUN([gl_NETDB_MODULE_INDICATOR],
 
 AC_DEFUN([gl_NETDB_H_DEFAULTS],
 [
-  GNULIB_GETADDRINFO=0; AC_SUBST([GNULIB_GETADDRINFO])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETADDRINFO])
   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])
diff --git a/m4/poll_h.m4 b/m4/poll_h.m4
index 20692d8..d1f7c70 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-2021 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,7 +42,7 @@ AC_DEFUN([gl_POLL_MODULE_INDICATOR],
 
 AC_DEFUN([gl_POLL_H_DEFAULTS],
 [
-  GNULIB_POLL=0;        AC_SUBST([GNULIB_POLL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POLL])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_POLL=1;          AC_SUBST([HAVE_POLL])
   REPLACE_POLL=0;       AC_SUBST([REPLACE_POLL])
diff --git a/m4/pthread_h.m4 b/m4/pthread_h.m4
index 894a23c..6bf74cc 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-2021 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,14 +148,14 @@ 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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_THREAD])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_ONCE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_MUTEX])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_RWLOCK])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_COND])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_TSS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_SPIN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_MUTEX_TIMEDLOCK])
   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])
diff --git a/m4/pty_h.m4 b/m4/pty_h.m4
index 5fa1363..801991d 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-2021 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,8 +61,8 @@ 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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FORKPTY])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPENPTY])
   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])
diff --git a/m4/sched_h.m4 b/m4/sched_h.m4
index 8eecc7d..d461277 100644
--- a/m4/sched_h.m4
+++ b/m4/sched_h.m4
@@ -1,4 +1,4 @@
-# sched_h.m4 serial 12
+# sched_h.m4 serial 13
 dnl Copyright (C) 2008-2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -84,7 +84,7 @@ AC_DEFUN([gl_SCHED_MODULE_INDICATOR],
 
 AC_DEFUN([gl_SCHED_H_DEFAULTS],
 [
-  GNULIB_SCHED_YIELD=0;  AC_SUBST([GNULIB_SCHED_YIELD])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SCHED_YIELD])
   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])
diff --git a/m4/search_h.m4 b/m4/search_h.m4
index 9fafc71..ca4fc35 100644
--- a/m4/search_h.m4
+++ b/m4/search_h.m4
@@ -1,4 +1,4 @@
-# search_h.m4 serial 12
+# search_h.m4 serial 13
 dnl Copyright (C) 2007-2021 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,10 @@ AC_DEFUN([gl_SEARCH_MODULE_INDICATOR],
 
 AC_DEFUN([gl_SEARCH_H_DEFAULTS],
 [
-  GNULIB_TSEARCH=0; AC_SUBST([GNULIB_TSEARCH])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TSEARCH])
   dnl Support Microsoft deprecated alias function names by default.
-  GNULIB_MDA_LFIND=1;   AC_SUBST([GNULIB_MDA_LFIND])
-  GNULIB_MDA_LSEARCH=1; AC_SUBST([GNULIB_MDA_LSEARCH])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_LFIND], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_LSEARCH], [1])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_TSEARCH=1;    AC_SUBST([HAVE_TSEARCH])
   HAVE_TWALK=1;      AC_SUBST([HAVE_TWALK])
diff --git a/m4/signal_h.m4 b/m4/signal_h.m4
index ff9f025..d466d52 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-2021 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,11 +63,11 @@ 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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_SIGMASK])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RAISE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNAL_H_SIGPIPE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGPROCMASK])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGACTION])
   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])
diff --git a/m4/spawn_h.m4 b/m4/spawn_h.m4
index 02a8fa5..f1ba442 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-2021 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,29 +90,29 @@ 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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWNP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2])
+  
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWNATTR_INIT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWNATTR_GETFLAGS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWNATTR_SETFLAGS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWNATTR_GETPGROUP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWNATTR_SETPGROUP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWNATTR_GETSIGMASK])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWNATTR_SETSIGMASK])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_SPAWNATTR_DESTROY])
   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])
diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4
index 4c3f24a..53e98c3 100644
--- a/m4/stdio_h.m4
+++ b/m4/stdio_h.m4
@@ -1,4 +1,4 @@
-# stdio_h.m4 serial 52
+# stdio_h.m4 serial 53
 dnl Copyright (C) 2007-2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -127,66 +127,66 @@ 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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DPRINTF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCLOSE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDOPEN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFLUSH])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FGETC])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FGETS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FOPEN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPRINTF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPRINTF_POSIX])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPURGE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPUTC])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FPUTS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREAD])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREOPEN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSCANF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSEEK])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSEEKO])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTELL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTELLO])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FWRITE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETC])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETCHAR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDELIM])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLINE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_PRINTF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_PRINTF_POSIX])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PCLOSE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PERROR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POPEN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PRINTF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PRINTF_POSIX])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTC])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTCHAR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REMOVE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RENAME])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RENAMEAT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SCANF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SNPRINTF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SPRINTF_POSIX])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_NONBLOCKING])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_SIGPIPE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TMPFILE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VASPRINTF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFSCANF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSCANF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VDPRINTF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFPRINTF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFPRINTF_POSIX])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF_POSIX])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSNPRINTF])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSPRINTF_POSIX])
   dnl Support Microsoft deprecated alias function names by default.
-  GNULIB_MDA_FCLOSEALL=1;        AC_SUBST([GNULIB_MDA_FCLOSEALL])
-  GNULIB_MDA_FDOPEN=1;           AC_SUBST([GNULIB_MDA_FDOPEN])
-  GNULIB_MDA_FILENO=1;           AC_SUBST([GNULIB_MDA_FILENO])
-  GNULIB_MDA_GETW=1;             AC_SUBST([GNULIB_MDA_GETW])
-  GNULIB_MDA_PUTW=1;             AC_SUBST([GNULIB_MDA_PUTW])
-  GNULIB_MDA_TEMPNAM=1;          AC_SUBST([GNULIB_MDA_TEMPNAM])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCLOSEALL], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FDOPEN], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FILENO], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETW], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_PUTW], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TEMPNAM], [1])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_DECL_FCLOSEALL=1;         AC_SUBST([HAVE_DECL_FCLOSEALL])
   HAVE_DECL_FPURGE=1;            AC_SUBST([HAVE_DECL_FPURGE])
diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4
index 5fdb0a7..978293a 100644
--- a/m4/stdlib_h.m4
+++ b/m4/stdlib_h.m4
@@ -1,4 +1,4 @@
-# stdlib_h.m4 serial 59
+# stdlib_h.m4 serial 60
 dnl Copyright (C) 2007-2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -57,52 +57,52 @@ AC_DEFUN([gl_STDLIB_MODULE_INDICATOR],
 
 AC_DEFUN([gl_STDLIB_H_DEFAULTS],
 [
-  GNULIB__EXIT=0;         AC_SUBST([GNULIB__EXIT])
-  GNULIB_ALIGNED_ALLOC=0; AC_SUBST([GNULIB_ALIGNED_ALLOC])
-  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_FREE_POSIX=0;    AC_SUBST([GNULIB_FREE_POSIX])
-  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_MEMALIGN=0;AC_SUBST([GNULIB_POSIX_MEMALIGN])
-  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_STRTOL=0;        AC_SUBST([GNULIB_STRTOL])
-  GNULIB_STRTOLD=0;       AC_SUBST([GNULIB_STRTOLD])
-  GNULIB_STRTOLL=0;       AC_SUBST([GNULIB_STRTOLL])
-  GNULIB_STRTOUL=0;       AC_SUBST([GNULIB_STRTOUL])
-  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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB__EXIT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ALIGNED_ALLOC])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATOLL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CALLOC_POSIX])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CANONICALIZE_FILE_NAME])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREE_POSIX])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOADAVG])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSUBOPT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GRANTPT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MALLOC_POSIX])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBTOWC])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDTEMP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKOSTEMP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKOSTEMPS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKSTEMP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKSTEMPS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_MEMALIGN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POSIX_OPENPT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTSNAME])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTSNAME_R])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTENV])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_QSORT_R])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM_R])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOCARRAY])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOC_POSIX])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALPATH])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RPMATCH])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SECURE_GETENV])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETENV])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOD])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLD])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOUL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOULL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYSTEM_POSIX])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLOCKPT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNSETENV])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTOMB])
   dnl Support Microsoft deprecated alias function names by default.
-  GNULIB_MDA_ECVT=1;      AC_SUBST([GNULIB_MDA_ECVT])
-  GNULIB_MDA_FCVT=1;      AC_SUBST([GNULIB_MDA_FCVT])
-  GNULIB_MDA_GCVT=1;      AC_SUBST([GNULIB_MDA_GCVT])
-  GNULIB_MDA_MKTEMP=1;    AC_SUBST([GNULIB_MDA_MKTEMP])
-  GNULIB_MDA_PUTENV=1;    AC_SUBST([GNULIB_MDA_PUTENV])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ECVT], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCVT], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GCVT], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MKTEMP], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_PUTENV], [1])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE__EXIT=1;              AC_SUBST([HAVE__EXIT])
   HAVE_ALIGNED_ALLOC=1;      AC_SUBST([HAVE_ALIGNED_ALLOC])
diff --git a/m4/string_h.m4 b/m4/string_h.m4
index a4cc5b4..f0f934f 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 29
+# serial 30
 
 # Written by Paul Eggert.
 
@@ -44,51 +44,51 @@ 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_STRERRORNAME_NP=0;  AC_SUBST([GNULIB_STRERRORNAME_NP])
-  GNULIB_SIGABBREV_NP=0;     AC_SUBST([GNULIB_SIGABBREV_NP])
-  GNULIB_SIGDESCR_NP=0;      AC_SUBST([GNULIB_SIGDESCR_NP])
-  GNULIB_STRSIGNAL=0;        AC_SUBST([GNULIB_STRSIGNAL])
-  GNULIB_STRVERSCMP=0;       AC_SUBST([GNULIB_STRVERSCMP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXPLICIT_BZERO])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFSL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFSLL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMCHR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMMEM])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMPCPY])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMRCHR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RAWMEMCHR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STPCPY])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STPNCPY])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCHRNUL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRDUP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNCAT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNDUP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNLEN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPBRK])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSEP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSTR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCASESTR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOK_R])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSLEN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNLEN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCHR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRCHR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSTR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCASECMP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNCASECMP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSPCASECMP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCASESTR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCSPN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSPBRK])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSPN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSEP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSTOK_R])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR_R])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERRORNAME_NP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGABBREV_NP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGDESCR_NP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSIGNAL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRVERSCMP])
   HAVE_MBSLEN=0;             AC_SUBST([HAVE_MBSLEN])
   dnl Support Microsoft deprecated alias function names by default.
-  GNULIB_MDA_MEMCCPY=1;      AC_SUBST([GNULIB_MDA_MEMCCPY])
-  GNULIB_MDA_STRDUP=1;       AC_SUBST([GNULIB_MDA_STRDUP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MEMCCPY], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_STRDUP], [1])
   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])
diff --git a/m4/strings_h.m4 b/m4/strings_h.m4
index 1dc2212..6f7b07a 100644
--- a/m4/strings_h.m4
+++ b/m4/strings_h.m4
@@ -1,5 +1,5 @@
 # Configure a replacement for <strings.h>.
-# serial 6
+# serial 7
 
 # Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -44,7 +44,7 @@ AC_DEFUN([gl_STRINGS_MODULE_INDICATOR],
 
 AC_DEFUN([gl_HEADER_STRINGS_H_DEFAULTS],
 [
-  GNULIB_FFS=0;            AC_SUBST([GNULIB_FFS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFS])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_FFS=1;              AC_SUBST([HAVE_FFS])
   HAVE_STRCASECMP=1;       AC_SUBST([HAVE_STRCASECMP])
diff --git a/m4/sys_file_h.m4 b/m4/sys_file_h.m4
index 99c2285..ab3e3ab 100644
--- a/m4/sys_file_h.m4
+++ b/m4/sys_file_h.m4
@@ -1,5 +1,5 @@
 # Configure a replacement for <sys/file.h>.
-# serial 6
+# serial 7
 
 # Copyright (C) 2008-2021 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOCK])
   HAVE_FLOCK=1;          AC_SUBST([HAVE_FLOCK])
 ])
diff --git a/m4/sys_ioctl_h.m4 b/m4/sys_ioctl_h.m4
index 4d7267f..941bf86 100644
--- a/m4/sys_ioctl_h.m4
+++ b/m4/sys_ioctl_h.m4
@@ -1,4 +1,4 @@
-# sys_ioctl_h.m4 serial 12
+# sys_ioctl_h.m4 serial 13
 dnl Copyright (C) 2008-2021 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,7 +55,7 @@ AC_DEFUN([gl_SYS_IOCTL_MODULE_INDICATOR],
 
 AC_DEFUN([gl_SYS_IOCTL_H_DEFAULTS],
 [
-  GNULIB_IOCTL=0;         AC_SUBST([GNULIB_IOCTL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_IOCTL])
   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;
diff --git a/m4/sys_random_h.m4 b/m4/sys_random_h.m4
index 45e0469..d5f9754 100644
--- a/m4/sys_random_h.m4
+++ b/m4/sys_random_h.m4
@@ -1,4 +1,4 @@
-# sys_random_h.m4 serial 5
+# sys_random_h.m4 serial 6
 dnl Copyright (C) 2020-2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -46,7 +46,7 @@ AC_DEFUN([gl_SYS_RANDOM_MODULE_INDICATOR],
 
 AC_DEFUN([gl_SYS_RANDOM_H_DEFAULTS],
 [
-  GNULIB_GETRANDOM=0;     AC_SUBST([GNULIB_GETRANDOM])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETRANDOM])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_GETRANDOM=1;       AC_SUBST([HAVE_GETRANDOM])
   REPLACE_GETRANDOM=0;    AC_SUBST([REPLACE_GETRANDOM])
diff --git a/m4/sys_resource_h.m4 b/m4/sys_resource_h.m4
index 2b65f19..0331f83 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-2021 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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETRUSAGE])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_GETRUSAGE=1;       AC_SUBST([HAVE_GETRUSAGE])
 ])
diff --git a/m4/sys_select_h.m4 b/m4/sys_select_h.m4
index 4b33d31..8fefc54 100644
--- a/m4/sys_select_h.m4
+++ b/m4/sys_select_h.m4
@@ -1,4 +1,4 @@
-# sys_select_h.m4 serial 20
+# sys_select_h.m4 serial 21
 dnl Copyright (C) 2006-2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -86,8 +86,8 @@ 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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PSELECT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SELECT])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_PSELECT=1; AC_SUBST([HAVE_PSELECT])
   REPLACE_PSELECT=0; AC_SUBST([REPLACE_PSELECT])
diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4
index 503cb96..fbaf989 100644
--- a/m4/sys_socket_h.m4
+++ b/m4/sys_socket_h.m4
@@ -1,4 +1,4 @@
-# sys_socket_h.m4 serial 25
+# sys_socket_h.m4 serial 26
 dnl Copyright (C) 2005-2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -167,21 +167,21 @@ 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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SOCKET])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CONNECT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCEPT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BIND])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPEERNAME])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSOCKNAME])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSOCKOPT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LISTEN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RECV])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SEND])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RECVFROM])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SENDTO])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETSOCKOPT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SHUTDOWN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([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])
diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4
index 23cbdd2..506a0fc 100644
--- a/m4/sys_stat_h.m4
+++ b/m4/sys_stat_h.m4
@@ -1,4 +1,4 @@
-# sys_stat_h.m4 serial 38   -*- Autoconf -*-
+# sys_stat_h.m4 serial 39   -*- Autoconf -*-
 dnl Copyright (C) 2006-2021 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,26 +64,26 @@ 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_GETUMASK=0;    AC_SUBST([GNULIB_GETUMASK])
-  GNULIB_LCHMOD=0;      AC_SUBST([GNULIB_LCHMOD])
-  GNULIB_LSTAT=0;       AC_SUBST([GNULIB_LSTAT])
-  GNULIB_MKDIR=0;       AC_SUBST([GNULIB_MKDIR])
-  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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHMODAT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTAT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTATAT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FUTIMENS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETUMASK])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LCHMOD])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LSTAT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDIR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDIRAT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKFIFO])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKFIFOAT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKNOD])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKNODAT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STAT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UTIMENSAT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OVERRIDES_STRUCT_STAT])
   dnl Support Microsoft deprecated alias function names by default.
-  GNULIB_MDA_CHMOD=1;   AC_SUBST([GNULIB_MDA_CHMOD])
-  GNULIB_MDA_MKDIR=1;   AC_SUBST([GNULIB_MDA_MKDIR])
-  GNULIB_MDA_UMASK=1;   AC_SUBST([GNULIB_MDA_UMASK])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CHMOD], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MKDIR], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_UMASK], [1])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_FCHMODAT=1;      AC_SUBST([HAVE_FCHMODAT])
   HAVE_FSTATAT=1;       AC_SUBST([HAVE_FSTATAT])
diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4
index 64f133d..040b122 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-2021 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -100,7 +100,7 @@ AC_DEFUN([gl_SYS_TIME_MODULE_INDICATOR],
 
 AC_DEFUN([gl_HEADER_SYS_TIME_H_DEFAULTS],
 [
-  GNULIB_GETTIMEOFDAY=0;     AC_SUBST([GNULIB_GETTIMEOFDAY])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETTIMEOFDAY])
   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])
diff --git a/m4/sys_times_h.m4 b/m4/sys_times_h.m4
index b9daaa7..5e79934 100644
--- a/m4/sys_times_h.m4
+++ b/m4/sys_times_h.m4
@@ -1,5 +1,5 @@
 # Configure a replacement for <sys/times.h>.
-# serial 8
+# serial 9
 
 # Copyright (C) 2008-2021 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -45,7 +45,7 @@ AC_DEFUN([gl_SYS_TIMES_MODULE_INDICATOR],
 
 AC_DEFUN([gl_SYS_TIMES_H_DEFAULTS],
 [
-  GNULIB_TIMES=0;     AC_SUBST([GNULIB_TIMES])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMES])
   HAVE_STRUCT_TMS=1;  AC_SUBST([HAVE_STRUCT_TMS])
   HAVE_TIMES=1;       AC_SUBST([HAVE_TIMES])
 ])
diff --git a/m4/sys_utsname_h.m4 b/m4/sys_utsname_h.m4
index 6033eab..36b8271 100644
--- a/m4/sys_utsname_h.m4
+++ b/m4/sys_utsname_h.m4
@@ -1,4 +1,4 @@
-# sys_utsname_h.m4 serial 8
+# sys_utsname_h.m4 serial 9
 dnl Copyright (C) 2009-2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@ AC_DEFUN([gl_SYS_UTSNAME_MODULE_INDICATOR],
 
 AC_DEFUN([gl_SYS_UTSNAME_H_DEFAULTS],
 [
-  GNULIB_UNAME=0;         AC_SUBST([GNULIB_UNAME])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNAME])
   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])
diff --git a/m4/sys_wait_h.m4 b/m4/sys_wait_h.m4
index 96e9ba2..9fe34b4 100644
--- a/m4/sys_wait_h.m4
+++ b/m4/sys_wait_h.m4
@@ -1,4 +1,4 @@
-# sys_wait_h.m4 serial 6
+# sys_wait_h.m4 serial 7
 dnl Copyright (C) 2008-2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -31,6 +31,6 @@ AC_DEFUN([gl_SYS_WAIT_MODULE_INDICATOR],
 
 AC_DEFUN([gl_SYS_WAIT_H_DEFAULTS],
 [
-  GNULIB_WAITPID=0; AC_SUBST([GNULIB_WAITPID])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WAITPID])
   dnl Assume proper GNU behavior unless another module says otherwise.
 ])
diff --git a/m4/termios_h.m4 b/m4/termios_h.m4
index 5a610ee..825758e 100644
--- a/m4/termios_h.m4
+++ b/m4/termios_h.m4
@@ -1,4 +1,4 @@
-# termios_h.m4 serial 4
+# termios_h.m4 serial 5
 dnl Copyright (C) 2010-2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -36,7 +36,7 @@ AC_DEFUN([gl_TERMIOS_MODULE_INDICATOR],
 
 AC_DEFUN([gl_TERMIOS_H_DEFAULTS],
 [
-  GNULIB_TCGETSID=0;      AC_SUBST([GNULIB_TCGETSID])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TCGETSID])
   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])
diff --git a/m4/threads.m4 b/m4/threads.m4
index f8e16e6..14b7ca8 100644
--- a/m4/threads.m4
+++ b/m4/threads.m4
@@ -1,4 +1,4 @@
-# threads.m4 serial 7
+# threads.m4 serial 8
 dnl Copyright (C) 2019-2021 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,10 +148,10 @@ 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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CND])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MTX])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_THRD])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TSS])
   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])
diff --git a/m4/time_h.m4 b/m4/time_h.m4
index b6a1aa3..e0dd2f0 100644
--- a/m4/time_h.m4
+++ b/m4/time_h.m4
@@ -2,7 +2,7 @@
 
 # Copyright (C) 2000-2001, 2003-2007, 2009-2021 Free Software Foundation, Inc.
 
-# serial 15
+# serial 16
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -122,19 +122,19 @@ 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_TIMESPEC_GET=0;                 AC_SUBST([GNULIB_TIMESPEC_GET])
-  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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CTIME])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKTIME])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALTIME])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NANOSLEEP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRFTIME])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPTIME])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMEGM])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMESPEC_GET])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_R])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_RZ])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TZSET])
   dnl Support Microsoft deprecated alias function names by default.
-  GNULIB_MDA_TZSET=1;                    AC_SUBST([GNULIB_MDA_TZSET])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TZSET], [1])
   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])
diff --git a/m4/uchar.m4 b/m4/uchar.m4
index 268d81a..0729541 100644
--- a/m4/uchar.m4
+++ b/m4/uchar.m4
@@ -1,4 +1,4 @@
-# uchar.m4 serial 16
+# uchar.m4 serial 17
 dnl Copyright (C) 2019-2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -127,30 +127,30 @@ 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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OVERRIDES_CHAR16_T])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OVERRIDES_CHAR32_T])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BTOC32])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISALNUM])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISALPHA])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISBLANK])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISCNTRL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISDIGIT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISGRAPH])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISLOWER])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISPRINT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISPUNCT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISSPACE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISUPPER])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISXDIGIT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32RTOMB])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32SNRTOMBS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32SRTOMBS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32STOMBS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32TOB])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRTOC32])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNRTOC32S])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRTOC32S])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSTOC32S])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_C32RTOMB=1;             AC_SUBST([HAVE_C32RTOMB])
   HAVE_MBRTOC32=1;             AC_SUBST([HAVE_MBRTOC32])
diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4
index 0f26fb9..ffa36b0 100644
--- a/m4/unistd_h.m4
+++ b/m4/unistd_h.m4
@@ -1,4 +1,4 @@
-# unistd_h.m4 serial 85
+# unistd_h.m4 serial 86
 dnl Copyright (C) 2006-2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -70,89 +70,89 @@ 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_EXECL=0;                AC_SUBST([GNULIB_EXECL])
-  GNULIB_EXECLE=0;               AC_SUBST([GNULIB_EXECLE])
-  GNULIB_EXECLP=0;               AC_SUBST([GNULIB_EXECLP])
-  GNULIB_EXECV=0;                AC_SUBST([GNULIB_EXECV])
-  GNULIB_EXECVE=0;               AC_SUBST([GNULIB_EXECVE])
-  GNULIB_EXECVP=0;               AC_SUBST([GNULIB_EXECVP])
-  GNULIB_EXECVPE=0;              AC_SUBST([GNULIB_EXECVPE])
-  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_GETENTROPY=0;           AC_SUBST([GNULIB_GETENTROPY])
-  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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ACCESS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHDIR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHOWN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CLOSE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_COPY_FILE_RANGE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP2])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUP3])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ENVIRON])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EUIDACCESS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECLE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECLP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECV])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_EXECVPE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FACCESSAT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHDIR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHOWNAT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDATASYNC])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSYNC])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTRUNCATE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETCWD])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDOMAINNAME])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDTABLESIZE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETENTROPY])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETGROUPS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETHOSTNAME])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOGIN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOGIN_R])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETOPT_POSIX])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPAGESIZE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPASS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETUSERSHELL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GROUP_MEMBER])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISATTY])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LCHOWN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LINK])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LINKAT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LSEEK])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PIPE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PIPE2])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PREAD])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PWRITE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READ])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READLINK])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_READLINKAT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RMDIR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETHOSTNAME])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SLEEP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYMLINK])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SYMLINKAT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCATE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TTYNAME_R])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_NONBLOCKING])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_SIGPIPE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLINK])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNLINKAT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_USLEEP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WRITE])
   dnl Support Microsoft deprecated alias function names by default.
-  GNULIB_MDA_ACCESS=1;           AC_SUBST([GNULIB_MDA_ACCESS])
-  GNULIB_MDA_CHDIR=1;            AC_SUBST([GNULIB_MDA_CHDIR])
-  GNULIB_MDA_CLOSE=1;            AC_SUBST([GNULIB_MDA_CLOSE])
-  GNULIB_MDA_DUP=1;              AC_SUBST([GNULIB_MDA_DUP])
-  GNULIB_MDA_DUP2=1;             AC_SUBST([GNULIB_MDA_DUP2])
-  GNULIB_MDA_EXECL=1;            AC_SUBST([GNULIB_MDA_EXECL])
-  GNULIB_MDA_EXECLE=1;           AC_SUBST([GNULIB_MDA_EXECLE])
-  GNULIB_MDA_EXECLP=1;           AC_SUBST([GNULIB_MDA_EXECLP])
-  GNULIB_MDA_EXECV=1;            AC_SUBST([GNULIB_MDA_EXECV])
-  GNULIB_MDA_EXECVE=1;           AC_SUBST([GNULIB_MDA_EXECVE])
-  GNULIB_MDA_EXECVP=1;           AC_SUBST([GNULIB_MDA_EXECVP])
-  GNULIB_MDA_EXECVPE=1;          AC_SUBST([GNULIB_MDA_EXECVPE])
-  GNULIB_MDA_GETCWD=1;           AC_SUBST([GNULIB_MDA_GETCWD])
-  GNULIB_MDA_GETPID=1;           AC_SUBST([GNULIB_MDA_GETPID])
-  GNULIB_MDA_ISATTY=1;           AC_SUBST([GNULIB_MDA_ISATTY])
-  GNULIB_MDA_LSEEK=1;            AC_SUBST([GNULIB_MDA_LSEEK])
-  GNULIB_MDA_READ=1;             AC_SUBST([GNULIB_MDA_READ])
-  GNULIB_MDA_RMDIR=1;            AC_SUBST([GNULIB_MDA_RMDIR])
-  GNULIB_MDA_SWAB=1;             AC_SUBST([GNULIB_MDA_SWAB])
-  GNULIB_MDA_UNLINK=1;           AC_SUBST([GNULIB_MDA_UNLINK])
-  GNULIB_MDA_WRITE=1;            AC_SUBST([GNULIB_MDA_WRITE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ACCESS], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CHDIR], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CLOSE], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_DUP], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_DUP2], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECL], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECLE], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECLP], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECV], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVE], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVP], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_EXECVPE], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETCWD], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_GETPID], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_ISATTY], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_LSEEK], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_READ], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_RMDIR], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_SWAB], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_UNLINK], [1])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WRITE], [1])
   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])
diff --git a/m4/utime_h.m4 b/m4/utime_h.m4
index 6543db4..895130a 100644
--- a/m4/utime_h.m4
+++ b/m4/utime_h.m4
@@ -1,4 +1,4 @@
-# utime_h.m4 serial 5
+# utime_h.m4 serial 6
 dnl Copyright (C) 2017-2021 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,9 +39,9 @@ AC_DEFUN([gl_UTIME_MODULE_INDICATOR],
 
 AC_DEFUN([gl_UTIME_H_DEFAULTS],
 [
-  GNULIB_UTIME=0;            AC_SUBST([GNULIB_UTIME])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UTIME])
   dnl Support Microsoft deprecated alias function names by default.
-  GNULIB_MDA_UTIME=1;        AC_SUBST([GNULIB_MDA_UTIME])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_UTIME], [1])
   dnl Assume POSIX behavior unless another module says otherwise.
   HAVE_UTIME=1;              AC_SUBST([HAVE_UTIME])
   REPLACE_UTIME=0;           AC_SUBST([REPLACE_UTIME])
diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4
index 59c55fc..cfb72c8 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 50
+# wchar_h.m4 serial 51
 
 AC_DEFUN([gl_WCHAR_H],
 [
@@ -136,49 +136,49 @@ 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_WMEMPCPY=0;    AC_SUBST([GNULIB_WMEMPCPY])
-  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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BTOWC])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTOB])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSINIT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRTOWC])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRLEN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRTOWCS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNRTOWCS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCRTOMB])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSRTOMBS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNRTOMBS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCWIDTH])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCHR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCMP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMCPY])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMMOVE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMPCPY])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WMEMSET])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSLEN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNLEN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCPY])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCPCPY])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCPY])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCPNCPY])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCAT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCAT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCMP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCMP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCASECMP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSNCASECMP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCOLL])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSXFRM])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSDUP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCHR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSRCHR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSCSPN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSSPN])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSPBRK])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSSTR])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSTOK])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSWIDTH])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSFTIME])
   dnl Support Microsoft deprecated alias function names by default.
-  GNULIB_MDA_WCSDUP=1;  AC_SUBST([GNULIB_MDA_WCSDUP])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WCSDUP], [1])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_BTOWC=1;         AC_SUBST([HAVE_BTOWC])
   HAVE_MBSINIT=1;       AC_SUBST([HAVE_MBSINIT])
diff --git a/m4/wctype_h.m4 b/m4/wctype_h.m4
index 1ab0bc9..ea5274c 100644
--- a/m4/wctype_h.m4
+++ b/m4/wctype_h.m4
@@ -1,4 +1,4 @@
-# wctype_h.m4 serial 26
+# wctype_h.m4 serial 27
 
 dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it.
 
@@ -168,13 +168,13 @@ 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])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWBLANK])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWDIGIT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWXDIGIT])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTYPE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWCTYPE])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTRANS])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TOWCTRANS])
   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])




reply via email to

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