diff options
author | Bruno Haible <bruno@clisp.org> | 2021-09-19 03:11:19 +0200 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2021-09-19 03:11:19 +0200 |
commit | ab5b43190f48148b842f5182a16a16159551126c (patch) | |
tree | 38bc4f6bfb204c420a97ba320c68472d494f6f39 | |
parent | c63728b59f5916bb62e0053d8211f4d07dbaa771 (diff) | |
download | gnulib-ab5b43190f48148b842f5182a16a16159551126c.tar.gz |
string, wchar: Don't require undefined m4 macros (regr. today).
Reported by Colin Watson <cjwatson@debian.org> in
<https://lists.gnu.org/archive/html/bug-gnulib/2021-09/msg00078.html>.
* m4/string_h.m4 (gl_STRING_H_REQUIRE_DEFAULTS): Don't use m4_require
directly. Instead, invoke gl_STDLIB_H_REQUIRE_DEFAULTS.
* m4/wchar_h.m4 (gl_WCHAR_H_REQUIRE_DEFAULTS): Likewise.
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | m4/string_h.m4 | 4 | ||||
-rw-r--r-- | m4/wchar_h.m4 | 4 |
3 files changed, 13 insertions, 4 deletions
@@ -1,5 +1,14 @@ 2021-09-18 Bruno Haible <bruno@clisp.org> + string, wchar: Don't require undefined m4 macros (regr. today). + Reported by Colin Watson <cjwatson@debian.org> in + <https://lists.gnu.org/archive/html/bug-gnulib/2021-09/msg00078.html>. + * m4/string_h.m4 (gl_STRING_H_REQUIRE_DEFAULTS): Don't use m4_require + directly. Instead, invoke gl_STDLIB_H_REQUIRE_DEFAULTS. + * m4/wchar_h.m4 (gl_WCHAR_H_REQUIRE_DEFAULTS): Likewise. + +2021-09-18 Bruno Haible <bruno@clisp.org> + sm3-buffer tests: New module. * tests/test-sm3-buffer.c: Renamed from tests/test-sm3.c. * modules/crypto/sm3-buffer-tests: Renamed from diff --git a/m4/string_h.m4 b/m4/string_h.m4 index 9871dac8b2..e88ac9ca85 100644 --- a/m4/string_h.m4 +++ b/m4/string_h.m4 @@ -5,7 +5,7 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 33 +# serial 34 # Written by Paul Eggert. @@ -94,7 +94,7 @@ AC_DEFUN([gl_STRING_H_REQUIRE_DEFAULTS], ]) m4_require(GL_MODULE_INDICATOR_PREFIX[_STRING_H_MODULE_INDICATOR_DEFAULTS]) dnl Make sure the shell variable for GNULIB_FREE_POSIX is initialized. - m4_require(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS]) + gl_STDLIB_H_REQUIRE_DEFAULTS AC_REQUIRE([gl_STRING_H_DEFAULTS]) ]) diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index d69dbe67d9..9529cdd05a 100644 --- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Eric Blake. -# wchar_h.m4 serial 54 +# wchar_h.m4 serial 55 AC_DEFUN_ONCE([gl_WCHAR_H], [ @@ -190,7 +190,7 @@ AC_DEFUN([gl_WCHAR_H_REQUIRE_DEFAULTS], ]) m4_require(GL_MODULE_INDICATOR_PREFIX[_WCHAR_H_MODULE_INDICATOR_DEFAULTS]) dnl Make sure the shell variable for GNULIB_FREE_POSIX is initialized. - m4_require(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS]) + gl_STDLIB_H_REQUIRE_DEFAULTS AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) ]) |