Undo again.

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index cd0728cf2e8cec1ae64c4a6c67f7008a7791a2c5..179e89319a94b9821698767de39c4b6479ea91f8 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-28  Bruno Haible  <bruno@clisp.org>
+
+       * stpncpy.m4 (gl_FUNC_STPNCPY): Undo the replacement here. Because of
+       AIX, the replacement has to be done only after <string.h> is included,
+       therefore not in config.h. stpncpy.h does the replacement, and
+       stpncpy.c uses it.
+
 2005-01-19  Bruno Haible  <bruno@clisp.org>
 
        * alloca.m4, allocsa.m4, backupfile.m4, canonicalize.m4, csharpcomp.m4:

diff --git a/gettext-tools/m4/stpncpy.m4 b/gettext-tools/m4/stpncpy.m4
index 8efd1a9c32ca571d320d370bc7b23ff5a75401aa..1ab377c986419fb4355ed91077d74271ed0b60b6 100644 (file)
--- a/gettext-tools/m4/stpncpy.m4
+++ b/gettext-tools/m4/stpncpy.m4
@@ -1,4 +1,4 @@
-# stpncpy.m4 serial 2
+# stpncpy.m4 serial 3
 dnl Copyright (C) 2002-2003, 2005 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -49,8 +49,6 @@ int main () {
     AC_DEFINE(HAVE_STPNCPY, 1,
       [Define if you have the stpncpy() function and it works.])
   else
-    AC_DEFINE([stpncpy], [gnu_stpncpy],
-      [Define to a replacement function name for stpncpy().])
     AC_LIBOBJ([stpncpy])
     gl_PREREQ_STPNCPY
   fi