X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstpncpy.m4;h=7e15186caf60fa8532ed368beec827f72313a965;hb=3e3363f6fe86a6b7cfe1f4a762a33eb961e0770a;hp=fc47e65ccc78d41b37bedcba3657a5c791b0a438;hpb=55da53d0db0c7a9fd82b2abc809560b3089df6a5;p=gnulib.git

diff --git a/m4/stpncpy.m4 b/m4/stpncpy.m4
index fc47e65cc..7e15186ca 100644
--- a/m4/stpncpy.m4
+++ b/m4/stpncpy.m4
@@ -1,16 +1,16 @@
-# stpncpy.m4 serial 1
-dnl Copyright (C) 2002-2003 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.
+# stpncpy.m4 serial 6
+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.
 
 AC_DEFUN([gl_FUNC_STPNCPY],
 [
   dnl Persuade glibc <string.h> to declare stpncpy().
   AC_REQUIRE([AC_GNU_SOURCE])
 
+  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():
@@ -24,6 +24,8 @@ AC_DEFUN([gl_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";
@@ -51,9 +53,8 @@ int main () {
     AC_DEFINE(HAVE_STPNCPY, 1,
       [Define if you have the stpncpy() function and it works.])
   else
+    HAVE_STPNCPY=0
     AC_LIBOBJ([stpncpy])
-    AC_DEFINE(stpncpy, rpl_stpncpy,
-      [Define to rpl_stpncpy if the replacement function should be used.])
     gl_PREREQ_STPNCPY
   fi
 ])
@@ -62,4 +63,3 @@ int main () {
 AC_DEFUN([gl_PREREQ_STPNCPY], [
   :
 ])
-