summaryrefslogtreecommitdiff
path: root/m4/string_h.m4
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2021-09-18 16:31:52 +0200
committerBruno Haible <bruno@clisp.org>2021-09-18 16:31:52 +0200
commit4bed390be8b146be3b4c73835b06f466871b931a (patch)
tree7f5bacc5dfd8f7558f1fa22e2ab4c3b461b94411 /m4/string_h.m4
parent7818455627c5e54813ac89924b8b67d0bc869146 (diff)
downloadgnulib-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/string_h.m4')
-rw-r--r--m4/string_h.m44
1 files changed, 3 insertions, 1 deletions
diff --git a/m4/string_h.m4 b/m4/string_h.m4
index 80d1e58753..9871dac8b2 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 32
+# serial 33
# Written by Paul Eggert.
@@ -93,6 +93,8 @@ AC_DEFUN([gl_STRING_H_REQUIRE_DEFAULTS],
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_STRDUP], [1])
])
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])
AC_REQUIRE([gl_STRING_H_DEFAULTS])
])