X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fstrtok_r;h=23a6acbedc46147711c5993f25d52cb43955b91f;hb=7ef6c64e210ac0979d7e8ac69bc5b5208c2405ab;hp=bbfef2b68fbfa2f3676b2c2112885f09b1fdf5d1;hpb=7cbbd8a31a3be111f26d87fb8e55f4438f9c885f;p=gnulib.git

diff --git a/modules/strtok_r b/modules/strtok_r
index bbfef2b68..23a6acbed 100644
--- 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: