projects / pspp / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8662e26)
Propagating gettext into gnulib a bit better.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 13 Apr 2004 06:38:44 +0000 (06:38 +0000)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 13 Apr 2004 06:38:44 +0000 (06:38 +0000)
ChangeLog patch | blob | history
config/srclist.txt patch | blob | history
lib/unsetenv.c patch | blob | history
m4/printf-posix.m4 patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 0348131f37d58fc268a1f838f1ec83ee352f27e9..5e07772307e218280b0655ee7bc77101cf0e0be4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2004-04-12  Paul Eggert  <eggert@twinsun.com>
 
 2004-04-12  Paul Eggert  <eggert@twinsun.com>
 
+       * 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.
+
        * modules/inttostr (EXTRA_DIST): Move inttostr.c here....
        (lib_SOURCES): from here.
        * modules/getopt (lib_SOURCES): Add getopt_int.h.
        * modules/inttostr (EXTRA_DIST): Move inttostr.c here....
        (lib_SOURCES): from here.
        * modules/getopt (lib_SOURCES): Add getopt_int.h.
diff --git a/config/srclist.txt b/config/srclist.txt
index 17f038a8a96485bd3a7e0b0fb2f01aab3779cd95..1886af2ce56bf9c96c950127cd0b4b2a8f2f1532 100644 (file)
--- a/config/srclist.txt
+++ b/config/srclist.txt
@@ -1,4 +1,4 @@
-# $Id: srclist.txt,v 1.34 2004-03-09 19:42:23 eggert Exp $
+# $Id: srclist.txt,v 1.35 2004-04-13 06:38:44 eggert Exp $
 # Files for which we are not the source.  See ./srclistvars.sh for the
 # variable definitions.
 
 # Files for which we are not the source.  See ./srclistvars.sh for the
 # variable definitions.
 
@@ -44,9 +44,8 @@ $GETTEXT/gettext-runtime/intl/ref-del.sin             lib gpl
 
 $GETTEXT/gettext-tools/lib/gettext.h                   lib gpl
 $GETTEXT/gettext-tools/lib/mkdtemp.c                   lib gpl
 
 $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
 
 $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                      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/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/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-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
 #
 $LIBCSRC/argp/argp-ba.c                        lib gpl
 $LIBCSRC/argp/argp-eexst.c             lib gpl
diff --git a/lib/unsetenv.c b/lib/unsetenv.c
index b7a38ad0fedd0d80729088111fedc38709b07925..31c299e4625289c46843e83e38a4a3d233c5a233 100644 (file)
--- a/lib/unsetenv.c
+++ b/lib/unsetenv.c
@@ -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
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/m4/printf-posix.m4 b/m4/printf-posix.m4
index cd6e40b58555829c7832e17f4d3121f6847e14bb..186ba6a6d16deed4c199eceb4ecc44c0c7a7d5d4 100644 (file)
--- a/m4/printf-posix.m4
+++ b/m4/printf-posix.m4
@@ -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
 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, [
 }], 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",
   notposix
 #endif
         ], gt_cv_func_printf_posix="guessing no",
Unnamed repository; edit this file to name it for gitweb.