X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstpncpy.m4;h=aad037550438d7cb45c4dd221f3fe362c12e3c0e;hb=1b9bd2b9f83a84ede12622d6a040383b6bded37d;hp=ec88b54427fc4ed7e8bbb6d645c62a3c2223111c;hpb=c920bcadf988a348ae10e9f95354e5659b073bc1;p=gnulib.git

diff --git a/m4/stpncpy.m4 b/m4/stpncpy.m4
index ec88b5442..aad037550 100644
--- a/m4/stpncpy.m4
+++ b/m4/stpncpy.m4
@@ -1,5 +1,5 @@
-# stpncpy.m4 serial 4
-dnl Copyright (C) 2002-2003, 2005-2006 Free Software Foundation, Inc.
+# stpncpy.m4 serial 7
+dnl Copyright (C) 2002-2003, 2005-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.
@@ -9,6 +9,11 @@ AC_DEFUN([gl_FUNC_STPNCPY],
   dnl Persuade glibc <string.h> to declare stpncpy().
   AC_REQUIRE([AC_GNU_SOURCE])
 
+  dnl The stpncpy() declaration in lib/string_.h uses 'restrict'.
+  AC_REQUIRE([AC_C_RESTRICT])
+
+  AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
+
   dnl Both glibc and AIX (4.3.3, 5.1) have an stpncpy() function
   dnl declared in <string.h>. Its side effects are the same as those
   dnl of strncpy():
@@ -51,6 +56,7 @@ int main () {
     AC_DEFINE(HAVE_STPNCPY, 1,
       [Define if you have the stpncpy() function and it works.])
   else
+    HAVE_STPNCPY=0
     AC_LIBOBJ([stpncpy])
     gl_PREREQ_STPNCPY
   fi
@@ -60,4 +66,3 @@ int main () {
 AC_DEFUN([gl_PREREQ_STPNCPY], [
   :
 ])
-