NEWS.stable: log cherry-pick [e446f25]->[c092018] relocatable-shell: Update suggested...

[gnulib.git] / modules / strtok_r

diff --git a/modules/strtok_r b/modules/strtok_r
index bbfef2b..23a6acb 100644 (file)
--- a/modules/strtok_r
+++ b/modules/strtok_r
@@ -7,10 +7,14 @@ m4/strtok_r.m4
 
 Depends-on:
 string
-strpbrk         [test $ac_cv_func_strtok_r = no]
+strpbrk         [test $HAVE_STRTOK_R = 0 || test $REPLACE_STRTOK_R = 1]
 
 configure.ac:
 gl_FUNC_STRTOK_R
+if test $HAVE_STRTOK_R = 0 || test $REPLACE_STRTOK_R = 1; then
+  AC_LIBOBJ([strtok_r])
+  gl_PREREQ_STRTOK_R
+fi
 gl_STRING_MODULE_INDICATOR([strtok_r])
 
 Makefile.am: