diff options
174 files changed, 1647 insertions, 1000 deletions
@@ -1,5 +1,209 @@ 2021-04-11 Bruno Haible <bruno@clisp.org> + Support several gnulib-tool invocations under the same configure.ac. + Reported by Reuben Thomas <rrt@sc3d.org> in + <https://lists.gnu.org/archive/html/bug-gnulib/2021-04/msg00104.html>. + This is done by defining the Gnulib module indicator variables per + gnulib-tool invocation. So that a generated .h file is no longer + influenced by the set of modules used in other gnulib-tool invocations. + * gnulib-tool (func_compute_include_guard_prefix): Set + module_indicator_prefix. + (func_emit_lib_Makefile_am, func_emit_tests_Makefile_am): Use it to + modify $(GNULIB_*) variable references in the Automake snippets. + (func_emit_initmacro_start): Push macro definitions for GL_MACRO_PREFIX + and GL_MODULE_INDICATOR_PREFIX. + (func_emit_initmacro_end): Pop these macro definitions. + * pygnulib/GLConfig.py (GLConfig.getIncludeGuardPrefix): New method. + * pygnulib/GLEmiter.py (GLEmiter.initmacro_start): Push macro + definitions for GL_MACRO_PREFIX and GL_MODULE_INDICATOR_PREFIX. + (GLEmiter.initmacro_end): Pop these macro definitions. + (GLEmiter.lib_Makefile_am, GLEmiter.tests_Makefile_am): Use the module + indicator prefix to modify $(GNULIB_*) variable references in the + Automake snippets. + * m4/gnulib-common.m4 (gl_MODULE_INDICATOR_INIT_VARIABLE, + gl_MODULE_INDICATOR_SET_VARIABLE): Use the value of + GL_MODULE_INDICATOR_PREFIX. + * m4/arpa_inet_h.m4: Use new idiom for header files that contain + references to Gnulib module indicator variables: + - Define the main macro through AC_DEFUN_ONCE. + - Define a macro gl_*_H_REQUIRE_DEFAULTS that initializes the Gnulib + module indicator variables (each prefixed with + GL_MODULE_INDICATOR_PREFIX). + - Invoke this macro in the gl_*_MODULE_INDICATOR macro. + * m4/ctype.m4: Likewise. + * m4/dirent_h.m4: Likewise. + * m4/fcntl_h.m4: Likewise. + * m4/fnmatch_h.m4: Likewise. + * m4/glob_h.m4: Likewise. + * m4/iconv_h.m4: Likewise. + * m4/inttypes.m4: Likewise. + * m4/langinfo_h.m4: Likewise. + * m4/locale_h.m4: Likewise. + * m4/malloc_h.m4: Likewise. + * m4/math_h.m4: Likewise. + * m4/monetary_h.m4: Likewise. + * m4/netdb_h.m4: Likewise. + * m4/poll_h.m4: Likewise. + * m4/pthread_h.m4: Likewise. + * m4/pty_h.m4: Likewise. + * m4/sched_h.m4: Likewise. + * m4/search_h.m4: Likewise. + * m4/signal_h.m4: Likewise. + * m4/spawn_h.m4: Likewise. + * m4/stddef_h.m4: Likewise. + * m4/stdio_h.m4: Likewise. + * m4/stdlib_h.m4: Likewise. + * m4/string_h.m4: Likewise. + * m4/strings_h.m4: Likewise. + * m4/sys_file_h.m4: Likewise. + * m4/sys_ioctl_h.m4: Likewise. + * m4/sys_random_h.m4: Likewise. + * m4/sys_resource_h.m4: Likewise. + * m4/sys_select_h.m4: Likewise. + * m4/sys_socket_h.m4: Likewise. + * m4/sys_stat_h.m4: Likewise. + * m4/sys_time_h.m4: Likewise. + * m4/sys_times_h.m4: Likewise. + * m4/sys_types_h.m4: Likewise. + * m4/sys_uio_h.m4: Likewise. + * m4/sys_utsname_h.m4: Likewise. + * m4/sys_wait_h.m4: Likewise. + * m4/termios_h.m4: Likewise. + * m4/threads.m4: Likewise. + * m4/time_h.m4: Likewise. + * m4/uchar.m4: Likewise. + * m4/unistd_h.m4: Likewise. + * m4/utime_h.m4: Likewise. + * m4/wchar_h.m4: Likewise. + * m4/wctype_h.m4: Likewise. + * modules/arpa_inet (configure.ac): Invoke the macro + gl_*_H_REQUIRE_DEFAULTS explicitly. + * modules/ctype (configure.ac): Likewise. + * modules/dirent (configure.ac): Likewise. + * modules/fcntl-h (configure.ac): Likewise. + * modules/fnmatch-h (configure.ac): Likewise. + * modules/glob-h (configure.ac): Likewise. + * modules/iconv-h (configure.ac): Likewise. + * modules/inttypes-incomplete (configure.ac): Likewise. + * modules/langinfo (configure.ac): Likewise. + * modules/locale (configure.ac): Likewise. + * modules/malloc-h (configure.ac): Likewise. + * modules/math (configure.ac): Likewise. + * modules/monetary (configure.ac): Likewise. + * modules/netdb (configure.ac): Likewise. + * modules/poll-h (configure.ac): Likewise. + * modules/pthread-h (configure.ac): Likewise. + * modules/pty (configure.ac): Likewise. + * modules/sched (configure.ac): Likewise. + * modules/search (configure.ac): Likewise. + * modules/signal-h (configure.ac): Likewise. + * modules/spawn (configure.ac): Likewise. + * modules/stddef (configure.ac): Likewise. + * modules/stdio (configure.ac): Likewise. + * modules/stdlib (configure.ac): Likewise. + * modules/string (configure.ac): Likewise. + * modules/strings (configure.ac): Likewise. + * modules/sys_file (configure.ac): Likewise. + * modules/sys_ioctl (configure.ac): Likewise. + * modules/sys_random (configure.ac): Likewise. + * modules/sys_resource (configure.ac): Likewise. + * modules/sys_select (configure.ac): Likewise. + * modules/sys_socket (configure.ac): Likewise. + * modules/sys_stat (configure.ac): Likewise. + * modules/sys_time (configure.ac): Likewise. + * modules/sys_times (configure.ac): Likewise. + * modules/sys_types (configure.ac): Likewise. + * modules/sys_uio (configure.ac): Likewise. + * modules/sys_utsname (configure.ac): Likewise. + * modules/sys_wait (configure.ac): Likewise. + * modules/termios (configure.ac): Likewise. + * modules/threads-h (configure.ac): Likewise. + * modules/time (configure.ac): Likewise. + * modules/uchar (configure.ac): Likewise. + * modules/unistd (configure.ac): Likewise. + * modules/utime-h (configure.ac): Likewise. + * modules/wchar (configure.ac): Likewise. + * modules/wctype-h (configure.ac): Likewise. + * m4/af_alg.m4: Update after a macro name changed. + * m4/ctime.m4: Likewise. + * m4/explicit_bzero.m4: Likewise. + * m4/ffs.m4: Likewise. + * m4/ffsl.m4: Likewise. + * m4/ffsll.m4: Likewise. + * m4/flock.m4: Likewise. + * m4/fstat.m4: Likewise. + * m4/getaddrinfo.m4: Likewise. + * m4/getdomainname.m4: Likewise. + * m4/gettimeofday.m4: Likewise. + * m4/hostent.m4: Likewise. + * m4/ioctl.m4: Likewise. + * m4/localtime.m4: Likewise. + * m4/mbslen.m4: Likewise. + * m4/memchr.m4: Likewise. + * m4/memmem.m4: Likewise. + * m4/mempcpy.m4: Likewise. + * m4/memrchr.m4: Likewise. + * m4/mktime.m4: Likewise. + * m4/nanosleep.m4: Likewise. + * m4/passfd.m4: Likewise. + * m4/pselect.m4: Likewise. + * m4/rawmemchr.m4: Likewise. + * m4/select.m4: Likewise. + * m4/servent.m4: Likewise. + * m4/sigabbrev_np.m4: Likewise. + * m4/sigdescr_np.m4: Likewise. + * m4/sockpfaf.m4: Likewise. + * m4/stat.m4: Likewise. + * m4/stpcpy.m4: Likewise. + * m4/stpncpy.m4: Likewise. + * m4/strcase.m4: Likewise. + * m4/strcasestr.m4: Likewise. + * m4/strchrnul.m4: Likewise. + * m4/strdup.m4: Likewise. + * m4/strerror.m4: Likewise. + * m4/strerror_r.m4: Likewise. + * m4/strerrorname_np.m4: Likewise. + * m4/strftime-fixes.m4: Likewise. + * m4/strncat.m4: Likewise. + * m4/strndup.m4: Likewise. + * m4/strnlen.m4: Likewise. + * m4/strpbrk.m4: Likewise. + * m4/strptime.m4: Likewise. + * m4/strsep.m4: Likewise. + * m4/strsignal.m4: Likewise. + * m4/strstr.m4: Likewise. + * m4/strtok_r.m4: Likewise. + * m4/strverscmp.m4: Likewise. + * m4/time_r.m4: Likewise. + * m4/time_rz.m4: Likewise. + * m4/timegm.m4: Likewise. + * m4/timespec_get.m4: Likewise. + * m4/tzset.m4: Likewise. + * modules/accept (configure.ac): Likewise. + * modules/bind (configure.ac): Likewise. + * modules/connect (configure.ac): Likewise. + * modules/flock (configure.ac): Likewise. + * modules/getpeername (configure.ac): Likewise. + * modules/getsockname (configure.ac): Likewise. + * modules/getsockopt (configure.ac): Likewise. + * modules/listen (configure.ac): Likewise. + * modules/recv (configure.ac): Likewise. + * modules/recvfrom (configure.ac): Likewise. + * modules/send (configure.ac): Likewise. + * modules/sendto (configure.ac): Likewise. + * modules/setsockopt (configure.ac): Likewise. + * modules/shutdown (configure.ac): Likewise. + * modules/socket (configure.ac): Likewise. Use the + gl_*_H_REQUIRE_DEFAULTS macros. + * modules/nonblocking (configure.ac): Use the gl_*_H_REQUIRE_DEFAULTS + and gl_MODULE_INDICATOR_INIT_VARIABLE macros. + * modules/sigpipe (configure.ac): Likewise. + * modules/windows-stat-override (configure.ac): Likewise. + * m4/nonblocking.m4: Update a comment. + * m4/sigpipe.m4: Likewise. + +2021-04-11 Bruno Haible <bruno@clisp.org> + Rename GNULIB_OVERRIDES_CHAR16_T, GNULIB_OVERRIDES_CHAR32_T. * GNULIBHEADERS_OVERRIDE_CHAR16_T: Renamed from GNULIB_OVERRIDES_CHAR16_T. diff --git a/gnulib-tool b/gnulib-tool index 23b2c44565..1a9a45aaf1 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -3438,13 +3438,14 @@ func_modules_to_filelist_separately () } # func_compute_include_guard_prefix -# Determine include_guard_prefix. +# Determine include_guard_prefix and module_indicator_prefix. # Input: # - macro_prefix prefix of gl_LIBOBJS macros to use # Output: # - include_guard_prefix replacement for ${gl_include_guard_prefix} # - sed_replace_include_guard_prefix # sed expression for resolving ${gl_include_guard_prefix} +# - module_indicator_prefix prefix of GNULIB_<modulename> variables to use func_compute_include_guard_prefix () { if test "$macro_prefix" = gl; then @@ -3453,6 +3454,7 @@ func_compute_include_guard_prefix () include_guard_prefix='GL_'`echo "$macro_prefix" | LC_ALL=C tr '[a-z]' '[A-Z]'` fi sed_replace_include_guard_prefix='s/\${gl_include_guard_prefix}/'"${include_guard_prefix}"'/g' + module_indicator_prefix="${include_guard_prefix}" } # func_execute_command command [args...] @@ -3636,6 +3638,7 @@ func_update_file () # - makefile_name from --makefile-name # - libtool true if libtool will be used, false or blank otherwise # - macro_prefix prefix of gl_LIBOBJS macros to use +# - module_indicator_prefix prefix of GNULIB_<modulename> variables to use # - po_domain prefix of i18n domain to use (without -gnulib suffix) # - witness_c_macro from --witness-c-macro # - actioncmd (optional) command that will reproduce this invocation @@ -3695,6 +3698,7 @@ func_emit_lib_Makefile_am () -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' \ -e "$sed_eliminate_LDFLAGS" \ -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' \ + -e 's,\$(GNULIB_,$('"${module_indicator_prefix}"'_GNULIB_,' \ -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \ -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \ -e "$sed_transform_check_PROGRAMS" \ @@ -3706,7 +3710,9 @@ func_emit_lib_Makefile_am () } | combine_lines "${libname}_${libext}_SOURCES" > "$tmp"/amsnippet1 { func_get_automake_snippet_unconditional "$module" | - LC_ALL=C sed -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' + LC_ALL=C \ + sed -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' \ + -e 's,\$(GNULIB_,$('"${module_indicator_prefix}"'_GNULIB_,' } > "$tmp"/amsnippet2 # Skip the contents if it's entirely empty. if grep '[^ ]' "$tmp"/amsnippet1 "$tmp"/amsnippet2 > /dev/null ; then @@ -3994,6 +4000,7 @@ func_emit_po_POTFILES_in () # - m4base relative directory containing autoconf macros # - testsbase relative directory containing unit test code # - macro_prefix prefix of gl_LIBOBJS macros to use +# - module_indicator_prefix prefix of GNULIB_<modulename> variables to use # - witness_c_macro from --witness-c-macro # - for_test true if creating a package for testing, false otherwise # - single_configure true if a single configure file should be generated, @@ -4049,6 +4056,7 @@ func_emit_tests_Makefile_am () -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' \ -e "$sed_eliminate_LDFLAGS" \ -e 's,lib_\([A-Z][A-Z]*\),libtests_a_\1,g' \ + -e 's,\$(GNULIB_,$('"${module_indicator_prefix}"'_GNULIB_,' \ -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \ -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \ -e "$sed_transform_check_PROGRAMS" \ @@ -4060,7 +4068,9 @@ func_emit_tests_Makefile_am () } | combine_lines "libtests_a_SOURCES" > "$tmp"/amsnippet1 { func_get_automake_snippet_unconditional "$module" | - LC_ALL=C sed -e 's,lib_\([A-Z][A-Z]*\),libtests_a_\1,g' + LC_ALL=C \ + sed -e 's,lib_\([A-Z][A-Z]*\),libtests_a_\1,g' \ + -e 's,\$(GNULIB_,$('"${module_indicator_prefix}"'_GNULIB_,' } > "$tmp"/amsnippet2 # Skip the contents if it's entirely empty. if grep '[^ ]' "$tmp"/amsnippet1 "$tmp"/amsnippet2 > /dev/null ; then @@ -4252,7 +4262,8 @@ func_emit_tests_Makefile_am () # func_emit_initmacro_start macro_prefix # emits the first few statements of the gl_INIT macro to standard output. -# - macro_prefix prefix of gl_EARLY, gl_INIT macros to use +# - macro_prefix prefix of gl_EARLY, gl_INIT macros to use +# - module_indicator_prefix prefix of GNULIB_<modulename> variables to use func_emit_initmacro_start () { macro_prefix_arg="$1" @@ -4280,12 +4291,16 @@ func_emit_initmacro_start () # in which to expect them. echo " m4_pushdef([${macro_prefix_arg}_LIBSOURCES_LIST], [])" echo " m4_pushdef([${macro_prefix_arg}_LIBSOURCES_DIR], [])" + # Scope for m4 macros. + echo " m4_pushdef([GL_MACRO_PREFIX], [${macro_prefix_arg}])" + # Scope the GNULIB_<modulename> variables. + echo " m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [${module_indicator_prefix}])" echo " gl_COMMON" } # func_emit_initmacro_end macro_prefix # emits the last few statements of the gl_INIT macro to standard output. -# - macro_prefix prefix of gl_EARLY, gl_INIT macros to use +# - macro_prefix prefix of gl_EARLY, gl_INIT macros to use func_emit_initmacro_end () { macro_prefix_arg="$1" @@ -4304,6 +4319,8 @@ func_emit_initmacro_end () echo " m4_if(m4_sysval, [0], []," echo " [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])])" echo " ])" + echo " m4_popdef([GL_MODULE_INDICATOR_PREFIX])" + echo " m4_popdef([GL_MACRO_PREFIX])" echo " m4_popdef([${macro_prefix_arg}_LIBSOURCES_DIR])" echo " m4_popdef([${macro_prefix_arg}_LIBSOURCES_LIST])" echo " m4_popdef([AC_LIBSOURCES])" @@ -5438,7 +5455,7 @@ s,^\(.................................................[^ ]*\) *, func_append_actionarg "$module" done - # Determine include_guard_prefix. + # Determine include_guard_prefix and module_indicator_prefix. func_compute_include_guard_prefix # Default the makefile name to Makefile.am. @@ -6379,7 +6396,7 @@ func_create_testdir () exec 0<&5 5<&- } - # Determine include_guard_prefix. + # Determine include_guard_prefix and module_indicator_prefix. func_compute_include_guard_prefix # Create Makefile.ams that are for testing. diff --git a/m4/af_alg.m4 b/m4/af_alg.m4 index df5e0c50b0..cba09e89d6 100644 --- a/m4/af_alg.m4 +++ b/m4/af_alg.m4 @@ -1,4 +1,4 @@ -# af_alg.m4 serial 4 +# af_alg.m4 serial 5 dnl Copyright 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, @@ -8,7 +8,7 @@ dnl From Matteo Croce. AC_DEFUN_ONCE([gl_AF_ALG], [ - AC_REQUIRE([gl_HEADER_SYS_SOCKET]) + AC_REQUIRE([gl_SYS_SOCKET_H]) AC_REQUIRE([AC_C_INLINE]) dnl Check whether linux/if_alg.h has needed features. diff --git a/m4/arpa_inet_h.m4 b/m4/arpa_inet_h.m4 index 75be935aac..868ebdfb88 100644 --- a/m4/arpa_inet_h.m4 +++ b/m4/arpa_inet_h.m4 @@ -1,4 +1,4 @@ -# arpa_inet_h.m4 serial 15 +# arpa_inet_h.m4 serial 16 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, @@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Simon Josefsson and Bruno Haible -AC_DEFUN([gl_HEADER_ARPA_INET], +AC_DEFUN_ONCE([gl_ARPA_INET_H], [ - dnl Use AC_REQUIRE here, so that the default behavior below is expanded - dnl once only, before all statements that occur in other macros. + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS]) AC_CHECK_HEADERS_ONCE([arpa/inet.h]) @@ -42,15 +42,23 @@ AC_DEFUN([gl_HEADER_ARPA_INET], AC_DEFUN([gl_ARPA_INET_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_ARPA_INET_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) ]) +AC_DEFUN([gl_ARPA_INET_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_ARPA_INET_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_INET_NTOP]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_INET_PTON]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_ARPA_INET_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS]) +]) + AC_DEFUN([gl_ARPA_INET_H_DEFAULTS], [ - 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/ctime.m4 b/m4/ctime.m4 index 34d5ab405f..e7a14eee95 100644 --- a/m4/ctime.m4 +++ b/m4/ctime.m4 @@ -1,4 +1,4 @@ -# ctime.m4 serial 1 +# ctime.m4 serial 2 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, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_CTIME], [ - AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) + AC_REQUIRE([gl_TIME_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) case "$host_os" in mingw*) REPLACE_CTIME=1 ;; diff --git a/m4/ctype.m4 b/m4/ctype.m4 index 309c2e6e13..d48847a8ac 100644 --- a/m4/ctype.m4 +++ b/m4/ctype.m4 @@ -1,10 +1,10 @@ -# ctype_h.m4 serial 7 +# ctype_h.m4 serial 8 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, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_CTYPE_H], +AC_DEFUN_ONCE([gl_CTYPE_H], [ AC_REQUIRE([gl_CTYPE_H_DEFAULTS]) @@ -19,14 +19,22 @@ AC_DEFUN([gl_CTYPE_H], AC_DEFUN([gl_CTYPE_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_CTYPE_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_CTYPE_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) ]) +AC_DEFUN([gl_CTYPE_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_CTYPE_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISBLANK]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_CTYPE_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_CTYPE_H_DEFAULTS]) +]) + AC_DEFUN([gl_CTYPE_H_DEFAULTS], [ - 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 c3589df05f..3bcf34b7cf 100644 --- a/m4/dirent_h.m4 +++ b/m4/dirent_h.m4 @@ -1,4 +1,4 @@ -# dirent_h.m4 serial 17 +# dirent_h.m4 serial 18 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, @@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Bruno Haible. -AC_DEFUN([gl_DIRENT_H], +AC_DEFUN_ONCE([gl_DIRENT_H], [ - dnl Use AC_REQUIRE here, so that the default behavior below is expanded - dnl once only, before all statements that occur in other macros. + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) dnl <dirent.h> is always overridden, because of GNULIB_POSIXCHECK. @@ -29,24 +29,32 @@ AC_DEFUN([gl_DIRENT_H], AC_DEFUN([gl_DIRENT_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_DIRENT_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_DIRENT_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_DIRENT_H_MODULE_INDICATOR_DEFAULTS], [ + gl_UNISTD_H_REQUIRE_DEFAULTS dnl for REPLACE_FCHDIR + 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]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_DIRENT_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_DIRENT_H_DEFAULTS]) +]) + AC_DEFUN([gl_DIRENT_H_DEFAULTS], [ - AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR - 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/explicit_bzero.m4 b/m4/explicit_bzero.m4 index d77ec5a3a5..8c86d69e05 100644 --- a/m4/explicit_bzero.m4 +++ b/m4/explicit_bzero.m4 @@ -5,7 +5,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_EXPLICIT_BZERO], [ - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) dnl Persuade glibc <string.h> to declare explicit_bzero. AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4 index 3a8284092b..822bf027e3 100644 --- a/m4/fcntl_h.m4 +++ b/m4/fcntl_h.m4 @@ -1,4 +1,4 @@ -# serial 18 +# serial 19 # Configure fcntl.h. dnl Copyright (C) 2006-2007, 2009-2021 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Paul Eggert. -AC_DEFUN([gl_FCNTL_H], +AC_DEFUN_ONCE([gl_FCNTL_H], [ AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) AC_REQUIRE([gl_FCNTL_O_FLAGS]) @@ -28,23 +28,31 @@ AC_DEFUN([gl_FCNTL_H], AC_DEFUN([gl_FCNTL_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_FCNTL_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_FCNTL_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_FCNTL_H_MODULE_INDICATOR_DEFAULTS], [ + 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. + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CREAT], [1]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_OPEN], [1]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_FCNTL_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) +]) + AC_DEFUN([gl_FCNTL_H_DEFAULTS], [ - 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. - 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]) @@ -1,4 +1,4 @@ -# ffs.m4 serial 4 +# ffs.m4 serial 5 dnl Copyright (C) 2011-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, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_FFS], [ - AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS]) + AC_REQUIRE([gl_STRINGS_H_DEFAULTS]) dnl We can't use AC_CHECK_FUNC here, because ffs() is defined as a dnl static inline function when compiling for Android 4.2 or older. diff --git a/m4/ffsl.m4 b/m4/ffsl.m4 index d6c7804f72..45d8f14836 100644 --- a/m4/ffsl.m4 +++ b/m4/ffsl.m4 @@ -1,4 +1,4 @@ -# ffsl.m4 serial 1 +# ffsl.m4 serial 2 dnl Copyright (C) 2011-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, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_FFSL], [ - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) dnl Persuade glibc <string.h> to declare ffsl(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) diff --git a/m4/ffsll.m4 b/m4/ffsll.m4 index 97491eb2e6..90bc762a8f 100644 --- a/m4/ffsll.m4 +++ b/m4/ffsll.m4 @@ -1,4 +1,4 @@ -# ffsll.m4 serial 2 +# ffsll.m4 serial 3 dnl Copyright (C) 2011-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, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_FFSLL], [ - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles dnl Persuade glibc <string.h> and AIX <strings.h> to declare ffsll(). diff --git a/m4/flock.m4 b/m4/flock.m4 index eb46642d87..e1e5fe0303 100644 --- a/m4/flock.m4 +++ b/m4/flock.m4 @@ -1,4 +1,4 @@ -# flock.m4 serial 3 +# flock.m4 serial 4 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, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_FLOCK], [ - AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS]) + AC_REQUIRE([gl_SYS_FILE_H_DEFAULTS]) AC_CHECK_FUNCS_ONCE([flock]) if test $ac_cv_func_flock = no; then HAVE_FLOCK=0 diff --git a/m4/fnmatch_h.m4 b/m4/fnmatch_h.m4 index cdda62129f..d12c698cdf 100644 --- a/m4/fnmatch_h.m4 +++ b/m4/fnmatch_h.m4 @@ -1,4 +1,4 @@ -# fnmatch_h.m4 serial 5 +# fnmatch_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, @@ -52,23 +52,31 @@ AC_DEFUN_ONCE([gl_FNMATCH_H], dnl Unconditionally enables the replacement of <fnmatch.h>. AC_DEFUN([gl_REPLACE_FNMATCH_H], [ - AC_REQUIRE([gl_FNMATCH_H_DEFAULTS]) + gl_FNMATCH_H_REQUIRE_DEFAULTS FNMATCH_H='fnmatch.h' AM_CONDITIONAL([GL_GENERATE_FNMATCH_H], [test -n "$FNMATCH_H"]) ]) AC_DEFUN([gl_FNMATCH_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_FNMATCH_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_FNMATCH_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_FNMATCH_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_FNMATCH_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FNMATCH]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_FNMATCH_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_FNMATCH_H_DEFAULTS]) +]) + AC_DEFUN([gl_FNMATCH_H_DEFAULTS], [ - 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/fstat.m4 b/m4/fstat.m4 index 3b5b238fa6..cdaca80da8 100644 --- a/m4/fstat.m4 +++ b/m4/fstat.m4 @@ -1,4 +1,4 @@ -# fstat.m4 serial 7 +# fstat.m4 serial 8 dnl Copyright (C) 2011-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, @@ -34,7 +34,7 @@ AC_DEFUN([gl_FUNC_FSTAT], # Prerequisites of lib/fstat.c and lib/stat-w32.c. AC_DEFUN([gl_PREREQ_FSTAT], [ - AC_REQUIRE([gl_HEADER_SYS_STAT_H]) + AC_REQUIRE([gl_SYS_STAT_H]) AC_REQUIRE([gl_PREREQ_STAT_W32]) : ]) diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4 index 97889a8b54..3f8e04f9b4 100644 --- a/m4/getaddrinfo.m4 +++ b/m4/getaddrinfo.m4 @@ -1,4 +1,4 @@ -# getaddrinfo.m4 serial 33 +# getaddrinfo.m4 serial 34 dnl Copyright (C) 2004-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, @@ -6,8 +6,8 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_GETADDRINFO], [ - AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H - AC_REQUIRE([gl_HEADER_NETDB])dnl for HAVE_NETDB_H + AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H + AC_REQUIRE([gl_NETDB_H])dnl for HAVE_NETDB_H GETADDRINFO_LIB= gai_saved_LIBS="$LIBS" @@ -156,13 +156,13 @@ const char *gai_strerror(int);]])], # Prerequisites of lib/netdb.in.h and lib/getaddrinfo.c. AC_DEFUN([gl_PREREQ_GETADDRINFO], [ AC_REQUIRE([gl_NETDB_H_DEFAULTS]) - AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H + AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H AC_REQUIRE([gl_HOSTENT]) dnl for HOSTENT_LIB AC_REQUIRE([gl_SERVENT]) dnl for SERVENT_LIB AC_REQUIRE([gl_FUNC_INET_NTOP]) dnl for INET_NTOP_LIB AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_SOCKET_FAMILIES]) - AC_REQUIRE([gl_HEADER_SYS_SOCKET]) + AC_REQUIRE([gl_SYS_SOCKET_H]) AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) dnl Including sys/socket.h is wrong for Windows, but Windows does not diff --git a/m4/getdomainname.m4 b/m4/getdomainname.m4 index 30c10caa2f..3f5125b02b 100644 --- a/m4/getdomainname.m4 +++ b/m4/getdomainname.m4 @@ -1,4 +1,4 @@ -# getdomainname.m4 serial 10 +# getdomainname.m4 serial 11 dnl Copyright (C) 2002-2003, 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, @@ -7,8 +7,8 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_GETDOMAINNAME], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) - AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H - AC_REQUIRE([gl_HEADER_NETDB])dnl for HAVE_NETDB_H + AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H + AC_REQUIRE([gl_NETDB_H])dnl for HAVE_NETDB_H dnl Persuade glibc <unistd.h> to declare getdomainname(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4 index 3c20081574..37c54404bb 100644 --- a/m4/gettimeofday.m4 +++ b/m4/gettimeofday.m4 @@ -1,4 +1,4 @@ -# serial 28 +# serial 29 # Copyright (C) 2001-2003, 2005, 2007, 2009-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -9,10 +9,10 @@ dnl From Jim Meyering. AC_DEFUN([gl_FUNC_GETTIMEOFDAY], [ - AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS]) + AC_REQUIRE([gl_SYS_TIME_H_DEFAULTS]) AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([gl_HEADER_SYS_TIME_H]) + AC_REQUIRE([gl_SYS_TIME_H]) AC_CHECK_FUNCS_ONCE([gettimeofday]) gl_gettimeofday_timezone=void diff --git a/m4/glob_h.m4 b/m4/glob_h.m4 index cb2c5f7326..68e7b4d284 100644 --- a/m4/glob_h.m4 +++ b/m4/glob_h.m4 @@ -1,4 +1,4 @@ -# glob_h.m4 serial 6 +# glob_h.m4 serial 7 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, @@ -47,23 +47,31 @@ AC_DEFUN_ONCE([gl_GLOB_H], dnl Unconditionally enables the replacement of <glob.h>. AC_DEFUN([gl_REPLACE_GLOB_H], [ - AC_REQUIRE([gl_GLOB_H_DEFAULTS]) + gl_GLOB_H_REQUIRE_DEFAULTS GLOB_H='glob.h' AM_CONDITIONAL([GL_GENERATE_GLOB_H], [test -n "$GLOB_H"]) ]) AC_DEFUN([gl_GLOB_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_GLOB_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_GLOB_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_GLOB_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_GLOB_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GLOB]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_GLOB_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_GLOB_H_DEFAULTS]) +]) + AC_DEFUN([gl_GLOB_H_DEFAULTS], [ - 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/gnulib-common.m4 b/m4/gnulib-common.m4 index 8faec20f0d..7db4be1acb 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,4 +1,4 @@ -# gnulib-common.m4 serial 64 +# gnulib-common.m4 serial 65 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, @@ -363,8 +363,8 @@ AC_DEFUN([gl_COMMON_BODY], [ # as a C preprocessor expression. AC_DEFUN([gl_MODULE_INDICATOR_INIT_VARIABLE], [ - [$1]=m4_if([$2], , [0], [$2]) - AC_SUBST([$1]) + GL_MODULE_INDICATOR_PREFIX[]_[$1]=m4_if([$2], , [0], [$2]) + AC_SUBST(GL_MODULE_INDICATOR_PREFIX[]_[$1]) ]) # gl_MODULE_INDICATOR_CONDITION @@ -379,9 +379,9 @@ m4_define([gl_MODULE_INDICATOR_CONDITION], [1]) AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE], [ gl_MODULE_INDICATOR_SET_VARIABLE_AUX( - [GNULIB_[]m4_translit([[$1]], - [abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])], + [GL_MODULE_INDICATOR_PREFIX[]_GNULIB_[]m4_translit([[$1]], + [abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])], [gl_MODULE_INDICATOR_CONDITION]) ]) diff --git a/m4/hostent.m4 b/m4/hostent.m4 index 641d72fa30..f1390a32e9 100644 --- a/m4/hostent.m4 +++ b/m4/hostent.m4 @@ -1,4 +1,4 @@ -# hostent.m4 serial 3 +# hostent.m4 serial 4 dnl Copyright (C) 2008, 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, @@ -13,7 +13,7 @@ AC_DEFUN([gl_HOSTENT], dnl - On BeOS, they are in libnet. dnl - On native Windows, they are in ws2_32.dll. dnl - Otherwise they are in libc. - AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H + AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H HOSTENT_LIB= gl_saved_libs="$LIBS" AC_SEARCH_LIBS([gethostbyname], [nsl network net], diff --git a/m4/iconv_h.m4 b/m4/iconv_h.m4 index bdbb79f094..e4fccc04b2 100644 --- a/m4/iconv_h.m4 +++ b/m4/iconv_h.m4 @@ -1,10 +1,10 @@ -# iconv_h.m4 serial 13 +# iconv_h.m4 serial 14 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, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_ICONV_H], +AC_DEFUN_ONCE([gl_ICONV_H], [ AC_REQUIRE([gl_ICONV_H_DEFAULTS]) @@ -24,22 +24,30 @@ AC_DEFUN([gl_ICONV_H], dnl Unconditionally enables the replacement of <iconv.h>. AC_DEFUN([gl_REPLACE_ICONV_H], [ - AC_REQUIRE([gl_ICONV_H_DEFAULTS]) + gl_ICONV_H_REQUIRE_DEFAULTS ICONV_H='iconv.h' AM_CONDITIONAL([GL_GENERATE_ICONV_H], [test -n "$ICONV_H"]) ]) AC_DEFUN([gl_ICONV_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_ICONV_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_ICONV_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) ]) +AC_DEFUN([gl_ICONV_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_ICONV_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ICONV]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_ICONV_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_ICONV_H_DEFAULTS]) +]) + AC_DEFUN([gl_ICONV_H_DEFAULTS], [ m4_ifdef([gl_ANSI_CXX], [AC_REQUIRE([gl_ANSI_CXX])]) - 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 0a816ae7c4..4e814466c3 100644 --- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -1,4 +1,4 @@ -# inttypes.m4 serial 33 +# inttypes.m4 serial 34 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, @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. dnl From Derek Price, Bruno Haible. dnl Test whether <inttypes.h> is supported or must be substituted. -AC_DEFUN([gl_INTTYPES_H], +AC_DEFUN_ONCE([gl_INTTYPES_H], [ AC_REQUIRE([gl_INTTYPES_INCOMPLETE]) gl_INTTYPES_PRI_SCN @@ -138,17 +138,25 @@ AC_DEFUN([gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION], AC_DEFUN([gl_INTTYPES_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_INTTYPES_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) ]) +AC_DEFUN([gl_INTTYPES_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_INTTYPES_H_MODULE_INDICATOR_DEFAULTS], [ + 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]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_INTTYPES_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) +]) + AC_DEFUN([gl_INTTYPES_H_DEFAULTS], [ - 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/ioctl.m4 b/m4/ioctl.m4 index 18286783a8..efd29f3582 100644 --- a/m4/ioctl.m4 +++ b/m4/ioctl.m4 @@ -1,4 +1,4 @@ -# ioctl.m4 serial 5 +# ioctl.m4 serial 6 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, @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_IOCTL], [ AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS]) - AC_REQUIRE([gl_HEADER_SYS_SOCKET]) + AC_REQUIRE([gl_SYS_SOCKET_H]) HAVE_IOCTL=1 if test "$ac_cv_header_winsock2_h" = yes; then dnl Even if the 'socket' module is not used here, another part of the diff --git a/m4/langinfo_h.m4 b/m4/langinfo_h.m4 index d7fd95c60f..8e199dbf3d 100644 --- a/m4/langinfo_h.m4 +++ b/m4/langinfo_h.m4 @@ -1,10 +1,10 @@ -# langinfo_h.m4 serial 10 +# langinfo_h.m4 serial 11 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, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_LANGINFO_H], +AC_DEFUN_ONCE([gl_LANGINFO_H], [ AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) @@ -106,16 +106,24 @@ int a = YESEXPR; AC_DEFUN([gl_LANGINFO_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_LANGINFO_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_LANGINFO_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_LANGINFO_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NL_LANGINFO]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_LANGINFO_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_LANGINFO_H_DEFAULTS]) +]) + AC_DEFUN([gl_LANGINFO_H_DEFAULTS], [ - 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 7a08334b31..44f0b49327 100644 --- a/m4/locale_h.m4 +++ b/m4/locale_h.m4 @@ -1,13 +1,13 @@ -# locale_h.m4 serial 26 +# locale_h.m4 serial 27 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, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_LOCALE_H], +AC_DEFUN_ONCE([gl_LOCALE_H], [ - dnl Use AC_REQUIRE here, so that the default behavior below is expanded - dnl once only, before all statements that occur in other macros. + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) dnl Persuade glibc <locale.h> to define locale_t and the int_p_*, int_n_* @@ -131,20 +131,28 @@ AC_DEFUN([gl_LOCALE_T], AC_DEFUN([gl_LOCALE_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_LOCALE_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_LOCALE_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_LOCALE_H_MODULE_INDICATOR_DEFAULTS], [ + 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]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_LOCALE_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_LOCALE_H_DEFAULTS]) +]) + AC_DEFUN([gl_LOCALE_H_DEFAULTS], [ - 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/localtime.m4 b/m4/localtime.m4 index 759613c989..cc1c9639af 100644 --- a/m4/localtime.m4 +++ b/m4/localtime.m4 @@ -1,4 +1,4 @@ -# localtime.m4 serial 1 +# localtime.m4 serial 2 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, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_LOCALTIME], [ - AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) + AC_REQUIRE([gl_TIME_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) case "$host_os" in mingw*) REPLACE_LOCALTIME=1 ;; diff --git a/m4/malloc_h.m4 b/m4/malloc_h.m4 index 4e64b51633..6144ce50c7 100644 --- a/m4/malloc_h.m4 +++ b/m4/malloc_h.m4 @@ -1,4 +1,4 @@ -# malloc_h.m4 serial 2 +# malloc_h.m4 serial 3 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, @@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Bruno Haible. -AC_DEFUN([gl_MALLOC_H], +AC_DEFUN_ONCE([gl_MALLOC_H], [ - dnl Use AC_REQUIRE here, so that the default behavior below is expanded - dnl once only, before all statements that occur in other macros. + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. AC_REQUIRE([gl_MALLOC_H_DEFAULTS]) gl_CHECK_NEXT_HEADERS([malloc.h]) @@ -31,16 +31,24 @@ AC_DEFUN([gl_MALLOC_H], AC_DEFUN([gl_MALLOC_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_MALLOC_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_MALLOC_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_MALLOC_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_MALLOC_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MEMALIGN]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_MALLOC_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_MALLOC_H_DEFAULTS]) +]) + AC_DEFUN([gl_MALLOC_H_DEFAULTS], [ - 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 1cd81c9e1a..384aa9c744 100644 --- a/m4/math_h.m4 +++ b/m4/math_h.m4 @@ -1,10 +1,10 @@ -# math_h.m4 serial 123 +# math_h.m4 serial 124 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, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_MATH_H], +AC_DEFUN_ONCE([gl_MATH_H], [ AC_REQUIRE([gl_MATH_H_DEFAULTS]) gl_CHECK_NEXT_HEADERS([math.h]) @@ -55,117 +55,125 @@ AC_DEFUN([gl_MATH_H], AC_DEFUN([gl_MATH_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_MATH_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_MATH_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_MATH_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_MATH_H_MODULE_INDICATOR_DEFAULTS], [ + 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. + 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]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_MATH_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_MATH_H_DEFAULTS]) +]) + AC_DEFUN([gl_MATH_H_DEFAULTS], [ - 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. - 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/mbslen.m4 b/m4/mbslen.m4 index da04164143..0801fdf505 100644 --- a/m4/mbslen.m4 +++ b/m4/mbslen.m4 @@ -1,4 +1,4 @@ -# mbslen.m4 serial 2 +# mbslen.m4 serial 3 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, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_MBSLEN], [ - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_CHECK_FUNCS_ONCE([mbslen]) if test $ac_cv_func_mbslen = yes; then HAVE_MBSLEN=1 diff --git a/m4/memchr.m4 b/m4/memchr.m4 index 64470ded53..ca08192a69 100644 --- a/m4/memchr.m4 +++ b/m4/memchr.m4 @@ -1,4 +1,4 @@ -# memchr.m4 serial 17 +# memchr.m4 serial 18 dnl Copyright (C) 2002-2004, 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, @@ -13,7 +13,7 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR], AC_CHECK_HEADERS_ONCE([sys/mman.h]) AC_CHECK_FUNCS_ONCE([mprotect]) - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) # Detect platform-specific bugs in some versions of glibc: # memchr should not dereference anything with length 0 # https://bugzilla.redhat.com/show_bug.cgi?id=499689 diff --git a/m4/memmem.m4 b/m4/memmem.m4 index e2a785f48d..f4a167b483 100644 --- a/m4/memmem.m4 +++ b/m4/memmem.m4 @@ -1,4 +1,4 @@ -# memmem.m4 serial 27 +# memmem.m4 serial 28 dnl Copyright (C) 2002-2004, 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, @@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_MEMMEM_SIMPLE], dnl Persuade glibc <string.h> to declare memmem(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_CHECK_FUNCS([memmem]) if test $ac_cv_func_memmem = yes; then HAVE_MEMMEM=1 diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4 index c5ee2af8cc..f9d9ec8f30 100644 --- a/m4/mempcpy.m4 +++ b/m4/mempcpy.m4 @@ -1,4 +1,4 @@ -# mempcpy.m4 serial 11 +# mempcpy.m4 serial 12 dnl Copyright (C) 2003-2004, 2006-2007, 2009-2021 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_MEMPCPY], dnl The mempcpy() declaration in lib/string.in.h uses 'restrict'. AC_REQUIRE([AC_C_RESTRICT]) - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_CHECK_FUNCS([mempcpy]) if test $ac_cv_func_mempcpy = no; then HAVE_MEMPCPY=0 diff --git a/m4/memrchr.m4 b/m4/memrchr.m4 index d0c05896e5..40f61c5ac0 100644 --- a/m4/memrchr.m4 +++ b/m4/memrchr.m4 @@ -1,4 +1,4 @@ -# memrchr.m4 serial 10 +# memrchr.m4 serial 11 dnl Copyright (C) 2002-2003, 2005-2007, 2009-2021 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_MEMRCHR], dnl Persuade glibc <string.h> to declare memrchr(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_CHECK_DECLS_ONCE([memrchr]) if test $ac_cv_have_decl_memrchr = no; then HAVE_DECL_MEMRCHR=0 diff --git a/m4/mktime.m4 b/m4/mktime.m4 index 245649e774..721189af56 100644 --- a/m4/mktime.m4 +++ b/m4/mktime.m4 @@ -1,4 +1,4 @@ -# serial 35 +# serial 36 dnl Copyright (C) 2002-2003, 2005-2007, 2009-2021 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -255,7 +255,7 @@ main () dnl Main macro of module 'mktime'. AC_DEFUN([gl_FUNC_MKTIME], [ - AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) + AC_REQUIRE([gl_TIME_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([gl_FUNC_MKTIME_WORKS]) diff --git a/m4/monetary_h.m4 b/m4/monetary_h.m4 index f42bf0ad34..dc56c1b136 100644 --- a/m4/monetary_h.m4 +++ b/m4/monetary_h.m4 @@ -1,4 +1,4 @@ -# monetary_h.m4 serial 6 +# monetary_h.m4 serial 7 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, @@ -49,14 +49,22 @@ AC_DEFUN_ONCE([gl_MONETARY_H], AC_DEFUN([gl_MONETARY_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_MONETARY_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_MONETARY_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) ]) +AC_DEFUN([gl_MONETARY_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_MONETARY_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRFMON_L]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_MONETARY_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_MONETARY_H_DEFAULTS]) +]) + AC_DEFUN([gl_MONETARY_H_DEFAULTS], [ - 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/nanosleep.m4 b/m4/nanosleep.m4 index c3b47cdad5..baebe88ea9 100644 --- a/m4/nanosleep.m4 +++ b/m4/nanosleep.m4 @@ -1,4 +1,4 @@ -# serial 39 +# serial 40 dnl From Jim Meyering. dnl Check for the nanosleep function. @@ -13,7 +13,7 @@ dnl AC_DEFUN([gl_FUNC_NANOSLEEP], [ - AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) + AC_REQUIRE([gl_TIME_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles dnl Persuade glibc and Solaris <time.h> to declare nanosleep. diff --git a/m4/netdb_h.m4 b/m4/netdb_h.m4 index b52243b036..69f7b78eac 100644 --- a/m4/netdb_h.m4 +++ b/m4/netdb_h.m4 @@ -1,10 +1,10 @@ -# netdb_h.m4 serial 13 +# netdb_h.m4 serial 14 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, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_HEADER_NETDB], +AC_DEFUN_ONCE([gl_NETDB_H], [ AC_REQUIRE([gl_NETDB_H_DEFAULTS]) gl_CHECK_NEXT_HEADERS([netdb.h]) @@ -23,16 +23,24 @@ AC_DEFUN([gl_HEADER_NETDB], AC_DEFUN([gl_NETDB_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_NETDB_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_NETDB_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_NETDB_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_NETDB_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETADDRINFO]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_NETDB_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_NETDB_H_DEFAULTS]) +]) + AC_DEFUN([gl_NETDB_H_DEFAULTS], [ - 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/nonblocking.m4 b/m4/nonblocking.m4 index 5f988b1c9b..e648b5b635 100644 --- a/m4/nonblocking.m4 +++ b/m4/nonblocking.m4 @@ -1,4 +1,4 @@ -# nonblocking.m4 serial 2 +# nonblocking.m4 serial 3 dnl Copyright (C) 2011-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, @@ -10,8 +10,8 @@ dnl Also tests whether open() supports O_NONBLOCK. dnl Sets gl_cv_have_open_O_NONBLOCK. AC_DEFUN([gl_NONBLOCKING_IO], [ - dnl Use AC_REQUIRE here, so that the default behavior below is expanded - dnl once only, before all statements that occur in other macros. + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. AC_REQUIRE([gl_NONBLOCKING_IO_BODY]) ]) diff --git a/m4/passfd.m4 b/m4/passfd.m4 index 41e2ed46fe..f210f75fa2 100644 --- a/m4/passfd.m4 +++ b/m4/passfd.m4 @@ -1,4 +1,4 @@ -# passfd.m4 serial 8 +# passfd.m4 serial 9 dnl Copyright (C) 2011-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, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_PASSFD], [ - AC_REQUIRE([gl_HEADER_SYS_SOCKET]) + AC_REQUIRE([gl_SYS_SOCKET_H]) AC_CHECK_FUNCS_ONCE([recvmsg sendmsg]) dnl Persuade AIX 5.2 <sys/socket.h> to declare CMSG_SPACE, CMSG_LEN. diff --git a/m4/poll_h.m4 b/m4/poll_h.m4 index d1f7c702ef..3037676266 100644 --- a/m4/poll_h.m4 +++ b/m4/poll_h.m4 @@ -1,4 +1,4 @@ -# poll_h.m4 serial 4 +# poll_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, @@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Bruno Haible. -AC_DEFUN([gl_POLL_H], +AC_DEFUN_ONCE([gl_POLL_H], [ - dnl Use AC_REQUIRE here, so that the default behavior below is expanded - dnl once only, before all statements that occur in other macros. + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. AC_REQUIRE([gl_POLL_H_DEFAULTS]) AC_CHECK_HEADERS_ONCE([poll.h]) @@ -33,16 +33,24 @@ AC_DEFUN([gl_POLL_H], AC_DEFUN([gl_POLL_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_POLL_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_POLL_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_POLL_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_POLL_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POLL]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_POLL_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_POLL_H_DEFAULTS]) +]) + AC_DEFUN([gl_POLL_H_DEFAULTS], [ - 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/pselect.m4 b/m4/pselect.m4 index 538fe7dc12..9de63baf99 100644 --- a/m4/pselect.m4 +++ b/m4/pselect.m4 @@ -1,4 +1,4 @@ -# pselect.m4 serial 9 +# pselect.m4 serial 10 dnl Copyright (C) 2011-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, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_PSELECT], [ - AC_REQUIRE([gl_HEADER_SYS_SELECT]) + AC_REQUIRE([gl_SYS_SELECT_H]) AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CHECK_FUNCS_ONCE([pselect]) diff --git a/m4/pthread_h.m4 b/m4/pthread_h.m4 index 6bf74cc752..d07d85d2e3 100644 --- a/m4/pthread_h.m4 +++ b/m4/pthread_h.m4 @@ -1,13 +1,13 @@ -# pthread_h.m4 serial 6 +# pthread_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, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_PTHREAD_H], +AC_DEFUN_ONCE([gl_PTHREAD_H], [ - dnl Use AC_REQUIRE here, so that the default behavior below is expanded - dnl once only, before all statements that occur in other macros. + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. AC_REQUIRE([gl_PTHREAD_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) @@ -139,23 +139,31 @@ AC_DEFUN([gl_PTHREAD_H], AC_DEFUN([gl_PTHREAD_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_PTHREAD_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_PTHREAD_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_PTHREAD_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_PTHREAD_H_MODULE_INDICATOR_DEFAULTS], [ + 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]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_PTHREAD_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_PTHREAD_H_DEFAULTS]) +]) + AC_DEFUN([gl_PTHREAD_H_DEFAULTS], [ - 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 801991d984..8fe5465eca 100644 --- a/m4/pty_h.m4 +++ b/m4/pty_h.m4 @@ -1,4 +1,4 @@ -# pty_h.m4 serial 12 +# pty_h.m4 serial 13 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, @@ -52,17 +52,25 @@ AC_DEFUN_ONCE([gl_PTY_H], AC_DEFUN([gl_PTY_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_PTY_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_PTY_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_PTY_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_PTY_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FORKPTY]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPENPTY]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_PTY_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_PTY_H_DEFAULTS]) +]) + AC_DEFUN([gl_PTY_H_DEFAULTS], [ - 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/rawmemchr.m4 b/m4/rawmemchr.m4 index f92846543c..452fab18f1 100644 --- a/m4/rawmemchr.m4 +++ b/m4/rawmemchr.m4 @@ -1,4 +1,4 @@ -# rawmemchr.m4 serial 2 +# rawmemchr.m4 serial 3 dnl Copyright (C) 2003, 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, @@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_RAWMEMCHR], dnl Persuade glibc <string.h> to declare rawmemchr(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_CHECK_FUNCS([rawmemchr]) if test $ac_cv_func_rawmemchr = no; then HAVE_RAWMEMCHR=0 diff --git a/m4/sched_h.m4 b/m4/sched_h.m4 index d461277a4f..03377aa2c2 100644 --- a/m4/sched_h.m4 +++ b/m4/sched_h.m4 @@ -1,4 +1,4 @@ -# sched_h.m4 serial 13 +# sched_h.m4 serial 14 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, @@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Bruno Haible. -AC_DEFUN([gl_SCHED_H], +AC_DEFUN_ONCE([gl_SCHED_H], [ - dnl Use AC_REQUIRE here, so that the default behavior below is expanded - dnl once only, before all statements that occur in other macros. + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. AC_REQUIRE([gl_SCHED_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) @@ -75,16 +75,24 @@ AC_DEFUN([gl_SCHED_H], AC_DEFUN([gl_SCHED_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_SCHED_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_SCHED_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_SCHED_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_SCHED_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SCHED_YIELD]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_SCHED_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_SCHED_H_DEFAULTS]) +]) + AC_DEFUN([gl_SCHED_H_DEFAULTS], [ - 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 ca4fc351cc..6cdcfdfc60 100644 --- a/m4/search_h.m4 +++ b/m4/search_h.m4 @@ -1,10 +1,10 @@ -# search_h.m4 serial 13 +# search_h.m4 serial 14 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, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_SEARCH_H], +AC_DEFUN_ONCE([gl_SEARCH_H], [ AC_REQUIRE([gl_SEARCH_H_DEFAULTS]) gl_CHECK_NEXT_HEADERS([search.h]) @@ -46,16 +46,24 @@ AC_DEFUN([gl_SEARCH_H], AC_DEFUN([gl_SEARCH_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_SEARCH_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_SEARCH_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_SEARCH_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_SEARCH_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TSEARCH]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_SEARCH_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_SEARCH_H_DEFAULTS]) +]) + AC_DEFUN([gl_SEARCH_H_DEFAULTS], [ - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TSEARCH]) dnl Support Microsoft deprecated alias function names by default. gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_LFIND], [1]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_LSEARCH], [1]) diff --git a/m4/select.m4 b/m4/select.m4 index c7409d2041..72c068fa48 100644 --- a/m4/select.m4 +++ b/m4/select.m4 @@ -1,4 +1,4 @@ -# select.m4 serial 12 +# select.m4 serial 13 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, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_SELECT], [ - AC_REQUIRE([gl_HEADER_SYS_SELECT]) + AC_REQUIRE([gl_SYS_SELECT_H]) AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_REQUIRE([gl_SOCKETS]) diff --git a/m4/servent.m4 b/m4/servent.m4 index 2dda177505..9bc3bcd4f3 100644 --- a/m4/servent.m4 +++ b/m4/servent.m4 @@ -1,4 +1,4 @@ -# servent.m4 serial 3 +# servent.m4 serial 4 dnl Copyright (C) 2008, 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, @@ -15,7 +15,7 @@ AC_DEFUN([gl_SERVENT], dnl - On BeOS, they are in libnet. dnl - On native Windows, they are in ws2_32.dll. dnl - Otherwise they are in libc. - AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H + AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H SERVENT_LIB= gl_saved_libs="$LIBS" AC_SEARCH_LIBS([getservbyname], [socket network net], diff --git a/m4/sigabbrev_np.m4 b/m4/sigabbrev_np.m4 index ce8b38ad5a..c4ae09b6e6 100644 --- a/m4/sigabbrev_np.m4 +++ b/m4/sigabbrev_np.m4 @@ -1,4 +1,4 @@ -# sigabbrev_np.m4 serial 1 +# sigabbrev_np.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, @@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_SIGABBREV_NP], dnl Persuade glibc <string.h> to declare sigabbrev_np(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_CHECK_FUNCS([sigabbrev_np]) if test $ac_cv_func_sigabbrev_np = no; then HAVE_SIGABBREV_NP=0 diff --git a/m4/sigdescr_np.m4 b/m4/sigdescr_np.m4 index f6fa63140c..17c22506cc 100644 --- a/m4/sigdescr_np.m4 +++ b/m4/sigdescr_np.m4 @@ -1,4 +1,4 @@ -# sigdescr_np.m4 serial 1 +# sigdescr_np.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, @@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_SIGDESCR_NP], dnl Persuade glibc <string.h> to declare sigdescr_np(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_CHECK_FUNCS([sigdescr_np]) if test $ac_cv_func_sigdescr_np = no; then HAVE_SIGDESCR_NP=0 diff --git a/m4/signal_h.m4 b/m4/signal_h.m4 index d466d52fe9..f68e890c3d 100644 --- a/m4/signal_h.m4 +++ b/m4/signal_h.m4 @@ -1,10 +1,10 @@ -# signal_h.m4 serial 20 +# signal_h.m4 serial 21 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, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_SIGNAL_H], +AC_DEFUN_ONCE([gl_SIGNAL_H], [ AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) AC_REQUIRE([gl_CHECK_TYPE_SIGSET_T]) @@ -54,20 +54,28 @@ AC_DEFUN([gl_CHECK_TYPE_SIGSET_T], AC_DEFUN([gl_SIGNAL_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_SIGNAL_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_SIGNAL_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_SIGNAL_H_MODULE_INDICATOR_DEFAULTS], [ + 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]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_SIGNAL_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) +]) + AC_DEFUN([gl_SIGNAL_H_DEFAULTS], [ - 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/sigpipe.m4 b/m4/sigpipe.m4 index 2eed176719..3e0a5debe5 100644 --- a/m4/sigpipe.m4 +++ b/m4/sigpipe.m4 @@ -1,4 +1,4 @@ -# sigpipe.m4 serial 2 +# sigpipe.m4 serial 3 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, @@ -8,8 +8,8 @@ dnl Tests whether SIGPIPE is provided by <signal.h>. dnl Sets gl_cv_header_signal_h_SIGPIPE. AC_DEFUN([gl_SIGNAL_SIGPIPE], [ - dnl Use AC_REQUIRE here, so that the default behavior below is expanded - dnl once only, before all statements that occur in other macros. + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. AC_REQUIRE([gl_SIGNAL_SIGPIPE_BODY]) ]) diff --git a/m4/sockpfaf.m4 b/m4/sockpfaf.m4 index edae5d85c9..17e14c7a66 100644 --- a/m4/sockpfaf.m4 +++ b/m4/sockpfaf.m4 @@ -1,4 +1,4 @@ -# sockpfaf.m4 serial 9 +# sockpfaf.m4 serial 10 dnl Copyright (C) 2004, 2006, 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, @@ -13,7 +13,7 @@ dnl From Bruno Haible. AC_DEFUN([gl_SOCKET_FAMILIES], [ - AC_REQUIRE([gl_HEADER_SYS_SOCKET]) + AC_REQUIRE([gl_SYS_SOCKET_H]) AC_CHECK_HEADERS_ONCE([netinet/in.h]) AC_CACHE_CHECK([for IPv4 sockets], @@ -60,7 +60,7 @@ AC_DEFUN([gl_SOCKET_FAMILIES], AC_DEFUN([gl_SOCKET_FAMILY_UNIX], [ - AC_REQUIRE([gl_HEADER_SYS_SOCKET]) + AC_REQUIRE([gl_SYS_SOCKET_H]) AC_CHECK_HEADERS_ONCE([sys/un.h]) AC_CACHE_CHECK([for UNIX domain sockets], diff --git a/m4/spawn_h.m4 b/m4/spawn_h.m4 index f1ba4421ea..7dc515f5ea 100644 --- a/m4/spawn_h.m4 +++ b/m4/spawn_h.m4 @@ -1,4 +1,4 @@ -# spawn_h.m4 serial 19 +# spawn_h.m4 serial 20 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, @@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Bruno Haible. -AC_DEFUN([gl_SPAWN_H], +AC_DEFUN_ONCE([gl_SPAWN_H], [ - dnl Use AC_REQUIRE here, so that the default behavior below is expanded - dnl once only, before all statements that occur in other macros. + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. AC_REQUIRE([gl_SPAWN_H_DEFAULTS]) dnl <spawn.h> is always overridden, because of GNULIB_POSIXCHECK. @@ -61,8 +61,8 @@ dnl Checks whether the system has the functions posix_spawn. dnl Sets ac_cv_func_posix_spawn and HAVE_POSIX_SPAWN. AC_DEFUN([gl_HAVE_POSIX_SPAWN], [ - dnl Use AC_REQUIRE here, so that the default behavior below is expanded - dnl once only, before all statements that occur in other macros. + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. AC_REQUIRE([gl_SPAWN_H_DEFAULTS]) LIB_POSIX_SPAWN= @@ -81,38 +81,46 @@ AC_DEFUN([gl_HAVE_POSIX_SPAWN], AC_DEFUN([gl_SPAWN_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_SPAWN_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_SPAWN_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_SPAWN_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_SPAWN_H_MODULE_INDICATOR_DEFAULTS], [ + 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]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_SPAWN_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_SPAWN_H_DEFAULTS]) +]) + AC_DEFUN([gl_SPAWN_H_DEFAULTS], [ - 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/stat.m4 b/m4/stat.m4 index 66f6c8c5cb..9bcdb72d67 100644 --- a/m4/stat.m4 +++ b/m4/stat.m4 @@ -1,4 +1,4 @@ -# serial 17 +# serial 18 # Copyright (C) 2009-2021 Free Software Foundation, Inc. # @@ -69,7 +69,7 @@ AC_DEFUN([gl_FUNC_STAT], # Prerequisites of lib/stat.c and lib/stat-w32.c. AC_DEFUN([gl_PREREQ_STAT], [ - AC_REQUIRE([gl_HEADER_SYS_STAT_H]) + AC_REQUIRE([gl_SYS_STAT_H]) AC_REQUIRE([gl_PREREQ_STAT_W32]) : ]) diff --git a/m4/stddef_h.m4 b/m4/stddef_h.m4 index cd666c4a58..53a69dd674 100644 --- a/m4/stddef_h.m4 +++ b/m4/stddef_h.m4 @@ -1,4 +1,4 @@ -# stddef_h.m4 serial 9 +# stddef_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, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. dnl A placeholder for <stddef.h>, for platforms that have issues. -AC_DEFUN([gl_STDDEF_H], +AC_DEFUN_ONCE([gl_STDDEF_H], [ AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) AC_REQUIRE([gt_TYPE_WCHAR_T]) @@ -70,11 +70,19 @@ AC_DEFUN([gl_STDDEF_H], AC_DEFUN([gl_STDDEF_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_STDDEF_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) ]) +AC_DEFUN([gl_STDDEF_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDDEF_H_MODULE_INDICATOR_DEFAULTS], [ + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_STDDEF_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) +]) + AC_DEFUN([gl_STDDEF_H_DEFAULTS], [ dnl Assume proper GNU behavior unless another module says otherwise. diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 index 53e98c3465..6846ca6ed9 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,11 +1,12 @@ -# stdio_h.m4 serial 53 +# stdio_h.m4 serial 54 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, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_STDIO_H], +AC_DEFUN_ONCE([gl_STDIO_H], [ + AC_REQUIRE([gl_STDIO_H_DEFAULTS]) AH_VERBATIM([MINGW_ANSI_STDIO], [/* Use GNU style printf and scanf. */ #ifndef __USE_MINGW_ANSI_STDIO @@ -13,7 +14,6 @@ AC_DEFUN([gl_STDIO_H], #endif ]) AC_DEFINE([__USE_MINGW_ANSI_STDIO]) - AC_REQUIRE([gl_STDIO_H_DEFAULTS]) gl_NEXT_HEADERS([stdio.h]) dnl Determine whether __USE_MINGW_ANSI_STDIO makes printf and @@ -42,15 +42,15 @@ AC_DEFUN([gl_STDIO_H], dnl No need to create extra modules for these functions. Everyone who uses dnl <stdio.h> likely needs them. - GNULIB_FSCANF=1 + gl_STDIO_MODULE_INDICATOR([fscanf]) gl_MODULE_INDICATOR([fscanf]) - GNULIB_SCANF=1 + gl_STDIO_MODULE_INDICATOR([scanf]) gl_MODULE_INDICATOR([scanf]) - GNULIB_FGETC=1 - GNULIB_GETC=1 - GNULIB_GETCHAR=1 - GNULIB_FGETS=1 - GNULIB_FREAD=1 + gl_STDIO_MODULE_INDICATOR([fgetc]) + gl_STDIO_MODULE_INDICATOR([getc]) + gl_STDIO_MODULE_INDICATOR([getchar]) + gl_STDIO_MODULE_INDICATOR([fgets]) + gl_STDIO_MODULE_INDICATOR([fread]) dnl This ifdef is necessary to avoid an error "missing file lib/stdio-read.c" dnl "expected source file, required through AC_LIBSOURCES, not found". It is dnl also an optimization, to avoid performing a configure check whose result @@ -66,16 +66,16 @@ AC_DEFUN([gl_STDIO_H], dnl No need to create extra modules for these functions. Everyone who uses dnl <stdio.h> likely needs them. - GNULIB_FPRINTF=1 - GNULIB_PRINTF=1 - GNULIB_VFPRINTF=1 - GNULIB_VPRINTF=1 - GNULIB_FPUTC=1 - GNULIB_PUTC=1 - GNULIB_PUTCHAR=1 - GNULIB_FPUTS=1 - GNULIB_PUTS=1 - GNULIB_FWRITE=1 + gl_STDIO_MODULE_INDICATOR([fprintf]) + gl_STDIO_MODULE_INDICATOR([printf]) + gl_STDIO_MODULE_INDICATOR([vfprintf]) + gl_STDIO_MODULE_INDICATOR([vprintf]) + gl_STDIO_MODULE_INDICATOR([fputc]) + gl_STDIO_MODULE_INDICATOR([putc]) + gl_STDIO_MODULE_INDICATOR([putchar]) + gl_STDIO_MODULE_INDICATOR([fputs]) + gl_STDIO_MODULE_INDICATOR([puts]) + gl_STDIO_MODULE_INDICATOR([fwrite]) dnl This ifdef is necessary to avoid an error "missing file lib/stdio-write.c" dnl "expected source file, required through AC_LIBSOURCES, not found". It is dnl also an optimization, to avoid performing a configure check whose result @@ -118,75 +118,83 @@ AC_DEFUN([gl_STDIO_H], AC_DEFUN([gl_STDIO_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_STDIO_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_STDIO_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_STDIO_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDIO_H_MODULE_INDICATOR_DEFAULTS], [ + 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. + 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]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_STDIO_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_STDIO_H_DEFAULTS]) +]) + AC_DEFUN([gl_STDIO_H_DEFAULTS], [ - 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. - 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 978293a3c2..e938b5aa54 100644 --- a/m4/stdlib_h.m4 +++ b/m4/stdlib_h.m4 @@ -1,10 +1,10 @@ -# stdlib_h.m4 serial 60 +# stdlib_h.m4 serial 61 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, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_STDLIB_H], +AC_DEFUN_ONCE([gl_STDLIB_H], [ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) gl_NEXT_HEADERS([stdlib.h]) @@ -48,61 +48,69 @@ AC_DEFUN([gl_STDLIB_H], AC_DEFUN([gl_STDLIB_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_STDLIB_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_STDLIB_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS], [ + 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. + 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]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) +]) + AC_DEFUN([gl_STDLIB_H_DEFAULTS], [ - 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. - 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/stpcpy.m4 b/m4/stpcpy.m4 index 28db4f45df..eb44f03adb 100644 --- a/m4/stpcpy.m4 +++ b/m4/stpcpy.m4 @@ -1,4 +1,4 @@ -# stpcpy.m4 serial 8 +# stpcpy.m4 serial 9 dnl Copyright (C) 2002, 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, @@ -12,7 +12,7 @@ AC_DEFUN([gl_FUNC_STPCPY], dnl The stpcpy() declaration in lib/string.in.h uses 'restrict'. AC_REQUIRE([AC_C_RESTRICT]) - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_CHECK_FUNCS([stpcpy]) if test $ac_cv_func_stpcpy = no; then HAVE_STPCPY=0 diff --git a/m4/stpncpy.m4 b/m4/stpncpy.m4 index 6b094246bd..c9f6c02f32 100644 --- a/m4/stpncpy.m4 +++ b/m4/stpncpy.m4 @@ -1,4 +1,4 @@ -# stpncpy.m4 serial 18 +# stpncpy.m4 serial 19 dnl Copyright (C) 2002-2003, 2005-2007, 2009-2021 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_STPNCPY], dnl The stpncpy() declaration in lib/string.in.h uses 'restrict'. AC_REQUIRE([AC_C_RESTRICT]) - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) dnl Both glibc and AIX (4.3.3, 5.1) have an stpncpy() function dnl declared in <string.h>. Its side effects are the same as those diff --git a/m4/strcase.m4 b/m4/strcase.m4 index eb11375d50..ea88283fd2 100644 --- a/m4/strcase.m4 +++ b/m4/strcase.m4 @@ -1,4 +1,4 @@ -# strcase.m4 serial 11 +# strcase.m4 serial 12 dnl Copyright (C) 2002, 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, @@ -12,7 +12,7 @@ AC_DEFUN([gl_STRCASE], AC_DEFUN([gl_FUNC_STRCASECMP], [ - AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS]) + AC_REQUIRE([gl_STRINGS_H_DEFAULTS]) AC_CHECK_FUNCS([strcasecmp]) if test $ac_cv_func_strcasecmp = no; then HAVE_STRCASECMP=0 @@ -21,7 +21,7 @@ AC_DEFUN([gl_FUNC_STRCASECMP], AC_DEFUN([gl_FUNC_STRNCASECMP], [ - AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS]) + AC_REQUIRE([gl_STRINGS_H_DEFAULTS]) AC_CHECK_FUNCS([strncasecmp]) if test $ac_cv_func_strncasecmp = yes; then HAVE_STRNCASECMP=1 diff --git a/m4/strcasestr.m4 b/m4/strcasestr.m4 index 5fabaa9564..e9dc3e29dd 100644 --- a/m4/strcasestr.m4 +++ b/m4/strcasestr.m4 @@ -1,4 +1,4 @@ -# strcasestr.m4 serial 26 +# strcasestr.m4 serial 27 dnl Copyright (C) 2005, 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, @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. dnl Check that strcasestr is present and works. AC_DEFUN([gl_FUNC_STRCASESTR_SIMPLE], [ - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) dnl Persuade glibc <string.h> to declare strcasestr(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) diff --git a/m4/strchrnul.m4 b/m4/strchrnul.m4 index 76c9a04966..ada3d15029 100644 --- a/m4/strchrnul.m4 +++ b/m4/strchrnul.m4 @@ -1,4 +1,4 @@ -# strchrnul.m4 serial 9 +# strchrnul.m4 serial 10 dnl Copyright (C) 2003, 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, @@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_STRCHRNUL], dnl Persuade glibc <string.h> to declare strchrnul(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_CHECK_FUNCS([strchrnul]) if test $ac_cv_func_strchrnul = no; then HAVE_STRCHRNUL=0 diff --git a/m4/strdup.m4 b/m4/strdup.m4 index f6f421d940..5b6018ff2b 100644 --- a/m4/strdup.m4 +++ b/m4/strdup.m4 @@ -1,4 +1,4 @@ -# strdup.m4 serial 14 +# strdup.m4 serial 15 dnl Copyright (C) 2002-2021 Free Software Foundation, Inc. @@ -8,7 +8,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_STRDUP], [ - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_CHECK_DECLS_ONCE([strdup]) if test $ac_cv_have_decl_strdup = no; then HAVE_DECL_STRDUP=0 @@ -17,7 +17,7 @@ AC_DEFUN([gl_FUNC_STRDUP], AC_DEFUN([gl_FUNC_STRDUP_POSIX], [ - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) if test $gl_cv_func_malloc_posix != yes; then REPLACE_STRDUP=1 diff --git a/m4/strerror.m4 b/m4/strerror.m4 index 48c56aec6a..438ba920c4 100644 --- a/m4/strerror.m4 +++ b/m4/strerror.m4 @@ -1,4 +1,4 @@ -# strerror.m4 serial 21 +# strerror.m4 serial 22 dnl Copyright (C) 2002, 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, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_STRERROR], [ - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_REQUIRE([gl_HEADER_ERRNO_H]) AC_REQUIRE([gl_FUNC_STRERROR_0]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles diff --git a/m4/strerror_r.m4 b/m4/strerror_r.m4 index b0b2ed0534..0689e46dc6 100644 --- a/m4/strerror_r.m4 +++ b/m4/strerror_r.m4 @@ -1,4 +1,4 @@ -# strerror_r.m4 serial 20 +# strerror_r.m4 serial 21 dnl Copyright (C) 2002, 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, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_STRERROR_R], [ - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_REQUIRE([gl_FUNC_STRERROR_R_WORKS]) dnl Persuade Solaris <string.h> to declare strerror_r(). diff --git a/m4/strerrorname_np.m4 b/m4/strerrorname_np.m4 index f02d482c71..a00778f082 100644 --- a/m4/strerrorname_np.m4 +++ b/m4/strerrorname_np.m4 @@ -1,4 +1,4 @@ -# strerrorname_np.m4 serial 1 +# strerrorname_np.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, @@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_STRERRORNAME_NP], dnl Persuade glibc <string.h> to declare strerrorname_np(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_CHECK_FUNCS([strerrorname_np]) if test $ac_cv_func_strerrorname_np = yes; then dnl In glibc 2.32, strerrorname_np returns English error descriptions, not diff --git a/m4/strftime-fixes.m4 b/m4/strftime-fixes.m4 index 18bf53bee7..09c60d0d0b 100644 --- a/m4/strftime-fixes.m4 +++ b/m4/strftime-fixes.m4 @@ -1,4 +1,4 @@ -# strftime-fixes.m4 serial 1 +# strftime-fixes.m4 serial 2 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, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_STRFTIME], [ - AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) + AC_REQUIRE([gl_TIME_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) case "$host_os" in mingw*) REPLACE_STRFTIME=1 ;; diff --git a/m4/string_h.m4 b/m4/string_h.m4 index f0f934f391..e44461f8b8 100644 --- a/m4/string_h.m4 +++ b/m4/string_h.m4 @@ -5,20 +5,15 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 30 +# serial 31 # Written by Paul Eggert. -AC_DEFUN([gl_HEADER_STRING_H], +AC_DEFUN_ONCE([gl_STRING_H], [ - dnl Use AC_REQUIRE here, so that the default behavior below is expanded - dnl once only, before all statements that occur in other macros. - AC_REQUIRE([gl_HEADER_STRING_H_BODY]) -]) - -AC_DEFUN([gl_HEADER_STRING_H_BODY], -[ - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. + AC_REQUIRE([gl_STRING_H_DEFAULTS]) gl_NEXT_HEADERS([string.h]) dnl Check for declarations of anything we want to poison if the @@ -35,60 +30,68 @@ AC_DEFUN([gl_HEADER_STRING_H_BODY], AC_DEFUN([gl_STRING_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_STRING_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) -AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], +AC_DEFUN([gl_STRING_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_STRING_H_MODULE_INDICATOR_DEFAULTS], [ + 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]) + dnl Support Microsoft deprecated alias function names by default. + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_MEMCCPY], [1]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_STRDUP], [1]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_STRING_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) +]) + +AC_DEFUN([gl_STRING_H_DEFAULTS], [ - 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. - 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 6f7b07a5e5..da19d1b876 100644 --- a/m4/strings_h.m4 +++ b/m4/strings_h.m4 @@ -1,21 +1,16 @@ # Configure a replacement for <strings.h>. -# serial 7 +# serial 8 # Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_HEADER_STRINGS_H], +AC_DEFUN_ONCE([gl_STRINGS_H], [ - dnl Use AC_REQUIRE here, so that the default behavior below is expanded - dnl once only, before all statements that occur in other macros. - AC_REQUIRE([gl_HEADER_STRINGS_H_BODY]) -]) - -AC_DEFUN([gl_HEADER_STRINGS_H_BODY], -[ - AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS]) + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. + AC_REQUIRE([gl_STRINGS_H_DEFAULTS]) gl_CHECK_NEXT_HEADERS([strings.h]) if test $ac_cv_header_strings_h = yes; then @@ -37,14 +32,22 @@ AC_DEFUN([gl_HEADER_STRINGS_H_BODY], AC_DEFUN([gl_STRINGS_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_STRINGS_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) ]) -AC_DEFUN([gl_HEADER_STRINGS_H_DEFAULTS], +AC_DEFUN([gl_STRINGS_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_STRINGS_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFS]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_STRINGS_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_STRINGS_H_DEFAULTS]) +]) + +AC_DEFUN([gl_STRINGS_H_DEFAULTS], [ - 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/strncat.m4 b/m4/strncat.m4 index eaf456cb15..f522d0f42e 100644 --- a/m4/strncat.m4 +++ b/m4/strncat.m4 @@ -1,4 +1,4 @@ -# strncat.m4 serial 5 +# strncat.m4 serial 6 dnl Copyright (C) 2002-2004, 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, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN_ONCE([gl_FUNC_STRNCAT], [ - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles diff --git a/m4/strndup.m4 b/m4/strndup.m4 index f7a6be9482..4c9ff6e955 100644 --- a/m4/strndup.m4 +++ b/m4/strndup.m4 @@ -1,4 +1,4 @@ -# strndup.m4 serial 22 +# strndup.m4 serial 23 dnl Copyright (C) 2002-2003, 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, @@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_STRNDUP], AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_CHECK_DECLS_ONCE([strndup]) AC_CHECK_FUNCS_ONCE([strndup]) if test $ac_cv_have_decl_strndup = no; then diff --git a/m4/strnlen.m4 b/m4/strnlen.m4 index bb9a680fdc..1d4f10616e 100644 --- a/m4/strnlen.m4 +++ b/m4/strnlen.m4 @@ -1,4 +1,4 @@ -# strnlen.m4 serial 13 +# strnlen.m4 serial 14 dnl Copyright (C) 2002-2003, 2005-2007, 2009-2021 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_STRNLEN], [ - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) dnl Persuade glibc <string.h> to declare strnlen(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) diff --git a/m4/strpbrk.m4 b/m4/strpbrk.m4 index 34e7148575..b4c07fb729 100644 --- a/m4/strpbrk.m4 +++ b/m4/strpbrk.m4 @@ -1,4 +1,4 @@ -# strpbrk.m4 serial 6 +# strpbrk.m4 serial 7 dnl Copyright (C) 2002-2003, 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, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_STRPBRK], [ - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_CHECK_FUNCS([strpbrk]) if test $ac_cv_func_strpbrk = no; then HAVE_STRPBRK=0 diff --git a/m4/strptime.m4 b/m4/strptime.m4 index ecf2b186f9..982fec8341 100644 --- a/m4/strptime.m4 +++ b/m4/strptime.m4 @@ -1,4 +1,4 @@ -# strptime.m4 serial 7 +# strptime.m4 serial 8 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, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_STRPTIME], [ - AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) + AC_REQUIRE([gl_TIME_H_DEFAULTS]) AC_REQUIRE([AC_C_RESTRICT]) AC_CHECK_FUNCS_ONCE([strptime]) if test $ac_cv_func_strptime != yes; then diff --git a/m4/strsep.m4 b/m4/strsep.m4 index 159d41b0ae..8743f055f0 100644 --- a/m4/strsep.m4 +++ b/m4/strsep.m4 @@ -1,4 +1,4 @@ -# strsep.m4 serial 10 +# strsep.m4 serial 11 dnl Copyright (C) 2002-2004, 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, @@ -12,7 +12,7 @@ AC_DEFUN([gl_FUNC_STRSEP], dnl The strsep() declaration in lib/string.in.h uses 'restrict'. AC_REQUIRE([AC_C_RESTRICT]) - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_CHECK_FUNCS([strsep]) if test $ac_cv_func_strsep = no; then HAVE_STRSEP=0 diff --git a/m4/strsignal.m4 b/m4/strsignal.m4 index beefff5ded..5cd9f0545b 100644 --- a/m4/strsignal.m4 +++ b/m4/strsignal.m4 @@ -1,4 +1,4 @@ -# strsignal.m4 serial 9 +# strsignal.m4 serial 10 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, @@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_STRSIGNAL], dnl Persuade glibc <string.h> to declare strsignal(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CHECK_DECLS_ONCE([strsignal]) diff --git a/m4/strstr.m4 b/m4/strstr.m4 index 1226b056ef..9604fe226f 100644 --- a/m4/strstr.m4 +++ b/m4/strstr.m4 @@ -1,4 +1,4 @@ -# strstr.m4 serial 22 +# strstr.m4 serial 23 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, @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. dnl Check that strstr works. AC_DEFUN([gl_FUNC_STRSTR_SIMPLE], [ - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_REQUIRE([gl_FUNC_MEMCHR]) if test $REPLACE_MEMCHR = 1; then REPLACE_STRSTR=1 diff --git a/m4/strtok_r.m4 b/m4/strtok_r.m4 index b8e2f6821f..82cbf0dd1e 100644 --- a/m4/strtok_r.m4 +++ b/m4/strtok_r.m4 @@ -1,4 +1,4 @@ -# strtok_r.m4 serial 15 +# strtok_r.m4 serial 16 dnl Copyright (C) 2002-2004, 2006-2007, 2009-2021 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_STRTOK_R], dnl The strtok_r() declaration in lib/string.in.h uses 'restrict'. AC_REQUIRE([AC_C_RESTRICT]) - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CHECK_FUNCS([strtok_r]) if test $ac_cv_func_strtok_r = yes; then diff --git a/m4/strverscmp.m4 b/m4/strverscmp.m4 index 362bb7bf9c..8644527a08 100644 --- a/m4/strverscmp.m4 +++ b/m4/strverscmp.m4 @@ -1,4 +1,4 @@ -# strverscmp.m4 serial 8 +# strverscmp.m4 serial 9 dnl Copyright (C) 2002, 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, @@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_STRVERSCMP], dnl Persuade glibc <string.h> to declare strverscmp(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) + AC_REQUIRE([gl_STRING_H_DEFAULTS]) AC_CHECK_FUNCS([strverscmp]) if test $ac_cv_func_strverscmp = no; then HAVE_STRVERSCMP=0 diff --git a/m4/sys_file_h.m4 b/m4/sys_file_h.m4 index ab3e3ab204..4515c73a3c 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 7 +# serial 8 # Copyright (C) 2008-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -8,9 +8,9 @@ # Written by Richard W.M. Jones. -AC_DEFUN([gl_HEADER_SYS_FILE_H], +AC_DEFUN_ONCE([gl_SYS_FILE_H], [ - AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS]) + AC_REQUIRE([gl_SYS_FILE_H_DEFAULTS]) dnl <sys/file.h> is always overridden, because of GNULIB_POSIXCHECK. gl_CHECK_NEXT_HEADERS([sys/file.h]) @@ -28,14 +28,22 @@ AC_DEFUN([gl_HEADER_SYS_FILE_H], ]], [flock]) ]) -AC_DEFUN([gl_HEADER_SYS_FILE_MODULE_INDICATOR], +AC_DEFUN([gl_SYS_FILE_MODULE_INDICATOR], [ - AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS]) + gl_SYS_FILE_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) ]) -AC_DEFUN([gl_HEADER_SYS_FILE_H_DEFAULTS], +AC_DEFUN([gl_SYS_FILE_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_FILE_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FLOCK]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_FILE_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_SYS_FILE_H_DEFAULTS]) +]) + +AC_DEFUN([gl_SYS_FILE_H_DEFAULTS], [ - 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 941bf8670f..9f36509102 100644 --- a/m4/sys_ioctl_h.m4 +++ b/m4/sys_ioctl_h.m4 @@ -1,4 +1,4 @@ -# sys_ioctl_h.m4 serial 13 +# sys_ioctl_h.m4 serial 14 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, @@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Bruno Haible. -AC_DEFUN([gl_SYS_IOCTL_H], +AC_DEFUN_ONCE([gl_SYS_IOCTL_H], [ - dnl Use AC_REQUIRE here, so that the default behavior below is expanded - dnl once only, before all statements that occur in other macros. + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS]) AC_CHECK_HEADERS_ONCE([sys/ioctl.h]) @@ -46,16 +46,24 @@ AC_DEFUN([gl_SYS_IOCTL_H], AC_DEFUN([gl_SYS_IOCTL_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_SYS_IOCTL_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_SYS_IOCTL_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_IOCTL_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_IOCTL]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_IOCTL_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS]) +]) + AC_DEFUN([gl_SYS_IOCTL_H_DEFAULTS], [ - 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 d5f97544f5..621601f156 100644 --- a/m4/sys_random_h.m4 +++ b/m4/sys_random_h.m4 @@ -1,10 +1,10 @@ -# sys_random_h.m4 serial 6 +# sys_random_h.m4 serial 7 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, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_HEADER_SYS_RANDOM], +AC_DEFUN_ONCE([gl_SYS_RANDOM_H], [ AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) dnl <sys/random.h> is always overridden, because of GNULIB_POSIXCHECK. @@ -37,16 +37,24 @@ AC_DEFUN([gl_HEADER_SYS_RANDOM], AC_DEFUN([gl_SYS_RANDOM_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_SYS_RANDOM_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_SYS_RANDOM_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_RANDOM_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETRANDOM]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_RANDOM_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_SYS_RANDOM_H_DEFAULTS]) +]) + AC_DEFUN([gl_SYS_RANDOM_H_DEFAULTS], [ - 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 0331f83b14..4570a01c40 100644 --- a/m4/sys_resource_h.m4 +++ b/m4/sys_resource_h.m4 @@ -1,10 +1,10 @@ -# sys_resource_h.m4 serial 3 +# sys_resource_h.m4 serial 4 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, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_HEADER_SYS_RESOURCE], +AC_DEFUN_ONCE([gl_SYS_RESOURCE_H], [ AC_REQUIRE([gl_SYS_RESOURCE_H_DEFAULTS]) dnl <sys/resource.h> is always overridden, because of GNULIB_POSIXCHECK. @@ -32,16 +32,24 @@ AC_DEFUN([gl_HEADER_SYS_RESOURCE], AC_DEFUN([gl_SYS_RESOURCE_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_SYS_RESOURCE_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_SYS_RESOURCE_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_SYS_RESOURCE_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_RESOURCE_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETRUSAGE]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_RESOURCE_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_SYS_RESOURCE_H_DEFAULTS]) +]) + AC_DEFUN([gl_SYS_RESOURCE_H_DEFAULTS], [ - 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 8fefc547ba..198bb05286 100644 --- a/m4/sys_select_h.m4 +++ b/m4/sys_select_h.m4 @@ -1,13 +1,13 @@ -# sys_select_h.m4 serial 21 +# sys_select_h.m4 serial 22 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, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_HEADER_SYS_SELECT], +AC_DEFUN_ONCE([gl_SYS_SELECT_H], [ - AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_SYS_SELECT_H_DEFAULTS]) + AC_REQUIRE([AC_C_RESTRICT]) AC_CACHE_CHECK([whether <sys/select.h> is self-contained], [gl_cv_header_sys_select_h_selfcontained], [ @@ -77,17 +77,25 @@ AC_DEFUN([gl_HEADER_SYS_SELECT], AC_DEFUN([gl_SYS_SELECT_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_SYS_SELECT_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_SYS_SELECT_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_SYS_SELECT_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_SELECT_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PSELECT]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SELECT]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_SELECT_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_SYS_SELECT_H_DEFAULTS]) +]) + AC_DEFUN([gl_SYS_SELECT_H_DEFAULTS], [ - 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 fbaf9891fa..8a8075c494 100644 --- a/m4/sys_socket_h.m4 +++ b/m4/sys_socket_h.m4 @@ -1,4 +1,4 @@ -# sys_socket_h.m4 serial 26 +# sys_socket_h.m4 serial 27 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, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. dnl From Simon Josefsson. -AC_DEFUN([gl_HEADER_SYS_SOCKET], +AC_DEFUN_ONCE([gl_SYS_SOCKET_H], [ AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) @@ -158,30 +158,38 @@ AC_DEFUN([gl_PREREQ_SYS_H_WS2TCPIP], AC_DEFUN([gl_SYS_SOCKET_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_SYS_SOCKET_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_SYS_SOCKET_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_SOCKET_H_MODULE_INDICATOR_DEFAULTS], [ + 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]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_SOCKET_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) +]) + AC_DEFUN([gl_SYS_SOCKET_H_DEFAULTS], [ - 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 506a0fc361..02a621c4c1 100644 --- a/m4/sys_stat_h.m4 +++ b/m4/sys_stat_h.m4 @@ -1,4 +1,4 @@ -# sys_stat_h.m4 serial 39 -*- Autoconf -*- +# sys_stat_h.m4 serial 40 -*- 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, @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. dnl From Eric Blake. dnl Provide a GNU-like <sys/stat.h>. -AC_DEFUN([gl_HEADER_SYS_STAT_H], +AC_DEFUN_ONCE([gl_SYS_STAT_H], [ AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) @@ -54,36 +54,44 @@ AC_DEFUN([gl_HEADER_SYS_STAT_H], AC_DEFUN([gl_SYS_STAT_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_SYS_STAT_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_SYS_STAT_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS], [ + gl_UNISTD_H_REQUIRE_DEFAULTS dnl for REPLACE_FCHDIR + 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. + 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]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) +]) + AC_DEFUN([gl_SYS_STAT_H_DEFAULTS], [ - AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for REPLACE_FCHDIR - 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. - 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 040b122100..81b755d5c2 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 10 +# serial 11 # Copyright (C) 2007, 2009-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -8,18 +8,13 @@ # Written by Paul Eggert and Martin Lambers. -AC_DEFUN([gl_HEADER_SYS_TIME_H], +AC_DEFUN_ONCE([gl_SYS_TIME_H], [ dnl Use AC_REQUIRE here, so that the REPLACE_GETTIMEOFDAY=0 statement dnl below is expanded once only, before all REPLACE_GETTIMEOFDAY=1 dnl statements that occur in other macros. - AC_REQUIRE([gl_HEADER_SYS_TIME_H_BODY]) -]) - -AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY], -[ + AC_REQUIRE([gl_SYS_TIME_H_DEFAULTS]) AC_REQUIRE([AC_C_RESTRICT]) - AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS]) AC_CHECK_HEADERS_ONCE([sys/time.h]) gl_CHECK_NEXT_HEADERS([sys/time.h]) @@ -91,16 +86,24 @@ AC_DEFUN([gl_HEADER_SYS_TIME_H_BODY], AC_DEFUN([gl_SYS_TIME_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_SYS_TIME_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) -AC_DEFUN([gl_HEADER_SYS_TIME_H_DEFAULTS], +AC_DEFUN([gl_SYS_TIME_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TIME_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETTIMEOFDAY]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TIME_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_SYS_TIME_H_DEFAULTS]) +]) + +AC_DEFUN([gl_SYS_TIME_H_DEFAULTS], [ - 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 5e799344df..c83a9d6b6c 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 9 +# serial 10 # Copyright (C) 2008-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -8,7 +8,7 @@ # Written by Simon Josefsson. -AC_DEFUN([gl_SYS_TIMES_H], +AC_DEFUN_ONCE([gl_SYS_TIMES_H], [ AC_REQUIRE([gl_SYS_TIMES_H_DEFAULTS]) @@ -38,14 +38,22 @@ AC_DEFUN([gl_SYS_TIMES_H], AC_DEFUN([gl_SYS_TIMES_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_SYS_TIMES_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_SYS_TIMES_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) ]) +AC_DEFUN([gl_SYS_TIMES_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TIMES_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMES]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TIMES_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_SYS_TIMES_H_DEFAULTS]) +]) + AC_DEFUN([gl_SYS_TIMES_H_DEFAULTS], [ - 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_types_h.m4 b/m4/sys_types_h.m4 index 2172c836d9..53f2c0965e 100644 --- a/m4/sys_types_h.m4 +++ b/m4/sys_types_h.m4 @@ -1,4 +1,4 @@ -# sys_types_h.m4 serial 11 +# sys_types_h.m4 serial 12 dnl Copyright (C) 2011-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, @@ -6,10 +6,11 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN_ONCE([gl_SYS_TYPES_H], [ + AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) + dnl Use sane struct stat types in OpenVMS 8.2 and later. AC_DEFINE([_USE_STD_STAT], 1, [For standard stat data types on VMS.]) - AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) gl_NEXT_HEADERS([sys/types.h]) dnl Ensure the type pid_t gets defined. @@ -30,6 +31,14 @@ AC_DEFUN_ONCE([gl_SYS_TYPES_H], AC_SUBST([WINDOWS_STAT_INODES]) ]) +AC_DEFUN([gl_SYS_TYPES_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TYPE_H_MODULE_INDICATOR_DEFAULTS], [ + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TYPE_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) +]) + AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS], [ ]) diff --git a/m4/sys_uio_h.m4 b/m4/sys_uio_h.m4 index 503de4d1fd..baea88a07c 100644 --- a/m4/sys_uio_h.m4 +++ b/m4/sys_uio_h.m4 @@ -1,10 +1,10 @@ -# sys_uio_h.m4 serial 1 +# sys_uio_h.m4 serial 2 dnl Copyright (C) 2011-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, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_HEADER_SYS_UIO], +AC_DEFUN_ONCE([gl_SYS_UIO_H], [ AC_REQUIRE([gl_SYS_UIO_H_DEFAULTS]) dnl <sys/uio.h> is always overridden, because of GNULIB_POSIXCHECK. @@ -19,13 +19,21 @@ AC_DEFUN([gl_HEADER_SYS_UIO], AC_DEFUN([gl_SYS_UIO_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_SYS_UIO_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_SYS_UIO_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_SYS_UIO_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_UIO_H_MODULE_INDICATOR_DEFAULTS], [ + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_UIO_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_SYS_UIO_H_DEFAULTS]) +]) + AC_DEFUN([gl_SYS_UIO_H_DEFAULTS], [ ]) diff --git a/m4/sys_utsname_h.m4 b/m4/sys_utsname_h.m4 index 36b8271993..cc1d8497c5 100644 --- a/m4/sys_utsname_h.m4 +++ b/m4/sys_utsname_h.m4 @@ -1,4 +1,4 @@ -# sys_utsname_h.m4 serial 9 +# sys_utsname_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, @@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Bruno Haible. -AC_DEFUN([gl_SYS_UTSNAME_H], +AC_DEFUN_ONCE([gl_SYS_UTSNAME_H], [ - dnl Use AC_REQUIRE here, so that the default behavior below is expanded - dnl once only, before all statements that occur in other macros. + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. AC_REQUIRE([gl_SYS_UTSNAME_H_DEFAULTS]) dnl <sys/utsname.h> is always overridden, because of GNULIB_POSIXCHECK. @@ -40,14 +40,22 @@ AC_DEFUN([gl_SYS_UTSNAME_H], AC_DEFUN([gl_SYS_UTSNAME_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_SYS_UTSNAME_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_SYS_UTSNAME_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) ]) +AC_DEFUN([gl_SYS_UTSNAME_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_UTSNAME_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNAME]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_UTSNAME_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_SYS_UTSNAME_H_DEFAULTS]) +]) + AC_DEFUN([gl_SYS_UTSNAME_H_DEFAULTS], [ - 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 9fe34b4708..294ab52c27 100644 --- a/m4/sys_wait_h.m4 +++ b/m4/sys_wait_h.m4 @@ -1,10 +1,10 @@ -# sys_wait_h.m4 serial 7 +# sys_wait_h.m4 serial 8 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, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_SYS_WAIT_H], +AC_DEFUN_ONCE([gl_SYS_WAIT_H], [ AC_REQUIRE([gl_SYS_WAIT_H_DEFAULTS]) @@ -22,15 +22,23 @@ AC_DEFUN([gl_SYS_WAIT_H], AC_DEFUN([gl_SYS_WAIT_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_SYS_WAIT_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_SYS_WAIT_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_SYS_WAIT_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_WAIT_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WAITPID]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_WAIT_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_SYS_WAIT_H_DEFAULTS]) +]) + AC_DEFUN([gl_SYS_WAIT_H_DEFAULTS], [ - 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 825758eae6..c7d57fc976 100644 --- a/m4/termios_h.m4 +++ b/m4/termios_h.m4 @@ -1,13 +1,13 @@ -# termios_h.m4 serial 5 +# termios_h.m4 serial 6 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, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_TERMIOS_H], +AC_DEFUN_ONCE([gl_TERMIOS_H], [ - dnl Use AC_REQUIRE here, so that the default behavior below is expanded - dnl once only, before all statements that occur in other macros. + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. AC_REQUIRE([gl_TERMIOS_H_DEFAULTS]) gl_CHECK_NEXT_HEADERS([termios.h]) @@ -27,16 +27,24 @@ AC_DEFUN([gl_TERMIOS_H], AC_DEFUN([gl_TERMIOS_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_TERMIOS_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_TERMIOS_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_TERMIOS_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_TERMIOS_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TCGETSID]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_TERMIOS_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_TERMIOS_H_DEFAULTS]) +]) + AC_DEFUN([gl_TERMIOS_H_DEFAULTS], [ - 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 14b7ca8288..2a2bfeacb9 100644 --- a/m4/threads.m4 +++ b/m4/threads.m4 @@ -1,4 +1,4 @@ -# threads.m4 serial 8 +# threads.m4 serial 9 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, @@ -9,7 +9,7 @@ dnl Sets the variable LIBSTDTHREAD to the linker options for use in a Makefile dnl for a program that uses the <threads.h> functions. dnl Sets the variable LIBTHREADLOCAL to the linker options for use in a Makefile dnl for a program that uses the 'thread_local' macro. -AC_DEFUN([gl_THREADS_H], +AC_DEFUN_ONCE([gl_THREADS_H], [ AC_REQUIRE([gl_THREADS_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) @@ -139,19 +139,27 @@ AC_DEFUN([gl_THREAD_LOCAL_DEFINITION], AC_DEFUN([gl_THREADS_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_THREADS_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_THREADS_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_THREADS_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_THREADS_H_MODULE_INDICATOR_DEFAULTS], [ + 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]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_THREADS_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_THREADS_H_DEFAULTS]) +]) + AC_DEFUN([gl_THREADS_H_DEFAULTS], [ - 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 e0dd2f075c..8c8648eeec 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 16 +# serial 17 # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10,16 +10,11 @@ # Written by Paul Eggert and Jim Meyering. -AC_DEFUN([gl_HEADER_TIME_H], +AC_DEFUN_ONCE([gl_TIME_H], [ - dnl Use AC_REQUIRE here, so that the default behavior below is expanded - dnl once only, before all statements that occur in other macros. - AC_REQUIRE([gl_HEADER_TIME_H_BODY]) -]) - -AC_DEFUN([gl_HEADER_TIME_H_BODY], -[ - AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. + AC_REQUIRE([gl_TIME_H_DEFAULTS]) gl_NEXT_HEADERS([time.h]) AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC]) @@ -113,28 +108,36 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC], AC_DEFUN([gl_TIME_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_TIME_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) -AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS], +AC_DEFUN([gl_TIME_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_TIME_H_MODULE_INDICATOR_DEFAULTS], [ + 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. + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TZSET], [1]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_TIME_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_TIME_H_DEFAULTS]) +]) + +AC_DEFUN([gl_TIME_H_DEFAULTS], [ - 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. - 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/time_r.m4 b/m4/time_r.m4 index 713e93ac26..2d49b64f12 100644 --- a/m4/time_r.m4 +++ b/m4/time_r.m4 @@ -12,7 +12,7 @@ AC_DEFUN([gl_TIME_R], dnl Persuade glibc and Solaris <time.h> to declare localtime_r. AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) + AC_REQUIRE([gl_TIME_H_DEFAULTS]) AC_REQUIRE([AC_C_RESTRICT]) dnl Some systems don't declare localtime_r() and gmtime_r() if _REENTRANT is diff --git a/m4/time_rz.m4 b/m4/time_rz.m4 index 34ef0bab4b..c5e85dc625 100644 --- a/m4/time_rz.m4 +++ b/m4/time_rz.m4 @@ -10,7 +10,7 @@ dnl Written by Paul Eggert. AC_DEFUN([gl_TIME_RZ], [ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) + AC_REQUIRE([gl_TIME_H_DEFAULTS]) AC_REQUIRE([AC_STRUCT_TIMEZONE]) # On Mac OS X 10.6, localtime loops forever with some time_t values. diff --git a/m4/timegm.m4 b/m4/timegm.m4 index 098c857e7f..58123beb0c 100644 --- a/m4/timegm.m4 +++ b/m4/timegm.m4 @@ -1,4 +1,4 @@ -# timegm.m4 serial 12 +# timegm.m4 serial 13 dnl Copyright (C) 2003, 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, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_TIMEGM], [ - AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) + AC_REQUIRE([gl_TIME_H_DEFAULTS]) AC_REQUIRE([gl_FUNC_MKTIME_WORKS]) REPLACE_TIMEGM=0 AC_CHECK_FUNCS_ONCE([timegm]) diff --git a/m4/timespec_get.m4 b/m4/timespec_get.m4 index a4a3b78b81..542c3f1a23 100644 --- a/m4/timespec_get.m4 +++ b/m4/timespec_get.m4 @@ -1,4 +1,4 @@ -# timespec_get.m4 serial 1 +# timespec_get.m4 serial 2 dnl Copyright (C) 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, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_TIMESPEC_GET], [ - AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) + AC_REQUIRE([gl_TIME_H_DEFAULTS]) dnl Persuade OpenBSD <time.h> to declare timespec_get(). AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) diff --git a/m4/tzset.m4 b/m4/tzset.m4 index 8eaf41f416..8a4f285570 100644 --- a/m4/tzset.m4 +++ b/m4/tzset.m4 @@ -1,4 +1,4 @@ -# serial 15 +# serial 16 # Copyright (C) 2003, 2007, 2009-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_TZSET], [ - AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) + AC_REQUIRE([gl_TIME_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) REPLACE_TZSET=0 case "$host_os" in diff --git a/m4/uchar.m4 b/m4/uchar.m4 index 62c6e06242..6ebe94de2a 100644 --- a/m4/uchar.m4 +++ b/m4/uchar.m4 @@ -1,4 +1,4 @@ -# uchar.m4 serial 18 +# uchar.m4 serial 19 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, @@ -75,7 +75,6 @@ dnl On Haiku 2020, char16_t and char32_t are incorrectly defined. dnl See <https://dev.haiku-os.org/ticket/15990>. AC_DEFUN_ONCE([gl_TYPE_CHAR16_T], [ - AC_REQUIRE([gl_UCHAR_H_DEFAULTS]) dnl Determine whether gnulib's <uchar.h> would, if present, override char16_t. AC_CACHE_CHECK([whether char16_t is correctly defined], [gl_cv_type_char16_t_works], @@ -92,11 +91,13 @@ AC_DEFUN_ONCE([gl_TYPE_CHAR16_T], ]) if test $gl_cv_type_char16_t_works = no; then GNULIBHEADERS_OVERRIDE_CHAR16_T=1 + else + GNULIBHEADERS_OVERRIDE_CHAR16_T=0 fi + AC_SUBST([GNULIBHEADERS_OVERRIDE_CHAR16_T]) ]) AC_DEFUN_ONCE([gl_TYPE_CHAR32_T], [ - AC_REQUIRE([gl_UCHAR_H_DEFAULTS]) dnl Determine whether gnulib's <uchar.h> would, if present, override char32_t. AC_CACHE_CHECK([whether char32_t is correctly defined], [gl_cv_type_char32_t_works], @@ -113,44 +114,53 @@ AC_DEFUN_ONCE([gl_TYPE_CHAR32_T], ]) if test $gl_cv_type_char32_t_works = no; then GNULIBHEADERS_OVERRIDE_CHAR32_T=1 + else + GNULIBHEADERS_OVERRIDE_CHAR32_T=0 fi + AC_SUBST([GNULIBHEADERS_OVERRIDE_CHAR32_T]) ]) AC_DEFUN([gl_UCHAR_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_UCHAR_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_UCHAR_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_UCHAR_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_UCHAR_H_MODULE_INDICATOR_DEFAULTS], [ + 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]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_UCHAR_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_UCHAR_H_DEFAULTS]) +]) + AC_DEFUN([gl_UCHAR_H_DEFAULTS], [ - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIBHEADERS_OVERRIDE_CHAR16_T]) - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIBHEADERS_OVERRIDE_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 ffa36b04c1..ada0101c29 100644 --- a/m4/unistd_h.m4 +++ b/m4/unistd_h.m4 @@ -1,4 +1,4 @@ -# unistd_h.m4 serial 86 +# unistd_h.m4 serial 87 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, @@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Simon Josefsson, Bruno Haible. -AC_DEFUN([gl_UNISTD_H], +AC_DEFUN_ONCE([gl_UNISTD_H], [ - dnl Use AC_REQUIRE here, so that the default behavior below is expanded - dnl once only, before all statements that occur in other macros. + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) gl_CHECK_NEXT_HEADERS([unistd.h]) @@ -61,98 +61,106 @@ AC_DEFUN([gl_UNISTD_H], AC_DEFUN([gl_UNISTD_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_UNISTD_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_UNISTD_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_UNISTD_H_MODULE_INDICATOR_DEFAULTS], [ + 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. + 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]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_UNISTD_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) +]) + AC_DEFUN([gl_UNISTD_H_DEFAULTS], [ - 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. - 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 895130a536..1daed6e179 100644 --- a/m4/utime_h.m4 +++ b/m4/utime_h.m4 @@ -1,4 +1,4 @@ -# utime_h.m4 serial 6 +# utime_h.m4 serial 7 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, @@ -6,10 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. -AC_DEFUN([gl_UTIME_H], +AC_DEFUN_ONCE([gl_UTIME_H], [ - AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([gl_UTIME_H_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) m4_ifdef([gl_ANSI_CXX], [AC_REQUIRE([gl_ANSI_CXX])]) AC_CHECK_HEADERS_ONCE([utime.h]) gl_CHECK_NEXT_HEADERS([utime.h]) @@ -30,18 +30,26 @@ AC_DEFUN([gl_UTIME_H], AC_DEFUN([gl_UTIME_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_UTIME_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_UTIME_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_UTIME_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_UTIME_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UTIME]) + dnl Support Microsoft deprecated alias function names by default. + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_UTIME], [1]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_UTIME_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_UTIME_H_DEFAULTS]) +]) + AC_DEFUN([gl_UTIME_H_DEFAULTS], [ - gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UTIME]) - dnl Support Microsoft deprecated alias function names by default. - 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 cfb72c8973..9b3e2b0cbc 100644 --- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -7,9 +7,9 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Eric Blake. -# wchar_h.m4 serial 51 +# wchar_h.m4 serial 52 -AC_DEFUN([gl_WCHAR_H], +AC_DEFUN_ONCE([gl_WCHAR_H], [ AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) AC_REQUIRE([gl_WCHAR_H_INLINE_OK]) @@ -127,58 +127,66 @@ Configuration aborted.]) AC_DEFUN([gl_WCHAR_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_WCHAR_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_WCHAR_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_WCHAR_H_MODULE_INDICATOR_DEFAULTS], [ + 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. + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WCSDUP], [1]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_WCHAR_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) +]) + AC_DEFUN([gl_WCHAR_H_DEFAULTS], [ - 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. - 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 3ac5e649a2..b32c8634a4 100644 --- a/m4/wctype_h.m4 +++ b/m4/wctype_h.m4 @@ -1,4 +1,4 @@ -# wctype_h.m4 serial 28 +# wctype_h.m4 serial 29 dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it. @@ -9,7 +9,7 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Paul Eggert. -AC_DEFUN([gl_WCTYPE_H], +AC_DEFUN_ONCE([gl_WCTYPE_H], [ AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) AC_REQUIRE([AC_PROG_CC]) @@ -159,22 +159,30 @@ AC_DEFUN([gl_WCTYPE_H], AC_DEFUN([gl_WCTYPE_MODULE_INDICATOR], [ - dnl Use AC_REQUIRE here, so that the default settings are expanded once only. - AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) + dnl Ensure to expand the default settings once only. + gl_WCTYPE_H_REQUIRE_DEFAULTS gl_MODULE_INDICATOR_SET_VARIABLE([$1]) dnl Define it also as a C macro, for the benefit of the unit tests. gl_MODULE_INDICATOR_FOR_TESTS([$1]) ]) +AC_DEFUN([gl_WCTYPE_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_WCTYPE_H_MODULE_INDICATOR_DEFAULTS], [ + 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]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_WCTYPE_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) +]) + AC_DEFUN([gl_WCTYPE_H_DEFAULTS], [ - 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]) diff --git a/modules/accept b/modules/accept index b997566d57..d95c8295f7 100644 --- a/modules/accept +++ b/modules/accept @@ -13,7 +13,7 @@ errno [test "$ac_cv_header_winsock2_h" = yes] msvc-nothrow [test "$ac_cv_header_winsock2_h" = yes] configure.ac: -AC_REQUIRE([gl_HEADER_SYS_SOCKET]) +AC_REQUIRE([gl_SYS_SOCKET_H]) if test "$ac_cv_header_winsock2_h" = yes; then AC_LIBOBJ([accept]) fi diff --git a/modules/arpa_inet b/modules/arpa_inet index 317bf8d7ce..7e630427eb 100644 --- a/modules/arpa_inet +++ b/modules/arpa_inet @@ -15,7 +15,8 @@ snippet/warn-on-use sys_socket configure.ac: -gl_HEADER_ARPA_INET +gl_ARPA_INET_H +gl_ARPA_INET_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P Makefile.am: diff --git a/modules/bind b/modules/bind index e46bd267a7..bd0ef9d649 100644 --- a/modules/bind +++ b/modules/bind @@ -12,7 +12,7 @@ errno [test "$ac_cv_header_winsock2_h" = yes] msvc-nothrow [test "$ac_cv_header_winsock2_h" = yes] configure.ac: -AC_REQUIRE([gl_HEADER_SYS_SOCKET]) +AC_REQUIRE([gl_SYS_SOCKET_H]) if test "$ac_cv_header_winsock2_h" = yes; then AC_LIBOBJ([bind]) fi diff --git a/modules/connect b/modules/connect index c77632ca61..91e1534c43 100644 --- a/modules/connect +++ b/modules/connect @@ -12,7 +12,7 @@ errno [test "$ac_cv_header_winsock2_h" = yes] msvc-nothrow [test "$ac_cv_header_winsock2_h" = yes] configure.ac: -AC_REQUIRE([gl_HEADER_SYS_SOCKET]) +AC_REQUIRE([gl_SYS_SOCKET_H]) if test "$ac_cv_header_winsock2_h" = yes; then AC_LIBOBJ([connect]) fi diff --git a/modules/ctype b/modules/ctype index 36a1760f20..0196dfadf6 100644 --- a/modules/ctype +++ b/modules/ctype @@ -13,6 +13,7 @@ snippet/warn-on-use configure.ac: gl_CTYPE_H +gl_CTYPE_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += ctype.h diff --git a/modules/dirent b/modules/dirent index 08a6326cf1..80e3843ce4 100644 --- a/modules/dirent +++ b/modules/dirent @@ -15,6 +15,7 @@ snippet/warn-on-use configure.ac: gl_DIRENT_H +gl_DIRENT_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += dirent.h diff --git a/modules/fcntl-h b/modules/fcntl-h index 429c283ae4..2277789d93 100644 --- a/modules/fcntl-h +++ b/modules/fcntl-h @@ -18,6 +18,7 @@ unistd configure.ac: gl_FCNTL_H +gl_FCNTL_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += fcntl.h diff --git a/modules/flock b/modules/flock index 73d27c6221..f45f616370 100644 --- a/modules/flock +++ b/modules/flock @@ -15,7 +15,7 @@ if test $HAVE_FLOCK = 0; then AC_LIBOBJ([flock]) gl_PREREQ_FLOCK fi -gl_HEADER_SYS_FILE_MODULE_INDICATOR([flock]) +gl_SYS_FILE_MODULE_INDICATOR([flock]) Makefile.am: diff --git a/modules/fnmatch-h b/modules/fnmatch-h index 31832d40ed..43800764c5 100644 --- a/modules/fnmatch-h +++ b/modules/fnmatch-h @@ -14,6 +14,7 @@ snippet/warn-on-use configure.ac: gl_FNMATCH_H +gl_FNMATCH_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += $(FNMATCH_H) diff --git a/modules/getpeername b/modules/getpeername index 53f077b735..c03e3244fa 100644 --- a/modules/getpeername +++ b/modules/getpeername @@ -14,7 +14,7 @@ errno [test "$ac_cv_header_winsock2_h" = yes] msvc-nothrow [test "$ac_cv_header_winsock2_h" = yes] configure.ac: -AC_REQUIRE([gl_HEADER_SYS_SOCKET]) +AC_REQUIRE([gl_SYS_SOCKET_H]) if test "$ac_cv_header_winsock2_h" = yes; then AC_LIBOBJ([getpeername]) fi diff --git a/modules/getsockname b/modules/getsockname index 8a8ffe0bde..7bb278be8b 100644 --- a/modules/getsockname +++ b/modules/getsockname @@ -14,7 +14,7 @@ errno [test "$ac_cv_header_winsock2_h" = yes] msvc-nothrow [test "$ac_cv_header_winsock2_h" = yes] configure.ac: -AC_REQUIRE([gl_HEADER_SYS_SOCKET]) +AC_REQUIRE([gl_SYS_SOCKET_H]) if test "$ac_cv_header_winsock2_h" = yes; then AC_LIBOBJ([getsockname]) fi diff --git a/modules/getsockopt b/modules/getsockopt index adb4b87b2f..d5d7310812 100644 --- a/modules/getsockopt +++ b/modules/getsockopt @@ -14,7 +14,7 @@ errno [test "$ac_cv_header_winsock2_h" = yes] msvc-nothrow [test "$ac_cv_header_winsock2_h" = yes] configure.ac: -AC_REQUIRE([gl_HEADER_SYS_SOCKET]) +AC_REQUIRE([gl_SYS_SOCKET_H]) if test "$ac_cv_header_winsock2_h" = yes; then AC_LIBOBJ([getsockopt]) fi diff --git a/modules/glob-h b/modules/glob-h index b490a73276..40df48f130 100644 --- a/modules/glob-h +++ b/modules/glob-h @@ -18,6 +18,7 @@ sys_stat configure.ac: gl_GLOB_H +gl_GLOB_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += $(GLOB_H) diff --git a/modules/iconv-h b/modules/iconv-h index c5f353ad63..b7a6045270 100644 --- a/modules/iconv-h +++ b/modules/iconv-h @@ -13,6 +13,7 @@ snippet/warn-on-use configure.ac: gl_ICONV_H +gl_ICONV_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += $(ICONV_H) diff --git a/modules/inttypes-incomplete b/modules/inttypes-incomplete index 3fd886f85a..0e73c90020 100644 --- a/modules/inttypes-incomplete +++ b/modules/inttypes-incomplete @@ -15,6 +15,7 @@ stdint configure.ac: gl_INTTYPES_INCOMPLETE +gl_INTTYPES_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += inttypes.h diff --git a/modules/langinfo b/modules/langinfo index 6be975da36..0e4aa964ad 100644 --- a/modules/langinfo +++ b/modules/langinfo @@ -13,6 +13,7 @@ snippet/warn-on-use configure.ac: gl_LANGINFO_H +gl_LANGINFO_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += langinfo.h diff --git a/modules/listen b/modules/listen index baaadc21ad..5f96dae9be 100644 --- a/modules/listen +++ b/modules/listen @@ -12,7 +12,7 @@ errno [test "$ac_cv_header_winsock2_h" = yes] msvc-nothrow [test "$ac_cv_header_winsock2_h" = yes] configure.ac: -AC_REQUIRE([gl_HEADER_SYS_SOCKET]) +AC_REQUIRE([gl_SYS_SOCKET_H]) if test "$ac_cv_header_winsock2_h" = yes; then AC_LIBOBJ([listen]) fi diff --git a/modules/locale b/modules/locale index cd045c3781..b2773c8a19 100644 --- a/modules/locale +++ b/modules/locale @@ -15,6 +15,7 @@ stddef configure.ac: gl_LOCALE_H +gl_LOCALE_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += locale.h diff --git a/modules/malloc-h b/modules/malloc-h index 115b870642..f79fa3ed82 100644 --- a/modules/malloc-h +++ b/modules/malloc-h @@ -12,6 +12,7 @@ snippet/warn-on-use configure.ac: gl_MALLOC_H +gl_MALLOC_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += malloc.h diff --git a/modules/math b/modules/math index aa46293737..3041609125 100644 --- a/modules/math +++ b/modules/math @@ -16,6 +16,7 @@ float configure.ac: gl_MATH_H +gl_MATH_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += math.h diff --git a/modules/monetary b/modules/monetary index 8afe1d811e..451323b6ac 100644 --- a/modules/monetary +++ b/modules/monetary @@ -13,6 +13,7 @@ snippet/warn-on-use configure.ac: gl_MONETARY_H +gl_MONETARY_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += $(MONETARY_H) diff --git a/modules/netdb b/modules/netdb index 89408fa919..8c589df669 100644 --- a/modules/netdb +++ b/modules/netdb @@ -13,7 +13,8 @@ snippet/warn-on-use sys_socket configure.ac: -gl_HEADER_NETDB +gl_NETDB_H +gl_NETDB_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += netdb.h diff --git a/modules/nonblocking b/modules/nonblocking index bc89371928..b4ddb78f81 100644 --- a/modules/nonblocking +++ b/modules/nonblocking @@ -24,12 +24,12 @@ gl_FCNTL_MODULE_INDICATOR([nonblocking]) dnl Define the C macro GNULIB_NONBLOCKING to 1. gl_MODULE_INDICATOR([nonblocking]) dnl Define the substituted variable GNULIB_STDIO_H_NONBLOCKING to 1. -AC_REQUIRE([gl_STDIO_H_DEFAULTS]) +gl_STDIO_H_REQUIRE_DEFAULTS AC_REQUIRE([gl_ASM_SYMBOL_PREFIX]) -GNULIB_STDIO_H_NONBLOCKING=1 +gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_NONBLOCKING], [1]) dnl Define the substituted variable GNULIB_UNISTD_H_NONBLOCKING to 1. -AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) -GNULIB_UNISTD_H_NONBLOCKING=1 +gl_UNISTD_H_REQUIRE_DEFAULTS +gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_NONBLOCKING], [1]) Makefile.am: lib_SOURCES += nonblocking.c diff --git a/modules/poll-h b/modules/poll-h index 3c68758991..998607dc38 100644 --- a/modules/poll-h +++ b/modules/poll-h @@ -14,6 +14,7 @@ snippet/warn-on-use configure.ac: gl_POLL_H +gl_POLL_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += poll.h diff --git a/modules/pthread-h b/modules/pthread-h index 3fe5527658..dec17389e6 100644 --- a/modules/pthread-h +++ b/modules/pthread-h @@ -21,6 +21,7 @@ gl_ANYTHREADLIB_EARLY configure.ac: gl_PTHREAD_H +gl_PTHREAD_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += pthread.h diff --git a/modules/pty b/modules/pty index d523d142ca..ae0790089c 100644 --- a/modules/pty +++ b/modules/pty @@ -12,6 +12,7 @@ snippet/warn-on-use configure.ac: gl_PTY_H +gl_PTY_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += pty.h diff --git a/modules/recv b/modules/recv index b47d8f532f..6972de7b97 100644 --- a/modules/recv +++ b/modules/recv @@ -12,7 +12,7 @@ errno [test "$ac_cv_header_winsock2_h" = yes] msvc-nothrow [test "$ac_cv_header_winsock2_h" = yes] configure.ac: -AC_REQUIRE([gl_HEADER_SYS_SOCKET]) +AC_REQUIRE([gl_SYS_SOCKET_H]) if test "$ac_cv_header_winsock2_h" = yes; then AC_LIBOBJ([recv]) fi diff --git a/modules/recvfrom b/modules/recvfrom index 590f6fecb8..afc3961b39 100644 --- a/modules/recvfrom +++ b/modules/recvfrom @@ -14,7 +14,7 @@ getpeername [test "$ac_cv_header_winsock2_h" = yes] msvc-nothrow [test "$ac_cv_header_winsock2_h" = yes] configure.ac: -AC_REQUIRE([gl_HEADER_SYS_SOCKET]) +AC_REQUIRE([gl_SYS_SOCKET_H]) if test "$ac_cv_header_winsock2_h" = yes; then AC_LIBOBJ([recvfrom]) fi diff --git a/modules/sched b/modules/sched index 572c57b0c0..995dfb95e2 100644 --- a/modules/sched +++ b/modules/sched @@ -13,6 +13,7 @@ snippet/warn-on-use configure.ac: gl_SCHED_H +gl_SCHED_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += sched.h diff --git a/modules/search b/modules/search index 58ca086e72..364107485b 100644 --- a/modules/search +++ b/modules/search @@ -13,6 +13,7 @@ snippet/warn-on-use configure.ac: gl_SEARCH_H +gl_SEARCH_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += search.h diff --git a/modules/send b/modules/send index 5e115c3f85..e6e63f7c1d 100644 --- a/modules/send +++ b/modules/send @@ -12,7 +12,7 @@ errno [test "$ac_cv_header_winsock2_h" = yes] msvc-nothrow [test "$ac_cv_header_winsock2_h" = yes] configure.ac: -AC_REQUIRE([gl_HEADER_SYS_SOCKET]) +AC_REQUIRE([gl_SYS_SOCKET_H]) if test "$ac_cv_header_winsock2_h" = yes; then AC_LIBOBJ([send]) fi diff --git a/modules/sendto b/modules/sendto index 924818e313..b78ed8c760 100644 --- a/modules/sendto +++ b/modules/sendto @@ -12,7 +12,7 @@ errno [test "$ac_cv_header_winsock2_h" = yes] msvc-nothrow [test "$ac_cv_header_winsock2_h" = yes] configure.ac: -AC_REQUIRE([gl_HEADER_SYS_SOCKET]) +AC_REQUIRE([gl_SYS_SOCKET_H]) if test "$ac_cv_header_winsock2_h" = yes; then AC_LIBOBJ([sendto]) fi diff --git a/modules/setsockopt b/modules/setsockopt index bfe8acdae9..63c02d336a 100644 --- a/modules/setsockopt +++ b/modules/setsockopt @@ -13,7 +13,7 @@ errno [test "$ac_cv_header_winsock2_h" = yes] msvc-nothrow [test "$ac_cv_header_winsock2_h" = yes] configure.ac: -AC_REQUIRE([gl_HEADER_SYS_SOCKET]) +AC_REQUIRE([gl_SYS_SOCKET_H]) if test "$ac_cv_header_winsock2_h" = yes; then AC_LIBOBJ([setsockopt]) fi diff --git a/modules/shutdown b/modules/shutdown index 64f3dc397b..e34892358e 100644 --- a/modules/shutdown +++ b/modules/shutdown @@ -12,7 +12,7 @@ errno [test "$ac_cv_header_winsock2_h" = yes] msvc-nothrow [test "$ac_cv_header_winsock2_h" = yes] configure.ac: -AC_REQUIRE([gl_HEADER_SYS_SOCKET]) +AC_REQUIRE([gl_SYS_SOCKET_H]) if test "$ac_cv_header_winsock2_h" = yes; then AC_LIBOBJ([shutdown]) fi diff --git a/modules/signal-h b/modules/signal-h index 2f38e9bf7d..cca349d7c1 100644 --- a/modules/signal-h +++ b/modules/signal-h @@ -15,6 +15,7 @@ extensions configure.ac: gl_SIGNAL_H +gl_SIGNAL_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += signal.h diff --git a/modules/sigpipe b/modules/sigpipe index 32214f9b13..2cb22d5c58 100644 --- a/modules/sigpipe +++ b/modules/sigpipe @@ -24,15 +24,15 @@ gl_SIGNAL_SIGPIPE dnl Define the C macro GNULIB_SIGPIPE to 1. gl_MODULE_INDICATOR([sigpipe]) dnl Define the substituted variable GNULIB_SIGNAL_H_SIGPIPE to 1. -AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) -GNULIB_SIGNAL_H_SIGPIPE=1 +gl_SIGNAL_H_REQUIRE_DEFAULTS +gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNAL_H_SIGPIPE], [1]) dnl Define the substituted variable GNULIB_STDIO_H_SIGPIPE to 1. -AC_REQUIRE([gl_STDIO_H_DEFAULTS]) +gl_STDIO_H_REQUIRE_DEFAULTS AC_REQUIRE([gl_ASM_SYMBOL_PREFIX]) -GNULIB_STDIO_H_SIGPIPE=1 +gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_SIGPIPE], [1]) dnl Define the substituted variable GNULIB_UNISTD_H_SIGPIPE to 1. -AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) -GNULIB_UNISTD_H_SIGPIPE=1 +gl_UNISTD_H_REQUIRE_DEFAULTS +gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_SIGPIPE], [1]) Makefile.am: diff --git a/modules/socket b/modules/socket index 49625494ab..b1c73bc860 100644 --- a/modules/socket +++ b/modules/socket @@ -13,14 +13,14 @@ sockets [test "$ac_cv_header_winsock2_h" = yes] msvc-nothrow [test "$ac_cv_header_winsock2_h" = yes] configure.ac: -AC_REQUIRE([gl_HEADER_SYS_SOCKET]) +AC_REQUIRE([gl_SYS_SOCKET_H]) if test "$ac_cv_header_winsock2_h" = yes; then AC_LIBOBJ([socket]) fi # When this module is used, sockets may actually occur as file descriptors, # hence it is worth warning if the modules 'close' and 'ioctl' are not used. -m4_ifdef([gl_UNISTD_H_DEFAULTS], [AC_REQUIRE([gl_UNISTD_H_DEFAULTS])]) -m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS])]) +m4_ifdef([gl_UNISTD_H_DEFAULTS], [gl_UNISTD_H_REQUIRE_DEFAULTS]) +m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [gl_SYS_IOCTL_H_REQUIRE_DEFAULTS]) AC_REQUIRE([gl_PREREQ_SYS_H_WINSOCK2]) if test "$ac_cv_header_winsock2_h" = yes; then UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=1 diff --git a/modules/spawn b/modules/spawn index 1828d37bf4..312c5ec9bd 100644 --- a/modules/spawn +++ b/modules/spawn @@ -16,6 +16,7 @@ snippet/warn-on-use configure.ac: gl_SPAWN_H +gl_SPAWN_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += spawn.h diff --git a/modules/stddef b/modules/stddef index 91d6bac662..c17523cac8 100644 --- a/modules/stddef +++ b/modules/stddef @@ -12,6 +12,7 @@ extensions configure.ac: gl_STDDEF_H +gl_STDDEF_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += $(STDDEF_H) diff --git a/modules/stdio b/modules/stdio index 4932327e32..18c24d71d1 100644 --- a/modules/stdio +++ b/modules/stdio @@ -17,6 +17,7 @@ sys_types configure.ac: gl_STDIO_H +gl_STDIO_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += stdio.h diff --git a/modules/stdlib b/modules/stdlib index ad04ede819..47f3af752a 100644 --- a/modules/stdlib +++ b/modules/stdlib @@ -16,6 +16,7 @@ unistd configure.ac: gl_STDLIB_H +gl_STDLIB_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += stdlib.h diff --git a/modules/string b/modules/string index 6c87229e4c..e1d9980bbd 100644 --- a/modules/string +++ b/modules/string @@ -15,7 +15,8 @@ snippet/warn-on-use stddef configure.ac: -gl_HEADER_STRING_H +gl_STRING_H +gl_STRING_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += string.h diff --git a/modules/strings b/modules/strings index 919b49de4f..d705ac9e5f 100644 --- a/modules/strings +++ b/modules/strings @@ -13,7 +13,8 @@ snippet/warn-on-use sys_types configure.ac: -gl_HEADER_STRINGS_H +gl_STRINGS_H +gl_STRINGS_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += strings.h diff --git a/modules/sys_file b/modules/sys_file index 509c1da099..a5d98013e4 100644 --- a/modules/sys_file +++ b/modules/sys_file @@ -10,7 +10,8 @@ include_next snippet/warn-on-use configure.ac: -gl_HEADER_SYS_FILE_H +gl_SYS_FILE_H +gl_SYS_FILE_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P Makefile.am: diff --git a/modules/sys_ioctl b/modules/sys_ioctl index a008f212ac..06b85c7f47 100644 --- a/modules/sys_ioctl +++ b/modules/sys_ioctl @@ -13,6 +13,7 @@ unistd configure.ac: gl_SYS_IOCTL_H +gl_SYS_IOCTL_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P Makefile.am: diff --git a/modules/sys_random b/modules/sys_random index b88507bb92..5044baa4ec 100644 --- a/modules/sys_random +++ b/modules/sys_random @@ -12,7 +12,8 @@ snippet/c++defs snippet/warn-on-use configure.ac: -gl_HEADER_SYS_RANDOM +gl_SYS_RANDOM_H +gl_SYS_RANDOM_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P Makefile.am: diff --git a/modules/sys_resource b/modules/sys_resource index ab35ddd16a..83caef5028 100644 --- a/modules/sys_resource +++ b/modules/sys_resource @@ -13,7 +13,8 @@ snippet/warn-on-use sys_time configure.ac: -gl_HEADER_SYS_RESOURCE +gl_SYS_RESOURCE_H +gl_SYS_RESOURCE_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P Makefile.am: diff --git a/modules/sys_select b/modules/sys_select index ab062a0990..89f07b26ee 100644 --- a/modules/sys_select +++ b/modules/sys_select @@ -14,7 +14,8 @@ snippet/warn-on-use sys_time configure.ac: -AC_REQUIRE([gl_HEADER_SYS_SELECT]) +gl_SYS_SELECT_H +gl_SYS_SELECT_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P Makefile.am: diff --git a/modules/sys_socket b/modules/sys_socket index 3bb0bfc2b3..72a6a4a7ee 100644 --- a/modules/sys_socket +++ b/modules/sys_socket @@ -20,7 +20,8 @@ stdalign sys_uio configure.ac: -AC_REQUIRE([gl_HEADER_SYS_SOCKET]) +gl_SYS_SOCKET_H +gl_SYS_SOCKET_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P Makefile.am: diff --git a/modules/sys_stat b/modules/sys_stat index 26971975e4..36bc9567f8 100644 --- a/modules/sys_stat +++ b/modules/sys_stat @@ -16,7 +16,8 @@ sys_types time configure.ac: -gl_HEADER_SYS_STAT_H +gl_SYS_STAT_H +gl_SYS_STAT_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P Makefile.am: diff --git a/modules/sys_time b/modules/sys_time index cfb7ddd2d9..b24e68e6c5 100644 --- a/modules/sys_time +++ b/modules/sys_time @@ -13,7 +13,8 @@ snippet/c++defs snippet/warn-on-use configure.ac: -gl_HEADER_SYS_TIME_H +gl_SYS_TIME_H +gl_SYS_TIME_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P Makefile.am: diff --git a/modules/sys_times b/modules/sys_times index 66a36f135d..96c16e475f 100644 --- a/modules/sys_times +++ b/modules/sys_times @@ -12,6 +12,7 @@ snippet/warn-on-use configure.ac: gl_SYS_TIMES_H +gl_SYS_TIMES_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P Makefile.am: diff --git a/modules/sys_types b/modules/sys_types index c00862c9b1..38823d890d 100644 --- a/modules/sys_types +++ b/modules/sys_types @@ -13,6 +13,7 @@ ssize_t configure.ac: gl_SYS_TYPES_H +gl_SYS_TYPES_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P Makefile.am: diff --git a/modules/sys_uio b/modules/sys_uio index 45b15eee6c..460e0ebebb 100644 --- a/modules/sys_uio +++ b/modules/sys_uio @@ -11,7 +11,8 @@ ssize_t sys_types configure.ac: -gl_HEADER_SYS_UIO +gl_SYS_UIO_H +gl_SYS_UIO_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P Makefile.am: diff --git a/modules/sys_utsname b/modules/sys_utsname index befd0d3457..05f3b5cc8f 100644 --- a/modules/sys_utsname +++ b/modules/sys_utsname @@ -12,6 +12,7 @@ snippet/warn-on-use configure.ac: gl_SYS_UTSNAME_H +gl_SYS_UTSNAME_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P Makefile.am: diff --git a/modules/sys_wait b/modules/sys_wait index 73ce50b6e7..0ae9b4f929 100644 --- a/modules/sys_wait +++ b/modules/sys_wait @@ -13,6 +13,7 @@ snippet/warn-on-use configure.ac: gl_SYS_WAIT_H +gl_SYS_WAIT_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P Makefile.am: diff --git a/modules/termios b/modules/termios index 8cb73e4174..59cd4489ac 100644 --- a/modules/termios +++ b/modules/termios @@ -13,6 +13,7 @@ snippet/warn-on-use configure.ac: gl_TERMIOS_H +gl_TERMIOS_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += termios.h diff --git a/modules/threads-h b/modules/threads-h index 927a057967..37cc6d8db1 100644 --- a/modules/threads-h +++ b/modules/threads-h @@ -29,7 +29,8 @@ configure.ac-early: gl_ANYTHREADLIB_EARLY configure.ac: -AC_REQUIRE([gl_THREADS_H]) +gl_THREADS_H +gl_THREADS_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += threads.h diff --git a/modules/time b/modules/time index c0fb27dc4c..236b5ea25e 100644 --- a/modules/time +++ b/modules/time @@ -14,7 +14,8 @@ snippet/warn-on-use stddef configure.ac: -gl_HEADER_TIME_H +gl_TIME_H +gl_TIME_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += time.h diff --git a/modules/uchar b/modules/uchar index e449dd9613..a65fce2afa 100644 --- a/modules/uchar +++ b/modules/uchar @@ -14,6 +14,7 @@ wchar configure.ac: gl_UCHAR_H +gl_UCHAR_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += uchar.h diff --git a/modules/unistd b/modules/unistd index 442678b88c..281924f02d 100644 --- a/modules/unistd +++ b/modules/unistd @@ -20,6 +20,7 @@ sys_types configure.ac: gl_UNISTD_H +gl_UNISTD_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += unistd.h diff --git a/modules/utime-h b/modules/utime-h index 489eab935f..beb5159cb1 100644 --- a/modules/utime-h +++ b/modules/utime-h @@ -13,6 +13,7 @@ snippet/warn-on-use configure.ac: gl_UTIME_H +gl_UTIME_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += utime.h diff --git a/modules/wchar b/modules/wchar index 7ec1c02b35..d4e6d6933b 100644 --- a/modules/wchar +++ b/modules/wchar @@ -17,6 +17,7 @@ stddef configure.ac: gl_WCHAR_H +gl_WCHAR_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += wchar.h diff --git a/modules/wctype-h b/modules/wctype-h index 8da4b8f324..24b5fe68fe 100644 --- a/modules/wctype-h +++ b/modules/wctype-h @@ -15,6 +15,7 @@ snippet/warn-on-use configure.ac: gl_WCTYPE_H +gl_WCTYPE_H_REQUIRE_DEFAULTS Makefile.am: BUILT_SOURCES += wctype.h diff --git a/modules/windows-stat-override b/modules/windows-stat-override index 027fa92760..d8fb4eb032 100644 --- a/modules/windows-stat-override +++ b/modules/windows-stat-override @@ -12,10 +12,10 @@ Depends-on: sys_stat configure.ac: -AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) +gl_SYS_STAT_H_REQUIRE_DEFAULTS AC_REQUIRE([AC_CANONICAL_HOST]) case "$host_os" in - mingw*) GNULIB_OVERRIDES_STRUCT_STAT=1 ;; + mingw*) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OVERRIDES_STRUCT_STAT], [1]) ;; esac Makefile.am: diff --git a/pygnulib/GLConfig.py b/pygnulib/GLConfig.py index 1e1a090b11..ddabd001dd 100644 --- a/pygnulib/GLConfig.py +++ b/pygnulib/GLConfig.py @@ -821,11 +821,15 @@ class GLConfig(object): Default value is False, which means that lgpl is disabled.''' self.table['lgpl'] = False - # Define macro_prefix methods. def getIncludeGuardPrefix(self): '''Return include_guard_prefix to use inside GLEmiter class.''' return(self.table['include_guard_prefix']) + def getModuleIndicatorPrefix(self): + '''Return module_indicator_prefix to use inside GLEmiter class.''' + return(getIncludeGuardPrefix(self)) + + # Define macro_prefix methods. def getMacroPrefix(self): '''Return the prefix of the macros 'gl_EARLY' and 'gl_INIT'. Default macro_prefix is 'gl'.''' diff --git a/pygnulib/GLEmiter.py b/pygnulib/GLEmiter.py index 107f88cf21..e6b5a2a726 100644 --- a/pygnulib/GLEmiter.py +++ b/pygnulib/GLEmiter.py @@ -460,6 +460,7 @@ USE_MSGCTXT = no\n""" else: # if macro_prefix_arg has not bytes or string type raise(TypeError('macro_prefix_arg must be a string, not %s' % type(macro_prefix_arg).__name__)) + module_indicator_prefix = self.config.getModuleIndicatorPrefix() # Overriding AC_LIBOBJ and AC_REPLACE_FUNCS has the effect of storing # platform-dependent object files in ${macro_prefix_arg}_LIBOBJS instead # of LIBOBJS. The purpose is to allow several gnulib instantiations under @@ -489,6 +490,11 @@ USE_MSGCTXT = no\n""" # subdirectory in which to expect them. emit += " m4_pushdef([%V1%_LIBSOURCES_LIST], [])\n" emit += " m4_pushdef([%V1%_LIBSOURCES_DIR], [])\n" + # Scope for m4 macros. + emit += " m4_pushdef([GL_MACRO_PREFIX], [%V1%])" + # Scope the GNULIB_<modulename> variables. + emit += " m4_pushdef([GL_MODULE_INDICATOR_PREFIX]," + emit += " [" + module_indicator_prefix + "])" emit += " gl_COMMON\n" emit = emit.replace('%V1%', macro_prefix_arg) if type(emit) is bytes: @@ -523,6 +529,8 @@ USE_MSGCTXT = no\n""" [AC_FATAL([expected source file, required through AC_LIBSOURCES, not \ found])]) ]) + m4_popdef([GL_MODULE_INDICATOR_PREFIX]) + m4_popdef([GL_MACRO_PREFIX]) m4_popdef([%V1%_LIBSOURCES_DIR]) m4_popdef([%V1%_LIBSOURCES_LIST]) m4_popdef([AC_LIBSOURCES]) @@ -656,6 +664,7 @@ AC_DEFUN([%V1%_LIBSOURCES], [ conddeps = self.config['conddeps'] witness_c_macro = self.config['witness_c_macro'] include_guard_prefix = self.config['include_guard_prefix'] + module_indicator_prefix = self.config.getModuleIndicatorPrefix() ac_version = self.config['ac_version'] destfile = os.path.normpath(destfile) @@ -708,6 +717,8 @@ AC_DEFUN([%V1%_LIBSOURCES], [ amsnippet1 = pattern.sub('%s_%s_\\1' % (libname, libext), amsnippet1) amsnippet1 = amsnippet1.replace( + '$(GNULIB_', '$(' + module_indicator_prefix + '_GNULIB_') + amsnippet1 = amsnippet1.replace( 'lib%_LIBRARIES', 'lib_LIBRARIES') amsnippet1 = amsnippet1.replace( 'lib%_LTLIBRARIES', 'lib_LTLIBRARIES') @@ -730,6 +741,8 @@ AC_DEFUN([%V1%_LIBSOURCES], [ pattern = compiler('lib_([A-Z][A-Z](?:.*?))', re.S | re.M) amsnippet2 = pattern.sub('%s_%s_\\1' % (libname, libext), amsnippet2) + amsnippet2 = amsnippet2.replace( + '$(GNULIB_', '$(' + module_indicator_prefix + '_GNULIB_') if type(amsnippet1) is bytes: amsnippet1 = amsnippet1.decode(ENCS['default']) if type(amsnippet2) is bytes: @@ -944,6 +957,7 @@ AC_DEFUN([%V1%_LIBSOURCES], [ conddeps = self.config['conddeps'] witness_c_macro = self.config['witness_c_macro'] include_guard_prefix = self.config['include_guard_prefix'] + module_indicator_prefix = self.config.getModuleIndicatorPrefix() ac_version = self.config['ac_version'] libtests = self.config['libtests'] single_configure = self.config['single_configure'] @@ -997,6 +1011,8 @@ AC_DEFUN([%V1%_LIBSOURCES], [ snippet = pattern.sub('', snippet) pattern = compiler('lib_([A-Z][A-Z](?:.*?))', re.S | re.M) snippet = pattern.sub('libtests_a_\\1', snippet) + snippet = snippet.replace( + '$(GNULIB_', '$(' + module_indicator_prefix + '_GNULIB_') snippet = snippet.replace('lib%_LIBRARIES', 'lib_LIBRARIES') snippet = snippet.replace( 'lib%_LTLIBRARIES', 'lib_LTLIBRARIES') |