X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrtok_r.m4;h=930fed731bece22500394f4322d3d38cfb102d5f;hb=d5b641f5183e4e3d69a3e06f69bcf6ecee302a1b;hp=332701cc51d93ba7fd82ded78310f71ef4bab4cb;hpb=631efbd2473492048d7270009135eef32fdded30;p=gnulib.git

diff --git a/m4/strtok_r.m4 b/m4/strtok_r.m4
index 332701cc5..930fed731 100644
--- a/m4/strtok_r.m4
+++ b/m4/strtok_r.m4
@@ -1,17 +1,24 @@
-# strtok_r.m4 serial 3
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# strtok_r.m4 serial 7
+dnl Copyright (C) 2002, 2003, 2004, 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_STRTOK_R],
 [
+  dnl The strtok_r() declaration in lib/string.in.h uses 'restrict'.
+  AC_REQUIRE([AC_C_RESTRICT])
+
+  AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
   AC_REPLACE_FUNCS(strtok_r)
   AC_CHECK_DECLS_ONCE(strtok_r)
+  if test $ac_cv_have_decl_strtok_r = no; then
+    HAVE_DECL_STRTOK_R=0
+  fi
   gl_PREREQ_STRTOK_R
 ])
 
-# Prerequisites of lib/strtok_r.h and lib/strtok_r.c.
+# Prerequisites of lib/strtok_r.c.
 AC_DEFUN([gl_PREREQ_STRTOK_R], [
-  AC_REQUIRE([AC_C_RESTRICT])
+  :
 ])