X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrtok_r.m4;h=03cff09419d5f4f955692ec9c5d3e04043391ca5;hb=c9b62cc067d130a354c1b4e22ca59771d2fa0c93;hp=390b7faf477468c4bdcddfb929bc8de3699791bf;hpb=854a5d353795189e727ba52631ec5b5862cbcb8f;p=gnulib.git

diff --git a/m4/strtok_r.m4 b/m4/strtok_r.m4
index 390b7faf4..03cff0941 100644
--- a/m4/strtok_r.m4
+++ b/m4/strtok_r.m4
@@ -1,19 +1,24 @@
-# strtok_r.m4 serial 1
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# strtok_r.m4 serial 6
+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_.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([gl_C_RESTRICT])
+  :
 ])