[Bug-gnulib] propagating gettext into gnulib a bit better

[Paul Eggert]

I noticed that gnulib's m4/printf-posix.m4 was out of date with
respect to gettext.  Here's a proposed patch to config/srclist.txt to
remove this inconsistency.  This patch adds some other files where
gettext seems to be the primary copy.  At the end of this message are
the resulting patches to two files.

2004-03-30  Paul Eggert  <address@hidden>

        * config/srclist.txt: Restore setenv.c, unsetenv.c from
        gettext.  Add intmax.m4, printf-posix.m4, sig_atomic_t.m4,
        signalblocking.m4, ssize_t.m4.
        * lib/unsetenv.c: Regenerate: this subtracts 1 from the
        copyright year (!).
        * m4/printf-posix.m4: Regenerate.

Index: config/srclist.txt
===================================================================
RCS file: /cvsroot/gnulib/gnulib/config/srclist.txt,v
retrieving revision 1.34
diff -p -u -r1.34 srclist.txt
--- config/srclist.txt  9 Mar 2004 19:42:23 -0000       1.34
+++ config/srclist.txt  31 Mar 2004 07:01:46 -0000
@@ -44,9 +44,8 @@ $GETTEXT/gettext-runtime/intl/ref-del.si
 
 $GETTEXT/gettext-tools/lib/gettext.h                   lib gpl
 $GETTEXT/gettext-tools/lib/mkdtemp.c                   lib gpl
-# Put back after next gettext release.
-#$GETTEXT/gettext-tools/lib/setenv.c                   lib gpl
-#$GETTEXT/gettext-tools/lib/unsetenv.c                 lib gpl
+$GETTEXT/gettext-tools/lib/setenv.c                    lib gpl
+$GETTEXT/gettext-tools/lib/unsetenv.c                  lib gpl
 
 $GETTEXT/autoconf-lib-link/m4/lib-ld.m4                        m4
 $GETTEXT/autoconf-lib-link/m4/lib-link.m4              m4
@@ -57,15 +56,21 @@ $GETTEXT/gettext-runtime/m4/gettext.m4              
 $GETTEXT/gettext-runtime/m4/glibc21.m4                 m4
 $GETTEXT/gettext-runtime/m4/iconv.m4                   m4
 $GETTEXT/gettext-runtime/m4/intdiv0.m4                 m4
+$GETTEXT/gettext-runtime/m4/intmax.m4                  m4
 $GETTEXT/gettext-runtime/m4/inttypes-pri.m4            m4
 $GETTEXT/gettext-runtime/m4/lcmessage.m4               m4
 $GETTEXT/gettext-runtime/m4/longdouble.m4              m4
 $GETTEXT/gettext-runtime/m4/nls.m4                     m4
 $GETTEXT/gettext-runtime/m4/po.m4                      m4
+$GETTEXT/gettext-runtime/m4/printf-posix.m4            m4
 $GETTEXT/gettext-runtime/m4/progtest.m4                        m4
 $GETTEXT/gettext-runtime/m4/signed.m4                  m4
 $GETTEXT/gettext-runtime/m4/wchar_t.m4                 m4
 $GETTEXT/gettext-runtime/m4/wint_t.m4                  m4
+
+$GETTEXT/gettext-tools/m4/sig_atomic_t.m4              m4
+$GETTEXT/gettext-tools/m4/signalblocking.m4            m4
+$GETTEXT/gettext-tools/m4/ssize_t.m4                   m4
 #
 $LIBCSRC/argp/argp-ba.c                        lib gpl
 $LIBCSRC/argp/argp-eexst.c             lib gpl
Index: lib/unsetenv.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/unsetenv.c,v
retrieving revision 1.3
diff -p -u -r1.3 unsetenv.c
--- lib/unsetenv.c      10 Sep 2003 14:16:32 -0000      1.3
+++ lib/unsetenv.c      31 Mar 2004 07:01:46 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992,1995-1999,2000-2003 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1995-1999,2000-2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
Index: m4/printf-posix.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/printf-posix.m4,v
retrieving revision 1.1
diff -p -u -r1.1 printf-posix.m4
--- m4/printf-posix.m4  3 Dec 2003 21:06:19 -0000       1.1
+++ m4/printf-posix.m4  31 Mar 2004 07:01:46 -0000
@@ -1,4 +1,4 @@
-# printf-posix.m4 serial 1 (gettext-0.13)
+# printf-posix.m4 serial 2 (gettext-0.13.1)
 dnl Copyright (C) 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
@@ -30,7 +30,7 @@ int main ()
 }], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
       [
         AC_EGREP_CPP(notposix, [
-#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__
+#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined 
__CYGWIN__
   notposix
 #endif
         ], gt_cv_func_printf_posix="guessing no",