X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrtok_r.m4;h=60e33a695f524781ced79c77f7c24766490247af;hb=6323b635e52250c751cfb8bfd3ad935908f2fdaf;hp=3f8a26fe7e9a49d0fe83fae1325240ebe9b15f8d;hpb=d60f3b0c6b0f93a601acd1cfd3923f94ca05abb0;p=gnulib.git

diff --git a/m4/strtok_r.m4 b/m4/strtok_r.m4
index 3f8a26fe7..60e33a695 100644
--- a/m4/strtok_r.m4
+++ b/m4/strtok_r.m4
@@ -1,5 +1,5 @@
-# strtok_r.m4 serial 12
-dnl Copyright (C) 2002-2004, 2006-2007, 2009-2011 Free Software Foundation,
+# strtok_r.m4 serial 13
+dnl Copyright (C) 2002-2004, 2006-2007, 2009-2012 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -14,6 +14,7 @@ AC_DEFUN([gl_FUNC_STRTOK_R],
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CHECK_FUNCS([strtok_r])
   if test $ac_cv_func_strtok_r = yes; then
+    HAVE_STRTOK_R=1
     dnl glibc 2.7 has a bug in strtok_r that causes a segmentation fault
     dnl when the second argument to strtok_r is a constant string that has
     dnl exactly one byte and compiling with optimization.  This bug is, for
@@ -52,15 +53,14 @@ changequote([,])dnl
       ])
     case "$gl_cv_func_strtok_r_works" in
       *no)
-        dnl We could set REPLACE_STRTOK_R=1 and AC_LIBOBJ([strtok_r]) here,
-        dnl but it's only the macro version in <bits/string2.h> which is wrong.
-        dnl The code compiled into libc is fine.
+        dnl We could set REPLACE_STRTOK_R=1 here, but it's only the macro
+        dnl version in <bits/string2.h> which is wrong. The code compiled
+        dnl into libc is fine.
         UNDEFINE_STRTOK_R=1
         ;;
     esac
   else
-    AC_LIBOBJ([strtok_r])
-    gl_PREREQ_STRTOK_R
+    HAVE_STRTOK_R=0
   fi
   AC_CHECK_DECLS_ONCE([strtok_r])
   if test $ac_cv_have_decl_strtok_r = no; then