X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrsep.m4;h=4ea187c5f0a2898af787aa51c49a2249aa757d2c;hb=f00bf3ddf06e944b995c913d6c6935cf14eec74b;hp=a1a624b567fad4ef1b8e95dffa018cd70b857af7;hpb=1e4ece4ab9850fbfa88c9ec43ea518c7bc266792;p=gnulib.git

diff --git a/m4/strsep.m4 b/m4/strsep.m4
index a1a624b56..4ea187c5f 100644
--- a/m4/strsep.m4
+++ b/m4/strsep.m4
@@ -1,5 +1,5 @@
-# strsep.m4 serial 4
-dnl Copyright (C) 2002, 2003, 2004, 2007 Free Software Foundation, Inc.
+# strsep.m4 serial 9
+dnl Copyright (C) 2002-2004, 2007, 2009-2011 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.
@@ -7,9 +7,13 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_STRSEP],
 [
   dnl Persuade glibc <string.h> to declare strsep().
-  AC_REQUIRE([AC_GNU_SOURCE])
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
-  AC_REPLACE_FUNCS(strsep)
+  dnl The strsep() declaration in lib/string.in.h uses 'restrict'.
+  AC_REQUIRE([AC_C_RESTRICT])
+
+  AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
+  AC_REPLACE_FUNCS([strsep])
   if test $ac_cv_func_strsep = no; then
     HAVE_STRSEP=0
     gl_PREREQ_STRSEP