diff options
author | Bruno Haible <bruno@clisp.org> | 2021-09-18 16:31:52 +0200 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2021-09-18 16:31:52 +0200 |
commit | 4bed390be8b146be3b4c73835b06f466871b931a (patch) | |
tree | 7f5bacc5dfd8f7558f1fa22e2ab4c3b461b94411 /m4/wchar_h.m4 | |
parent | 7818455627c5e54813ac89924b8b67d0bc869146 (diff) | |
download | gnulib-4bed390be8b146be3b4c73835b06f466871b931a.tar.gz |
string, wchar: Don't cause link errors for rpl_free (regr. 2021-09-07).
* lib/string.in.h (free, rpl_free): Consider GNULIB_FREE_POSIX variable.
* lib/wchar.in.h (free, rpl_free): Likewise.
* m4/string_h.m4 (gl_STRING_H_REQUIRE_DEFAULTS): Require module
indicator variable initializations from the stdlib module.
* m4/wchar_h.m4 (gl_WCHAR_H_REQUIRE_DEFAULTS): Likewise.
* modules/string (Makefile.am): Substitute GNULIB_FREE_POSIX in string.h.
* modules/wchar (Makefile.am): Substitute GNULIB_FREE_POSIX in wchar.h.
Diffstat (limited to 'm4/wchar_h.m4')
-rw-r--r-- | m4/wchar_h.m4 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index 818b3192e0..d69dbe67d9 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 53 +# wchar_h.m4 serial 54 AC_DEFUN_ONCE([gl_WCHAR_H], [ @@ -189,6 +189,8 @@ AC_DEFUN([gl_WCHAR_H_REQUIRE_DEFAULTS], gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WCSDUP], [1]) ]) 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]) AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) ]) |