From ab5b43190f48148b842f5182a16a16159551126c Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 19 Sep 2021 03:11:19 +0200 Subject: string, wchar: Don't require undefined m4 macros (regr. today). Reported by Colin Watson in . * 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. --- ChangeLog | 9 +++++++++ m4/string_h.m4 | 4 ++-- m4/wchar_h.m4 | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 154678293e..6bb698433b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2021-09-18 Bruno Haible + + string, wchar: Don't require undefined m4 macros (regr. today). + Reported by Colin Watson in + . + * 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 sm3-buffer tests: New module. 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]) ]) -- cgit v1.2.1