X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fstpcpy.m4;h=c38f40ee6d7c54a17256e940112874f2fcfd0cc7;hb=e74e1f1540f02fc57e442a6281c62f9594af15e5;hp=b64a662506219b39c01e7d48d0954249de501e53;hpb=1e4ece4ab9850fbfa88c9ec43ea518c7bc266792;p=gnulib.git

diff --git a/m4/stpcpy.m4 b/m4/stpcpy.m4
index b64a66250..c38f40ee6 100644
--- a/m4/stpcpy.m4
+++ b/m4/stpcpy.m4
@@ -1,4 +1,4 @@
-# stpcpy.m4 serial 2
+# stpcpy.m4 serial 6
 dnl Copyright (C) 2002, 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,
@@ -7,8 +7,12 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_STPCPY],
 [
   dnl Persuade glibc <string.h> to declare stpcpy().
-  AC_REQUIRE([AC_GNU_SOURCE])
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
+  dnl The stpcpy() declaration in lib/string.in.h uses 'restrict'.
+  AC_REQUIRE([AC_C_RESTRICT])
+
+  AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
   AC_REPLACE_FUNCS(stpcpy)
   if test $ac_cv_func_stpcpy = no; then
     HAVE_STPCPY=0