X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstpcpy.m4;h=c38f40ee6d7c54a17256e940112874f2fcfd0cc7;hb=cda636671de46bd0c60641ac60d6399662d7af2c;hp=b3282661b28d80830959cd390bc92de361f36f31;hpb=53b8fa05726a7fb30010e42ce02e44a35f0d7489;p=gnulib.git

diff --git a/m4/stpcpy.m4 b/m4/stpcpy.m4
index b3282661b..c38f40ee6 100644
--- a/m4/stpcpy.m4
+++ b/m4/stpcpy.m4
@@ -1,18 +1,21 @@
-# stpcpy.m4 serial 1
-dnl Copyright (C) 2002 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.
+# 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,
+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
     gl_PREREQ_STPCPY
   fi
 ])
@@ -21,4 +24,3 @@ AC_DEFUN([gl_FUNC_STPCPY],
 AC_DEFUN([gl_PREREQ_STPCPY], [
   :
 ])
-