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

diff --git a/m4/stpcpy.m4 b/m4/stpcpy.m4
index b64a66250..c48aa9c3a 100644
--- a/m4/stpcpy.m4
+++ b/m4/stpcpy.m4
@@ -1,4 +1,4 @@
-# stpcpy.m4 serial 2
+# stpcpy.m4 serial 4
 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,
@@ -9,6 +9,10 @@ AC_DEFUN([gl_FUNC_STPCPY],
   dnl Persuade glibc <string.h> to declare stpcpy().
   AC_REQUIRE([AC_GNU_SOURCE])
 
+  dnl The stpcpy() declaration in lib/string_.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