X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fstpncpy.m4;h=2119515a40092cd080894eb4795ac791c83cf8fb;hb=b7b6d3d99a751f99638ed8e14b62c1cf697f0664;hp=1ab377c986419fb4355ed91077d74271ed0b60b6;hpb=cd3bee968885a85671cad267e142aad74076b5e2;p=gnulib.git

diff --git a/m4/stpncpy.m4 b/m4/stpncpy.m4
index 1ab377c98..2119515a4 100644
--- a/m4/stpncpy.m4
+++ b/m4/stpncpy.m4
@@ -1,5 +1,6 @@
-# stpncpy.m4 serial 3
-dnl Copyright (C) 2002-2003, 2005 Free Software Foundation, Inc.
+# stpncpy.m4 serial 10
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2010 Free Software Foundation,
+dnl 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,7 +8,12 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_STPNCPY],
 [
   dnl Persuade glibc <string.h> to declare stpncpy().
-  AC_REQUIRE([AC_GNU_SOURCE])
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+
+  dnl The stpncpy() declaration in lib/string.in.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
@@ -19,9 +25,11 @@ AC_DEFUN([gl_FUNC_STPNCPY],
   dnl   in AIX:     dest + max(0,n-1)
   dnl Only the glibc return value is useful in practice.
 
-  AC_CACHE_CHECK([for working stpncpy], gl_cv_func_stpncpy, [
+  AC_CACHE_CHECK([for working stpncpy], [gl_cv_func_stpncpy], [
     AC_TRY_RUN([
 #include <stdlib.h>
+#include <string.h> /* for strcpy */
+/* The stpncpy prototype is missing in <string.h> on AIX 4.  */
 extern char *stpncpy (char *dest, const char *src, size_t n);
 int main () {
   const char *src = "Hello";
@@ -46,9 +54,10 @@ int main () {
 ], gl_cv_func_stpncpy=yes, gl_cv_func_stpncpy=no)])])
 
   if test $gl_cv_func_stpncpy = yes; then
-    AC_DEFINE(HAVE_STPNCPY, 1,
+    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
@@ -58,4 +67,3 @@ int main () {
 AC_DEFUN([gl_PREREQ_STPNCPY], [
   :
 ])
-