texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo update (Mon Nov 26 14:23:01 EST 2007)


From: Karl Berry
Subject: texinfo update (Mon Nov 26 14:23:01 EST 2007)
Date: Mon, 26 Nov 2007 14:23:03 -0500

Index: gnulib/lib/.cvsignore
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnulib/lib/.cvsignore       8 Oct 2007 18:22:27 -0000       1.10
+++ gnulib/lib/.cvsignore       26 Nov 2007 19:12:39 -0000      1.11
@@ -13,3 +13,14 @@
 wchar.h
 wctype.h
 malloc.c
+alloca.in.h
+getopt.in.h
+intprops.h
+stdint.in.h
+stdlib.in.h
+string.in.h
+sys_stat.in.h
+sys_time.in.h
+unistd.in.h
+wchar.in.h
+wctype.in.h
Index: gnulib/lib/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gnulib/lib/Makefile.am      8 Oct 2007 18:22:27 -0000       1.18
+++ gnulib/lib/Makefile.am      26 Nov 2007 19:12:39 -0000      1.19
@@ -49,14 +49,14 @@
 
 # We need the following in order to create <alloca.h> when the system
 # doesn't have one that works with the given compiler.
-alloca.h: alloca_.h
+alloca.h: alloca.in.h
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/alloca_.h; \
+         cat $(srcdir)/alloca.in.h; \
        } > address@hidden
        mv -f address@hidden $@
 MOSTLYCLEANFILES += alloca.h alloca.h-t
 
-EXTRA_DIST += alloca_.h
+EXTRA_DIST += alloca.in.h
 
 ## end   gnulib module alloca-opt
 
@@ -140,14 +140,14 @@
 
 # We need the following in order to create <getopt.h> when the system
 # doesn't have one that works with the given compiler.
-getopt.h: getopt_.h
+getopt.h: getopt.in.h
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/getopt_.h; \
+         cat $(srcdir)/getopt.in.h; \
        } > address@hidden
        mv -f address@hidden $@
 MOSTLYCLEANFILES += getopt.h getopt.h-t
 
-EXTRA_DIST += getopt.c getopt1.c getopt_.h getopt_int.h
+EXTRA_DIST += getopt.c getopt.in.h getopt1.c getopt_int.h
 
 EXTRA_libgnu_a_SOURCES += getopt.c getopt1.c
 
@@ -191,6 +191,13 @@
 
 ## end   gnulib module havelib
 
+## begin gnulib module intprops
+
+
+EXTRA_DIST += intprops.h
+
+## end   gnulib module intprops
+
 ## begin gnulib module link-warning
 
 LINK_WARNING_H=$(top_srcdir)/build-aux/link-warning.h
@@ -322,7 +329,7 @@
 
 # We need the following in order to create <stdint.h> when the system
 # doesn't have one that works with the given compiler.
-stdint.h: stdint_.h
+stdint.h: stdint.in.h
        rm -f address@hidden $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
@@ -347,12 +354,12 @@
              -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
              -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
              -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
-             < $(srcdir)/stdint_.h; \
+             < $(srcdir)/stdint.in.h; \
        } > address@hidden
        mv address@hidden $@
 MOSTLYCLEANFILES += stdint.h stdint.h-t
 
-EXTRA_DIST += stdint_.h
+EXTRA_DIST += stdint.in.h
 
 ## end   gnulib module stdint
 
@@ -362,7 +369,7 @@
 
 # We need the following in order to create <stdlib.h> when the system
 # doesn't have one that works with the given compiler.
-stdlib.h: stdlib_.h
+stdlib.h: stdlib.in.h
        rm -f address@hidden $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
          sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
@@ -373,19 +380,21 @@
              -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \
              -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
              -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
+             -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \
              -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \
              -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
              -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \
              -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
              -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
              -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
+             -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-             < $(srcdir)/stdlib_.h; \
+             < $(srcdir)/stdlib.in.h; \
        } > address@hidden
        mv address@hidden $@
 MOSTLYCLEANFILES += stdlib.h stdlib.h-t
 
-EXTRA_DIST += stdlib_.h
+EXTRA_DIST += stdlib.in.h
 
 ## end   gnulib module stdlib
 
@@ -429,7 +438,7 @@
 
 # We need the following in order to create <string.h> when the system
 # doesn't have one that works with the given compiler.
-string.h: string_.h
+string.h: string.in.h
        rm -f address@hidden $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
          sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
@@ -461,6 +470,7 @@
              -e 's|@''GNULIB_STRSEP''@|$(GNULIB_STRSEP)|g' \
              -e 's|@''GNULIB_STRCASESTR''@|$(GNULIB_STRCASESTR)|g' \
              -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \
+             -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \
              -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
              -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
              -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \
@@ -477,13 +487,15 @@
              -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \
              -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \
              -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \
+             -e 's|@''HAVE_DECL_STRERROR''@|$(HAVE_DECL_STRERROR)|g' \
+             -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-             < $(srcdir)/string_.h; \
+             < $(srcdir)/string.in.h; \
        } > address@hidden
        mv address@hidden $@
 MOSTLYCLEANFILES += string.h string.h-t
 
-EXTRA_DIST += string_.h
+EXTRA_DIST += string.in.h
 
 ## end   gnulib module string
 
@@ -493,7 +505,7 @@
 
 # We need the following in order to create <sys/stat.h> when the system
 # has one that is incomplete.
-sys/stat.h: sys_stat_.h
+sys/stat.h: sys_stat.in.h
        @MKDIR_P@ sys
        rm -f address@hidden $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
@@ -502,13 +514,13 @@
              -e 's|@''HAVE_IO_H''@|$(HAVE_IO_H)|g' \
              -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \
              -e 's|@''HAVE_DECL_MKDIR''@|$(HAVE_DECL_MKDIR)|g' \
-             < $(srcdir)/sys_stat_.h; \
+             < $(srcdir)/sys_stat.in.h; \
        } > address@hidden
        mv address@hidden $@
 MOSTLYCLEANFILES += sys/stat.h sys/stat.h-t
 MOSTLYCLEANDIRS += sys
 
-EXTRA_DIST += sys_stat_.h
+EXTRA_DIST += sys_stat.in.h
 
 ## end   gnulib module sys_stat
 
@@ -518,7 +530,7 @@
 
 # We need the following in order to create <sys/time.h> when the system
 # doesn't have one that works with the given compiler.
-sys/time.h: sys_time_.h
+sys/time.h: sys_time.in.h
        @MKDIR_P@ sys
        rm -f address@hidden $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
@@ -527,12 +539,12 @@
              -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \
              -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \
              -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \
-             < $(srcdir)/sys_time_.h; \
+             < $(srcdir)/sys_time.in.h; \
        } > address@hidden
        mv address@hidden $@
 MOSTLYCLEANFILES += sys/time.h sys/time.h-t
 
-EXTRA_DIST += sys_time_.h
+EXTRA_DIST += sys_time.in.h
 
 ## end   gnulib module sys_time
 
@@ -551,7 +563,7 @@
 
 # We need the following in order to create an empty placeholder for
 # <unistd.h> when the system doesn't have one.
-unistd.h: unistd_.h
+unistd.h: unistd.in.h
        rm -f address@hidden $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
@@ -577,12 +589,12 @@
              -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
              -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
              -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
-             < $(srcdir)/unistd_.h; \
+             < $(srcdir)/unistd.in.h; \
        } > address@hidden
        mv address@hidden $@
 MOSTLYCLEANFILES += unistd.h unistd.h-t
 
-EXTRA_DIST += unistd_.h
+EXTRA_DIST += unistd.in.h
 
 ## end   gnulib module unistd
 
@@ -614,7 +626,7 @@
 
 # We need the following in order to create <wchar.h> when the system
 # version does not work standalone.
-wchar.h: wchar_.h
+wchar.h: wchar.in.h
        rm -f address@hidden $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
@@ -624,12 +636,12 @@
              -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
              -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-           < $(srcdir)/wchar_.h; \
+           < $(srcdir)/wchar.in.h; \
        } > address@hidden
        mv address@hidden $@
 MOSTLYCLEANFILES += wchar.h wchar.h-t
 
-EXTRA_DIST += wchar_.h
+EXTRA_DIST += wchar.in.h
 
 ## end   gnulib module wchar
 
@@ -639,7 +651,7 @@
 
 # We need the following in order to create <wctype.h> when the system
 # doesn't have one that works with the given compiler.
-wctype.h: wctype_.h
+wctype.h: wctype.in.h
        rm -f address@hidden $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
@@ -647,12 +659,12 @@
              -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
              -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
              -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
-             < $(srcdir)/wctype_.h; \
+             < $(srcdir)/wctype.in.h; \
        } > address@hidden
        mv address@hidden $@
 MOSTLYCLEANFILES += wctype.h wctype.h-t
 
-EXTRA_DIST += wctype_.h
+EXTRA_DIST += wctype.in.h
 
 ## end   gnulib module wctype
 
cvs diff: Tag HEAD refers to a dead (removed) revision in file 
`gnulib/lib/alloca_.h'.
cvs diff: No comparison available.  Pass `-N' to `cvs diff'?
Index: gnulib/lib/config.charset
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/config.charset,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/config.charset   26 Jul 2007 21:52:17 -0000      1.1
+++ gnulib/lib/config.charset   26 Nov 2007 19:12:40 -0000      1.2
@@ -1,11 +1,11 @@
 #! /bin/sh
 # Output a system dependent table of character encoding aliases.
 #
-#   Copyright (C) 2000-2004, 2006 Free Software Foundation, Inc.
+#   Copyright (C) 2000-2004, 2006-2007 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2, or (at your option)
+#   the Free Software Foundation; either version 3, or (at your option)
 #   any later version.
 #
 #   This program is distributed in the hope that it will be useful,
@@ -31,20 +31,20 @@
 #
 #       name              MIME?             used by which systems
 #   ASCII, ANSI_X3.4-1968       glibc solaris freebsd netbsd darwin
-#   ISO-8859-1              Y   glibc aix hpux irix osf solaris freebsd netbsd 
darwin
-#   ISO-8859-2              Y   glibc aix hpux irix osf solaris freebsd netbsd 
darwin
+#   ISO-8859-1              Y   glibc aix hpux irix osf solaris freebsd netbsd 
openbsd darwin
+#   ISO-8859-2              Y   glibc aix hpux irix osf solaris freebsd netbsd 
openbsd darwin
 #   ISO-8859-3              Y   glibc solaris
-#   ISO-8859-4              Y   osf solaris freebsd netbsd darwin
-#   ISO-8859-5              Y   glibc aix hpux irix osf solaris freebsd netbsd 
darwin
+#   ISO-8859-4              Y   osf solaris freebsd netbsd openbsd darwin
+#   ISO-8859-5              Y   glibc aix hpux irix osf solaris freebsd netbsd 
openbsd darwin
 #   ISO-8859-6              Y   glibc aix hpux solaris
-#   ISO-8859-7              Y   glibc aix hpux irix osf solaris netbsd darwin
+#   ISO-8859-7              Y   glibc aix hpux irix osf solaris netbsd openbsd 
darwin
 #   ISO-8859-8              Y   glibc aix hpux osf solaris
 #   ISO-8859-9              Y   glibc aix hpux irix osf solaris darwin
-#   ISO-8859-13                 glibc netbsd darwin
+#   ISO-8859-13                 glibc netbsd openbsd darwin
 #   ISO-8859-14                 glibc
-#   ISO-8859-15                 glibc aix osf solaris freebsd darwin
-#   KOI8-R                  Y   glibc solaris freebsd netbsd darwin
-#   KOI8-U                  Y   glibc freebsd netbsd darwin
+#   ISO-8859-15                 glibc aix osf solaris freebsd netbsd openbsd 
darwin
+#   KOI8-R                  Y   glibc solaris freebsd netbsd openbsd darwin
+#   KOI8-U                  Y   glibc freebsd netbsd openbsd darwin
 #   KOI8-T                      glibc
 #   CP437                       dos
 #   CP775                       dos
@@ -57,7 +57,7 @@
 #   CP862                       dos
 #   CP864                       dos
 #   CP865                       dos
-#   CP866                       freebsd netbsd darwin dos
+#   CP866                       freebsd netbsd openbsd darwin dos
 #   CP869                       dos
 #   CP874                       woe32 dos
 #   CP922                       aix
@@ -70,7 +70,7 @@
 #   CP1125                      dos
 #   CP1129                      aix
 #   CP1250                      woe32
-#   CP1251                      glibc solaris netbsd darwin woe32
+#   CP1251                      glibc solaris netbsd openbsd darwin woe32
 #   CP1252                      aix woe32
 #   CP1253                      woe32
 #   CP1254                      woe32
@@ -397,6 +397,16 @@
        echo "BIG5 BIG5"
        echo "SJIS SHIFT_JIS"
        ;;
+    openbsd*)
+       echo "646 ASCII"
+       echo "ISO8859-1 ISO-8859-1"
+       echo "ISO8859-2 ISO-8859-2"
+       echo "ISO8859-4 ISO-8859-4"
+       echo "ISO8859-5 ISO-8859-5"
+       echo "ISO8859-7 ISO-8859-7"
+       echo "ISO8859-13 ISO-8859-13"
+       echo "ISO8859-15 ISO-8859-15"
+       ;;
     darwin[56]*)
        # Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore
        # localcharset.c falls back to using the full locale name
Index: gnulib/lib/error.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/error.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnulib/lib/error.c  23 Jul 2007 14:23:07 -0000      1.5
+++ gnulib/lib/error.c  26 Nov 2007 19:12:40 -0000      1.6
@@ -2,19 +2,18 @@
    Copyright (C) 1990-1998, 2000-2007 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 program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by David MacKenzie <address@hidden>.  */
 
Index: gnulib/lib/error.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/error.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/lib/error.h  12 Aug 2006 12:57:17 -0000      1.2
+++ gnulib/lib/error.h  26 Nov 2007 19:12:40 -0000      1.3
@@ -2,19 +2,18 @@
    Copyright (C) 1995, 1996, 1997, 2003, 2006 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 program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _ERROR_H
 #define _ERROR_H 1
Index: gnulib/lib/exitfail.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/exitfail.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnulib/lib/exitfail.c       22 Feb 2007 00:46:09 -0000      1.4
+++ gnulib/lib/exitfail.c       26 Nov 2007 19:12:40 -0000      1.5
@@ -2,10 +2,10 @@
 
    Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,9 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.
-   If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
Index: gnulib/lib/exitfail.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/exitfail.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/exitfail.h       18 Jun 2006 23:39:43 -0000      1.1
+++ gnulib/lib/exitfail.h       26 Nov 2007 19:12:40 -0000      1.2
@@ -2,10 +2,10 @@
 
    Copyright (C) 2002 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,8 +13,6 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.
-   If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 extern int volatile exit_failure;
Index: gnulib/lib/getopt.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/getopt.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnulib/lib/getopt.c 15 Oct 2006 21:09:15 -0000      1.3
+++ gnulib/lib/getopt.c 26 Nov 2007 19:12:40 -0000      1.4
@@ -6,19 +6,18 @@
        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 program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _LIBC
 # include <config.h>
Index: gnulib/lib/getopt1.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/getopt1.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/lib/getopt1.c        15 Oct 2006 21:09:15 -0000      1.2
+++ gnulib/lib/getopt1.c        26 Nov 2007 19:12:40 -0000      1.3
@@ -3,19 +3,18 @@
      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 program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef _LIBC
 # include <getopt.h>
cvs diff: Tag HEAD refers to a dead (removed) revision in file 
`gnulib/lib/getopt_.h'.
cvs diff: No comparison available.  Pass `-N' to `cvs diff'?
Index: gnulib/lib/getopt_int.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/getopt_int.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/getopt_int.h     18 Jun 2006 23:39:43 -0000      1.1
+++ gnulib/lib/getopt_int.h     26 Nov 2007 19:12:40 -0000      1.2
@@ -3,19 +3,18 @@
    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 program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _GETOPT_INT_H
 #define _GETOPT_INT_H  1
Index: gnulib/lib/gettext.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/gettext.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnulib/lib/gettext.h        9 Jan 2007 14:09:11 -0000       1.5
+++ gnulib/lib/gettext.h        26 Nov 2007 19:12:40 -0000      1.6
@@ -3,7 +3,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
Index: gnulib/lib/gettimeofday.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/gettimeofday.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/lib/gettimeofday.c   22 Feb 2007 00:46:09 -0000      1.2
+++ gnulib/lib/gettimeofday.c   26 Nov 2007 19:12:40 -0000      1.3
@@ -5,7 +5,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -48,7 +48,7 @@
    localtime uses for its result.  */
 
 struct tm *
-localtime (time_t const *timep)
+rpl_localtime (time_t const *timep)
 {
 #undef localtime
   extern struct tm *localtime (time_t const *);
@@ -62,7 +62,7 @@
 
 /* Same as above, since gmtime and localtime use the same buffer.  */
 struct tm *
-gmtime (time_t const *timep)
+rpl_gmtime (time_t const *timep)
 {
 #undef gmtime
   extern struct tm *gmtime (time_t const *);
@@ -80,7 +80,7 @@
 /* This is a wrapper for tzset, for systems on which tzset may clobber
    the static buffer used for localtime's result.  */
 void
-tzset (void)
+rpl_tzset (void)
 {
 #undef tzset
   extern void tzset (void);
Index: gnulib/lib/localcharset.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/localcharset.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/localcharset.c   26 Jul 2007 21:51:26 -0000      1.1
+++ gnulib/lib/localcharset.c   26 Nov 2007 19:12:40 -0000      1.2
@@ -4,7 +4,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
Index: gnulib/lib/localcharset.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/localcharset.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/localcharset.h   26 Jul 2007 21:51:26 -0000      1.1
+++ gnulib/lib/localcharset.h   26 Nov 2007 19:12:40 -0000      1.2
@@ -4,7 +4,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
Index: gnulib/lib/malloca.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/malloca.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/malloca.c        26 Jul 2007 21:51:26 -0000      1.1
+++ gnulib/lib/malloca.c        26 Nov 2007 19:12:40 -0000      1.2
@@ -4,7 +4,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
Index: gnulib/lib/malloca.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/malloca.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/malloca.h        26 Jul 2007 21:51:26 -0000      1.1
+++ gnulib/lib/malloca.h        26 Nov 2007 19:12:40 -0000      1.2
@@ -4,7 +4,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
Index: gnulib/lib/mbswidth.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/mbswidth.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/lib/mbswidth.c       15 Jul 2007 22:30:26 -0000      1.2
+++ gnulib/lib/mbswidth.c       26 Nov 2007 19:12:40 -0000      1.3
@@ -1,10 +1,10 @@
 /* Determine the number of screen columns needed for a string.
    Copyright (C) 2000-2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,8 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Bruno Haible <address@hidden>.  */
 
Index: gnulib/lib/mbswidth.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/mbswidth.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/lib/mbswidth.h       25 Jun 2007 21:16:32 -0000      1.2
+++ gnulib/lib/mbswidth.h       26 Nov 2007 19:12:40 -0000      1.3
@@ -1,10 +1,10 @@
 /* Determine the number of screen columns needed for a string.
    Copyright (C) 2000-2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,8 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <stddef.h>
 
Index: gnulib/lib/memcpy.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/memcpy.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/lib/memcpy.c 15 Oct 2006 21:09:15 -0000      1.2
+++ gnulib/lib/memcpy.c 26 Nov 2007 19:12:40 -0000      1.3
@@ -1,9 +1,9 @@
 /* Copyright (C) 1995, 1997, 2000, 2003, 2006 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -11,8 +11,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Jim Meyering <address@hidden>.  */
 
Index: gnulib/lib/mkstemp.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/mkstemp.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnulib/lib/mkstemp.c        22 Feb 2007 00:46:09 -0000      1.4
+++ gnulib/lib/mkstemp.c        26 Nov 2007 19:12:40 -0000      1.5
@@ -1,19 +1,18 @@
 /* Copyright (C) 1998, 1999, 2001, 2005, 2006, 2007 Free Software Foundation, 
Inc.
    This file is derived from the one in the GNU C Library.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #if !_LIBC
 # include <config.h>
Index: gnulib/lib/ref-add.sin
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/ref-add.sin,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/ref-add.sin      26 Jul 2007 21:51:26 -0000      1.1
+++ gnulib/lib/ref-add.sin      26 Nov 2007 19:12:40 -0000      1.2
@@ -4,7 +4,7 @@
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2, or (at your option)
+#   the Free Software Foundation; either version 3, or (at your option)
 #   any later version.
 #
 #   This program is distributed in the hope that it will be useful,
Index: gnulib/lib/ref-del.sin
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/ref-del.sin,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/ref-del.sin      26 Jul 2007 21:51:26 -0000      1.1
+++ gnulib/lib/ref-del.sin      26 Nov 2007 19:12:40 -0000      1.2
@@ -4,7 +4,7 @@
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2, or (at your option)
+#   the Free Software Foundation; either version 3, or (at your option)
 #   any later version.
 #
 #   This program is distributed in the hope that it will be useful,
Index: gnulib/lib/setenv.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/setenv.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnulib/lib/setenv.c 25 Jun 2007 21:16:32 -0000      1.4
+++ gnulib/lib/setenv.c 26 Nov 2007 19:12:40 -0000      1.5
@@ -1,19 +1,18 @@
 /* Copyright (C) 1992,1995-1999,2000-2003,2005-2007 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 program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #if !_LIBC
 # include <config.h>
Index: gnulib/lib/setenv.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/setenv.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/lib/setenv.h 25 Jun 2007 21:16:32 -0000      1.2
+++ gnulib/lib/setenv.h 26 Nov 2007 19:12:40 -0000      1.3
@@ -1,10 +1,10 @@
 /* Setting environment variables.
    Copyright (C) 2001-2004, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,8 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #if HAVE_SETENV || HAVE_UNSETENV
 
cvs diff: Tag HEAD refers to a dead (removed) revision in file 
`gnulib/lib/stdint_.h'.
cvs diff: No comparison available.  Pass `-N' to `cvs diff'?
cvs diff: Tag HEAD refers to a dead (removed) revision in file 
`gnulib/lib/stdlib_.h'.
cvs diff: No comparison available.  Pass `-N' to `cvs diff'?
Index: gnulib/lib/strcasecmp.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/strcasecmp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnulib/lib/strcasecmp.c     5 Feb 2007 16:26:09 -0000       1.3
+++ gnulib/lib/strcasecmp.c     26 Nov 2007 19:12:41 -0000      1.4
@@ -3,7 +3,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
Index: gnulib/lib/strdup.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/strdup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnulib/lib/strdup.c 5 Feb 2007 16:26:09 -0000       1.3
+++ gnulib/lib/strdup.c 26 Nov 2007 19:12:41 -0000      1.4
@@ -5,7 +5,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
Index: gnulib/lib/streq.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/streq.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/lib/streq.h  3 Sep 2007 12:22:34 -0000       1.2
+++ gnulib/lib/streq.h  26 Nov 2007 19:12:41 -0000      1.3
@@ -1,20 +1,18 @@
 /* Optimized string comparison.
    Copyright (C) 2001-2002, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Bruno Haible <address@hidden>.  */
 
Index: gnulib/lib/strerror.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/strerror.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnulib/lib/strerror.c       25 Jun 2007 21:16:32 -0000      1.3
+++ gnulib/lib/strerror.c       26 Nov 2007 19:12:41 -0000      1.4
@@ -1,12 +1,11 @@
-/* strerror.c --- ANSI C compatible system error routine
+/* strerror.c --- POSIX compatible system error routine
 
-   Copyright (C) 1986, 1988, 1989, 1991, 2002, 2003, 2006, 2007 Free
-   Software Foundation, Inc.
+   Copyright (C) 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,44 +13,37 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
-#if !HAVE_STRERROR
+#include <string.h>
 
-#include <limits.h>
+#if REPLACE_STRERROR
 
-/* Don't include <stdio.h>, since it may or may not declare
-   sys_errlist and its declarations may collide with ours.  Just
-   declare the stuff that we need directly.  Standard hosted C89
-   implementations define strerror and they don't need this strerror
-   function, so take some liberties with the standard to cater to
-   ancient or limited freestanding implementations.  */
-int sprintf (char *, char const *, ...);
-extern int sys_nerr;
-extern char *sys_errlist[];
+# include <stdio.h>
+
+# include "intprops.h"
+
+# undef strerror
+# if ! HAVE_DECL_STRERROR
+#  define strerror(n) NULL
+# endif
 
 char *
-strerror (int n)
+rpl_strerror (int n)
 {
-  static char const fmt[] = "Unknown error (%d)";
-  static char mesg[sizeof fmt + sizeof n * CHAR_BIT / 3];
+  char *result = strerror (n);
 
-  if (n < 0 || n >= sys_nerr)
+  if (result == NULL || result[0] == '\0')
     {
+      static char const fmt[] = "Unknown error (%d)";
+      static char mesg[sizeof fmt + INT_STRLEN_BOUND (n)];
       sprintf (mesg, fmt, n);
       return mesg;
     }
-  else
-    return sys_errlist[n];
-}
 
-#else
-
-/* This declaration is solely to ensure that after preprocessing
-   this file is never empty.  */
-typedef int dummy;
+  return result;
+}
 
 #endif
cvs diff: Tag HEAD refers to a dead (removed) revision in file 
`gnulib/lib/string_.h'.
cvs diff: No comparison available.  Pass `-N' to `cvs diff'?
Index: gnulib/lib/strncasecmp.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/strncasecmp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnulib/lib/strncasecmp.c    5 Feb 2007 16:26:09 -0000       1.3
+++ gnulib/lib/strncasecmp.c    26 Nov 2007 19:12:41 -0000      1.4
@@ -3,7 +3,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
cvs diff: Tag HEAD refers to a dead (removed) revision in file 
`gnulib/lib/sys_stat_.h'.
cvs diff: No comparison available.  Pass `-N' to `cvs diff'?
cvs diff: Tag HEAD refers to a dead (removed) revision in file 
`gnulib/lib/sys_time_.h'.
cvs diff: No comparison available.  Pass `-N' to `cvs diff'?
Index: gnulib/lib/tempname.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/tempname.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnulib/lib/tempname.c       5 Feb 2007 16:26:09 -0000       1.6
+++ gnulib/lib/tempname.c       26 Nov 2007 19:12:41 -0000      1.7
@@ -4,19 +4,18 @@
    2000, 2001, 2002, 2003, 2005, 2006, 2007 Free Software Foundation,
    Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Extracted from glibc sysdeps/posix/tempname.c.  See also tmpdir.c.  */
 
Index: gnulib/lib/tempname.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/tempname.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/tempname.h       31 Oct 2006 19:34:00 -0000      1.1
+++ gnulib/lib/tempname.h       26 Nov 2007 19:12:41 -0000      1.2
@@ -2,10 +2,10 @@
 
    Copyright (C) 2006 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,8 +13,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* header written by Eric Blake */
 
cvs diff: Tag HEAD refers to a dead (removed) revision in file 
`gnulib/lib/unistd_.h'.
cvs diff: No comparison available.  Pass `-N' to `cvs diff'?
Index: gnulib/lib/unitypes.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/unitypes.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/unitypes.h       26 Jul 2007 21:51:26 -0000      1.1
+++ gnulib/lib/unitypes.h       26 Nov 2007 19:12:41 -0000      1.2
@@ -1,20 +1,18 @@
 /* Elementary types for the GNU UniString library.
    Copyright (C) 2002, 2005-2006 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _UNITYPES_H
 #define _UNITYPES_H
Index: gnulib/lib/uniwidth.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/uniwidth.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/uniwidth.h       26 Jul 2007 21:51:26 -0000      1.1
+++ gnulib/lib/uniwidth.h       26 Nov 2007 19:12:41 -0000      1.2
@@ -1,20 +1,18 @@
 /* Display width functions.
    Copyright (C) 2001-2002, 2005, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _UNIWIDTH_H
 #define _UNIWIDTH_H
Index: gnulib/lib/unsetenv.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/unsetenv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/lib/unsetenv.c       15 Oct 2006 21:09:15 -0000      1.2
+++ gnulib/lib/unsetenv.c       26 Nov 2007 19:12:41 -0000      1.3
@@ -1,19 +1,18 @@
 /* Copyright (C) 1992,1995-1999,2000-2002,2005-2006 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 program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
cvs diff: Tag HEAD refers to a dead (removed) revision in file 
`gnulib/lib/wchar_.h'.
cvs diff: No comparison available.  Pass `-N' to `cvs diff'?
cvs diff: Tag HEAD refers to a dead (removed) revision in file 
`gnulib/lib/wctype_.h'.
cvs diff: No comparison available.  Pass `-N' to `cvs diff'?
Index: gnulib/lib/wcwidth.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/wcwidth.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/wcwidth.c        26 Jul 2007 21:51:27 -0000      1.1
+++ gnulib/lib/wcwidth.c        26 Nov 2007 19:12:41 -0000      1.2
@@ -1,10 +1,10 @@
 /* Determine the number of screen columns needed for a character.
    Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,8 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
Index: gnulib/lib/xalloc-die.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/xalloc-die.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/lib/xalloc-die.c     15 Oct 2006 21:09:15 -0000      1.2
+++ gnulib/lib/xalloc-die.c     26 Nov 2007 19:12:42 -0000      1.3
@@ -3,10 +3,10 @@
    Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2006 Free
    Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
Index: gnulib/lib/xalloc.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/xalloc.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnulib/lib/xalloc.h 5 Feb 2007 16:26:09 -0000       1.4
+++ gnulib/lib/xalloc.h 26 Nov 2007 19:12:42 -0000      1.5
@@ -3,10 +3,10 @@
    Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
    1999, 2000, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef XALLOC_H_
 # define XALLOC_H_
Index: gnulib/lib/xmalloc.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/xmalloc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnulib/lib/xmalloc.c        9 Nov 2006 14:57:44 -0000       1.3
+++ gnulib/lib/xmalloc.c        26 Nov 2007 19:12:42 -0000      1.4
@@ -4,10 +4,10 @@
    1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
    Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
Index: gnulib/lib/xsetenv.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/xsetenv.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnulib/lib/xsetenv.c        22 Feb 2007 00:46:10 -0000      1.4
+++ gnulib/lib/xsetenv.c        26 Nov 2007 19:12:42 -0000      1.5
@@ -1,10 +1,10 @@
 /* Setting environment variables, with out-of-memory checking.
    Copyright (C) 2001-2002, 2005-2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,8 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
Index: gnulib/lib/xsetenv.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/xsetenv.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/lib/xsetenv.h        25 Jun 2007 21:16:32 -0000      1.2
+++ gnulib/lib/xsetenv.h        26 Nov 2007 19:12:42 -0000      1.3
@@ -1,10 +1,10 @@
 /* Setting environment variables, with out-of-memory checking.
    Copyright (C) 2001-2002, 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,8 +12,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Get unsetenv().  It can be used without error checking.  */
 #include "setenv.h"
Index: gnulib/lib/sys/stat.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/sys/stat.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/sys/stat.h       31 Oct 2006 19:34:00 -0000      1.1
+++ gnulib/lib/sys/stat.h       26 Nov 2007 19:12:42 -0000      1.2
@@ -1,10 +1,10 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Provide a more complete sys/stat header file.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -18,13 +18,17 @@
 
 /* Written by Eric Blake, Paul Eggert, and Jim Meyering.  */
 
-#ifndef _gl_SYS_STAT_H
-#define _gl_SYS_STAT_H
-
 /* This file is supposed to be used on platforms where <sys/stat.h> is
    incomplete.  It is intended to provide definitions and prototypes
    needed by an application.  Start with what the system provides.  */
-#include "///usr/include/sys/stat.h"
+
+#ifndef _GL_SYS_STAT_H
+
+/* The include_next requires a split double-inclusion guard.  */
+#include_next <sys/stat.h>
+
+#ifndef _GL_SYS_STAT_H
+#define _GL_SYS_STAT_H
 
 #ifndef S_IFMT
 # define S_IFMT 0170000
@@ -254,14 +258,14 @@
 
 /* mingw does not support symlinks, therefore it does not have lstat.  But
    without links, stat does just fine.  */
-#if ! HAVE_LSTAT
+#if ! 1
 # define lstat stat
 #endif
 
 /* mingw's _mkdir() function has 1 argument, but we pass 2 arguments.
    Additionally, it declares _mkdir (and depending on compile flags, an
    alias mkdir), only in the nonstandard io.h.  */
-#if ! HAVE_DECL_MKDIR && HAVE_IO_H
+#if ! 1 && 0
 # include <io.h>
 
 static inline int
@@ -273,4 +277,5 @@
 # define mkdir rpl_mkdir
 #endif
 
-#endif /* _gl_SYS_STAT_H */
+#endif /* _GL_SYS_STAT_H */
+#endif /* _GL_SYS_STAT_H */
Index: gnulib/lib/sys/time.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/sys/time.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/lib/sys/time.h       15 Jul 2007 22:30:27 -0000      1.2
+++ gnulib/lib/sys/time.h       26 Nov 2007 19:12:42 -0000      1.3
@@ -5,7 +5,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
Index: gnulib/lib/uniwidth/cjk.h
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/uniwidth/cjk.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/uniwidth/cjk.h   23 Jul 2007 14:23:07 -0000      1.1
+++ gnulib/lib/uniwidth/cjk.h   26 Nov 2007 19:12:42 -0000      1.2
@@ -2,20 +2,18 @@
    Copyright (C) 2001-2002, 2005-2007 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2002.
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "streq.h"
 
Index: gnulib/lib/uniwidth/width.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/uniwidth/width.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/lib/uniwidth/width.c 23 Jul 2007 14:23:07 -0000      1.1
+++ gnulib/lib/uniwidth/width.c 26 Nov 2007 19:12:42 -0000      1.2
@@ -2,20 +2,18 @@
    Copyright (C) 2001-2002, 2006-2007 Free Software Foundation, Inc.
    Written by Bruno Haible <address@hidden>, 2002.
 
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Library General Public License as published
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
Index: gnulib/m4/gettext.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/gettext.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnulib/m4/gettext.m4        25 Jun 2007 21:16:32 -0000      1.6
+++ gnulib/m4/gettext.m4        26 Nov 2007 19:12:42 -0000      1.7
@@ -1,5 +1,5 @@
-# gettext.m4 serial 59a (gettext-0.16.1)
-dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
+# gettext.m4 serial 60 (gettext-0.17)
+dnl Copyright (C) 1995-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.
Index: gnulib/m4/gnulib-common.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/gnulib-common.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/m4/gnulib-common.m4  5 Feb 2007 16:26:09 -0000       1.2
+++ gnulib/m4/gnulib-common.m4  26 Nov 2007 19:12:42 -0000      1.3
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 2
+# gnulib-common.m4 serial 3
 dnl Copyright (C) 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,
@@ -20,3 +20,46 @@
     [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
      MKDIR_P='$(mkdir_p)'
      AC_SUBST([MKDIR_P])])])
+
+# AC_C_RESTRICT
+# This definition overrides the AC_C_RESTRICT macro from autoconf 2.60..2.61,
+# so that mixed use of GNU C and GNU C++ and mixed use of Sun C and Sun C++
+# works.
+# This definition can be removed once autoconf >= 2.62 can be assumed.
+AC_DEFUN([AC_C_RESTRICT],
+[AC_CACHE_CHECK([for C/C++ restrict keyword], ac_cv_c_restrict,
+  [ac_cv_c_restrict=no
+   # The order here caters to the fact that C++ does not require restrict.
+   for ac_kw in __restrict __restrict__ _Restrict restrict; do
+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+      [[typedef int * int_ptr;
+       int foo (int_ptr $ac_kw ip) {
+       return ip[0];
+       }]],
+      [[int s[1];
+       int * $ac_kw t = s;
+       t[0] = 0;
+       return foo(t)]])],
+      [ac_cv_c_restrict=$ac_kw])
+     test "$ac_cv_c_restrict" != no && break
+   done
+  ])
+ AH_VERBATIM([restrict],
+[/* Define to the equivalent of the C99 'restrict' keyword, or to
+   nothing if this is not supported.  Do not define if restrict is
+   supported directly.  */
+#undef restrict
+/* Work around a bug in Sun C++: it does not support _Restrict, even
+   though the corresponding Sun C compiler does, which causes
+   "#define restrict _Restrict" in the previous line.  Perhaps some future
+   version of Sun C++ will work with _Restrict; if so, it'll probably
+   define __RESTRICT, just as Sun C does.  */
+#if defined __SUNPRO_CC && !defined __RESTRICT
+# define _Restrict
+#endif])
+ case $ac_cv_c_restrict in
+   restrict) ;;
+   no) AC_DEFINE([restrict], []) ;;
+   *)  AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;;
+ esac
+])
Index: gnulib/m4/gnulib-comp.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/gnulib-comp.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnulib/m4/gnulib-comp.m4    8 Oct 2007 18:22:27 -0000       1.16
+++ gnulib/m4/gnulib-comp.m4    26 Nov 2007 19:12:42 -0000      1.17
@@ -44,10 +44,13 @@
   gl_source_base='gnulib/lib'
   gl_FUNC_ALLOCA
   gl_ERROR
+  m4_ifdef([AM_XGETTEXT_OPTION],
+    [AM_XGETTEXT_OPTION([--flag=error:3:c-format])
+     AM_XGETTEXT_OPTION([--flag=error_at_line:5:c-format])])
   gl_EXITFAIL
   gl_GETOPT
   dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac.
-  AM_GNU_GETTEXT_VERSION([0.16.1])
+  AM_GNU_GETTEXT_VERSION([0.17])
   AC_SUBST([LIBINTL])
   AC_SUBST([LTLIBINTL])
   gl_FUNC_GETTIMEOFDAY
@@ -69,6 +72,7 @@
   gl_FUNC_STRDUP
   gl_STRING_MODULE_INDICATOR([strdup])
   gl_FUNC_STRERROR
+  gl_STRING_MODULE_INDICATOR([strerror])
   gl_HEADER_STRING_H
   gl_HEADER_SYS_STAT_H
   AC_PROG_MKDIR_P
@@ -106,36 +110,50 @@
 
 # Like AC_LIBOBJ, except that the module name goes
 # into gl_LIBOBJS instead of into LIBOBJS.
-AC_DEFUN([gl_LIBOBJ],
-  [gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext"])
+AC_DEFUN([gl_LIBOBJ], [
+  AS_LITERAL_IF([$1], [gl_LIBSOURCES([$1.c])])dnl
+  gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext"
+])
 
 # Like AC_REPLACE_FUNCS, except that the module name goes
 # into gl_LIBOBJS instead of into LIBOBJS.
-AC_DEFUN([gl_REPLACE_FUNCS],
-  [AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)])])
+AC_DEFUN([gl_REPLACE_FUNCS], [
+  m4_foreach_w([gl_NAME], [$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl
+  AC_CHECK_FUNCS([$1], , [gl_LIBOBJ($ac_func)])
+])
 
-# Like AC_LIBSOURCES, except that it does nothing.
-# We rely on EXTRA_lib..._SOURCES instead.
-AC_DEFUN([gl_LIBSOURCES],
-  [])
+# Like AC_LIBSOURCES, except the directory where the source file is
+# expected is derived from the gnulib-tool parametrization,
+# and alloca is special cased (for the alloca-opt module).
+# We could also entirely rely on EXTRA_lib..._SOURCES.
+AC_DEFUN([gl_LIBSOURCES], [
+  m4_foreach([_gl_NAME], [$1], [
+    m4_if(_gl_NAME, [alloca.c], [], [
+      m4_syscmd([test -r gnulib/lib/]_gl_NAME[ || test ! -d gnulib/lib])dnl
+      m4_if(m4_sysval, [0], [],
+        [AC_FATAL([missing gnulib/lib/]_gl_NAME)])
+    ])
+  ])
+])
 
 # This macro records the list of files which have been installed by
 # gnulib-tool and may be removed by future gnulib-tool invocations.
 AC_DEFUN([gl_FILE_LIST], [
   build-aux/config.rpath
   build-aux/link-warning.h
-  lib/alloca_.h
+  lib/alloca.in.h
   lib/config.charset
   lib/error.c
   lib/error.h
   lib/exitfail.c
   lib/exitfail.h
   lib/getopt.c
+  lib/getopt.in.h
   lib/getopt1.c
-  lib/getopt_.h
   lib/getopt_int.h
   lib/gettext.h
   lib/gettimeofday.c
+  lib/intprops.h
   lib/localcharset.c
   lib/localcharset.h
   lib/malloc.c
@@ -151,26 +169,26 @@
   lib/ref-del.sin
   lib/setenv.c
   lib/setenv.h
-  lib/stdint_.h
-  lib/stdlib_.h
+  lib/stdint.in.h
+  lib/stdlib.in.h
   lib/strcasecmp.c
   lib/strdup.c
   lib/streq.h
   lib/strerror.c
-  lib/string_.h
+  lib/string.in.h
   lib/strncasecmp.c
-  lib/sys_stat_.h
-  lib/sys_time_.h
+  lib/sys_stat.in.h
+  lib/sys_time.in.h
   lib/tempname.c
   lib/tempname.h
-  lib/unistd_.h
+  lib/unistd.in.h
   lib/unitypes.h
   lib/uniwidth.h
   lib/uniwidth/cjk.h
   lib/uniwidth/width.c
   lib/unsetenv.c
-  lib/wchar_.h
-  lib/wctype_.h
+  lib/wchar.in.h
+  lib/wctype.in.h
   lib/wcwidth.c
   lib/xalloc-die.c
   lib/xalloc.h
@@ -233,7 +251,6 @@
   m4/sys_time_h.m4
   m4/tempname.m4
   m4/uintmax_t.m4
-  m4/ulonglong.m4
   m4/unistd_h.m4
   m4/visibility.m4
   m4/wchar.m4
Index: gnulib/m4/iconv.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/iconv.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/m4/iconv.m4  25 Jun 2007 21:16:33 -0000      1.2
+++ gnulib/m4/iconv.m4  26 Nov 2007 19:12:42 -0000      1.3
@@ -1,4 +1,4 @@
-# iconv.m4 serial AM6 (gettext-0.16.2)
+# iconv.m4 serial AM6 (gettext-0.17)
 dnl Copyright (C) 2000-2002, 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,
Index: gnulib/m4/intdiv0.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/intdiv0.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnulib/m4/intdiv0.m4        25 Jun 2007 21:16:33 -0000      1.3
+++ gnulib/m4/intdiv0.m4        26 Nov 2007 19:12:42 -0000      1.4
@@ -1,4 +1,4 @@
-# intdiv0.m4 serial 2 (gettext-0.16.2)
+# intdiv0.m4 serial 2 (gettext-0.17)
 dnl Copyright (C) 2002, 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,
Index: gnulib/m4/intl.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/intl.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/m4/intl.m4   25 Jun 2007 21:16:33 -0000      1.2
+++ gnulib/m4/intl.m4   26 Nov 2007 19:12:42 -0000      1.3
@@ -1,4 +1,4 @@
-# intl.m4 serial 5 (gettext-0.16.2)
+# intl.m4 serial 8 (gettext-0.17)
 dnl Copyright (C) 1995-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,
@@ -97,7 +97,7 @@
   dnl    exported variables _also_ in the static library.
   if test "$enable_shared" = yes; then
     case "$host_os" in
-      cygwin*) is_woe32dll=yes ;;
+      mingw* | cygwin*) is_woe32dll=yes ;;
       *) is_woe32dll=no ;;
     esac
   else
@@ -119,6 +119,18 @@
     AC_CHECK_TOOL([WINDRES], [windres])
   fi
 
+  dnl Determine whether when creating a library, "-lc" should be passed to
+  dnl libtool or not. On many platforms, it is required for the libtool option
+  dnl -no-undefined to work. On HP-UX, however, the -lc - stored by libtool
+  dnl in the *.la files - makes it impossible to create multithreaded programs,
+  dnl because libtool also reorders the -lc to come before the -pthread, and
+  dnl this disables pthread_create() 
<http://docs.hp.com/en/1896/pthreads.html>.
+  case "$host_os" in
+    hpux*) LTLIBC="" ;;
+    *)     LTLIBC="-lc" ;;
+  esac
+  AC_SUBST([LTLIBC])
+
   dnl Rename some macros and functions used for locking.
   AH_BOTTOM([
 #define __libc_lock_t                   gl_lock_t
@@ -209,7 +221,9 @@
   AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name,
     [AC_TRY_LINK([#include <langinfo.h>
 #include <locale.h>],
-      [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));],
+      [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));
+       return !cs;
+      ],
       gt_cv_nl_locale_name=yes,
       gt_cv_nl_locale_name=no)
     ])
Index: gnulib/m4/intlmacosx.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/intlmacosx.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/m4/intlmacosx.m4     26 Jul 2007 00:46:11 -0000      1.1
+++ gnulib/m4/intlmacosx.m4     26 Nov 2007 19:12:42 -0000      1.2
@@ -1,4 +1,4 @@
-# intlmacosx.m4 serial 1 (gettext-0.16.2)
+# intlmacosx.m4 serial 1 (gettext-0.17)
 dnl Copyright (C) 2004-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,
Index: gnulib/m4/lib-link.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/lib-link.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnulib/m4/lib-link.m4       9 Jan 2007 14:09:11 -0000       1.6
+++ gnulib/m4/lib-link.m4       26 Nov 2007 19:12:42 -0000      1.7
@@ -1,4 +1,4 @@
-# lib-link.m4 serial 13 (gettext-0.16.2)
+# lib-link.m4 serial 13 (gettext-0.17)
 dnl Copyright (C) 2001-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,
Index: gnulib/m4/lock.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/lock.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnulib/m4/lock.m4   8 Oct 2007 18:22:27 -0000       1.4
+++ gnulib/m4/lock.m4   26 Nov 2007 19:12:42 -0000      1.5
@@ -1,4 +1,4 @@
-# lock.m4 serial 7 (gettext-0.16.2)
+# lock.m4 serial 7 (gettext-0.17)
 dnl Copyright (C) 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,
Index: gnulib/m4/longlong.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/longlong.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnulib/m4/longlong.m4       9 Nov 2006 14:57:44 -0000       1.4
+++ gnulib/m4/longlong.m4       26 Nov 2007 19:12:42 -0000      1.5
@@ -1,5 +1,5 @@
-# longlong.m4 serial 10
-dnl Copyright (C) 1999-2006 Free Software Foundation, Inc.
+# longlong.m4 serial 13
+dnl Copyright (C) 1999-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.
@@ -7,8 +7,8 @@
 dnl From Paul Eggert.
 
 # Define HAVE_LONG_LONG_INT if 'long long int' works.
-# This fixes a bug in Autoconf 2.60, but can be removed once we
-# assume 2.61 everywhere.
+# This fixes a bug in Autoconf 2.61, but can be removed once we
+# assume 2.62 everywhere.
 
 # Note: If the type 'long long int' exists but is only 32 bits large
 # (as on some very old compilers), HAVE_LONG_LONG_INT will not be
@@ -18,20 +18,11 @@
 [
   AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],
     [AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-         [[long long int ll = 9223372036854775807ll;
-           long long int nll = -9223372036854775807LL;
-           typedef int a[((-9223372036854775807LL < 0
-                           && 0 < 9223372036854775807ll)
-                          ? 1 : -1)];
-           int i = 63;]],
-         [[long long int llmax = 9223372036854775807ll;
-           return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
-                   | (llmax / ll) | (llmax % ll));]])],
+       [_AC_TYPE_LONG_LONG_SNIPPET],
        [dnl This catches a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004.
        dnl If cross compiling, assume the bug isn't important, since
        dnl nobody cross compiles for this platform as far as we know.
-        AC_RUN_IFELSE(
+       AC_RUN_IFELSE(
          [AC_LANG_PROGRAM(
             address@hidden:@include <limits.h>
               @%:@ifndef LLONG_MAX
@@ -60,13 +51,56 @@
   fi
 ])
 
-# This macro is obsolescent and should go away soon.
-AC_DEFUN([gl_AC_TYPE_LONG_LONG],
+# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
+# This fixes a bug in Autoconf 2.61, but can be removed once we
+# assume 2.62 everywhere.
+
+# Note: If the type 'unsigned long long int' exists but is only 32 bits
+# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
+# will not be defined. In this case you can treat 'unsigned long long int'
+# like 'unsigned long int'.
+
+AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
 [
-  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
-  ac_cv_type_long_long=$ac_cv_type_long_long_int
-  if test $ac_cv_type_long_long = yes; then
-    AC_DEFINE(HAVE_LONG_LONG, 1,
-      [Define if you have the 'long long' type.])
+  AC_CACHE_CHECK([for unsigned long long int],
+    [ac_cv_type_unsigned_long_long_int],
+    [AC_LINK_IFELSE(
+       [_AC_TYPE_LONG_LONG_SNIPPET],
+       [ac_cv_type_unsigned_long_long_int=yes],
+       [ac_cv_type_unsigned_long_long_int=no])])
+  if test $ac_cv_type_unsigned_long_long_int = yes; then
+    AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], 1,
+      [Define to 1 if the system has the type `unsigned long long int'.])
   fi
 ])
+
+# Expands to a C program that can be used to test for simultaneous support
+# of 'long long' and 'unsigned long long'. We don't want to say that
+# 'long long' is available if 'unsigned long long' is not, or vice versa,
+# because too many programs rely on the symmetry between signed and unsigned
+# integer types (excluding 'bool').
+AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET],
+[
+  AC_LANG_PROGRAM(
+    [[/* For now, do not test the preprocessor; as of 2007 there are too many
+        implementations with broken preprocessors.  Perhaps this can
+        be revisited in 2012.  In the meantime, code should not expect
+        #if to work with literals wider than 32 bits.  */
+      /* Test literals.  */
+      long long int ll = 9223372036854775807ll;
+      long long int nll = -9223372036854775807LL;
+      unsigned long long int ull = 18446744073709551615ULL;
+      /* Test constant expressions.   */
+      typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
+                    ? 1 : -1)];
+      typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
+                    ? 1 : -1)];
+      int i = 63;]],
+    [[/* Test availability of runtime routines for shift and division.  */
+      long long int llmax = 9223372036854775807ll;
+      unsigned long long int ullmax = 18446744073709551615ull;
+      return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
+             | (llmax / ll) | (llmax % ll)
+             | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
+             | (ullmax / ull) | (ullmax % ull));]])
+])
Index: gnulib/m4/po.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/po.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/m4/po.m4     12 Aug 2006 12:57:17 -0000      1.2
+++ gnulib/m4/po.m4     26 Nov 2007 19:12:42 -0000      1.3
@@ -1,5 +1,5 @@
-# po.m4 serial 13 (gettext-0.15)
-dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
+# po.m4 serial 15 (gettext-0.17)
+dnl Copyright (C) 1995-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.
@@ -27,6 +27,10 @@
   AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
   AC_REQUIRE([AM_NLS])dnl
 
+  dnl Release version of the gettext macros. This is used to ensure that
+  dnl the gettext macros and po/Makefile.in.in are in sync.
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
+
   dnl Perform the following tests also if --disable-nls has been given,
   dnl because they are needed for "make dist" to work.
 
@@ -84,6 +88,10 @@
   test -n "$localedir" || localedir='${datadir}/locale'
   AC_SUBST([localedir])
 
+  dnl Support for AM_XGETTEXT_OPTION.
+  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
+  AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
+
   AC_CONFIG_COMMANDS([po-directories], [[
     for ac_file in $CONFIG_FILES; do
       # Support "outfile[:infile[:infile...]]"
@@ -426,3 +434,16 @@
   fi
   mv "$ac_file.tmp" "$ac_file"
 ])
+
+dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
+AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
+[
+  XGETTEXT_EXTRA_OPTIONS=
+])
+
+dnl Registers an option to be passed to xgettext in the po subdirectory.
+AC_DEFUN([AM_XGETTEXT_OPTION],
+[
+  AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
+  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
+])
Index: gnulib/m4/printf-posix.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/printf-posix.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/m4/printf-posix.m4   25 Jun 2007 21:16:33 -0000      1.2
+++ gnulib/m4/printf-posix.m4   26 Nov 2007 19:12:42 -0000      1.3
@@ -1,4 +1,4 @@
-# printf-posix.m4 serial 3 (gettext-0.16.2)
+# printf-posix.m4 serial 3 (gettext-0.17)
 dnl Copyright (C) 2003, 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,
Index: gnulib/m4/stdint.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/stdint.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnulib/m4/stdint.m4 28 Aug 2007 17:46:34 -0000      1.6
+++ gnulib/m4/stdint.m4 26 Nov 2007 19:12:42 -0000      1.7
@@ -1,4 +1,4 @@
-# stdint.m4 serial 28
+# stdint.m4 serial 29
 dnl Copyright (C) 2001-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,
@@ -370,7 +370,7 @@
 
 dnl gl_STDINT_TYPE_PROPERTIES
 dnl Compute HAVE_SIGNED_t, BITSIZEOF_t and t_SUFFIX, for all the types t
-dnl of interest to stdint_.h.
+dnl of interest to stdint.in.h.
 AC_DEFUN([gl_STDINT_TYPE_PROPERTIES],
 [
   gl_STDINT_BITSIZEOF([ptrdiff_t sig_atomic_t size_t wchar_t wint_t],
Index: gnulib/m4/stdlib_h.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/stdlib_h.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnulib/m4/stdlib_h.m4       8 Oct 2007 18:22:27 -0000       1.3
+++ gnulib/m4/stdlib_h.m4       26 Nov 2007 19:12:43 -0000      1.4
@@ -1,4 +1,4 @@
-# stdlib_h.m4 serial 3
+# stdlib_h.m4 serial 4
 dnl Copyright (C) 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,
@@ -25,6 +25,7 @@
   GNULIB_GETSUBOPT=0;     AC_SUBST([GNULIB_GETSUBOPT])
   GNULIB_MKDTEMP=0;       AC_SUBST([GNULIB_MKDTEMP])
   GNULIB_MKSTEMP=0;       AC_SUBST([GNULIB_MKSTEMP])
+  GNULIB_PUTENV=0;        AC_SUBST([GNULIB_PUTENV])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_CALLOC_POSIX=1;    AC_SUBST([HAVE_CALLOC_POSIX])
   HAVE_GETSUBOPT=1;       AC_SUBST([HAVE_GETSUBOPT])
@@ -32,4 +33,5 @@
   HAVE_MKDTEMP=1;         AC_SUBST([HAVE_MKDTEMP])
   HAVE_REALLOC_POSIX=1;   AC_SUBST([HAVE_REALLOC_POSIX])
   REPLACE_MKSTEMP=0;      AC_SUBST([REPLACE_MKSTEMP])
+  REPLACE_PUTENV=0;       AC_SUBST([REPLACE_PUTENV])
 ])
Index: gnulib/m4/strerror.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/strerror.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnulib/m4/strerror.m4       25 Jun 2007 21:16:33 -0000      1.2
+++ gnulib/m4/strerror.m4       26 Nov 2007 19:12:43 -0000      1.3
@@ -1,4 +1,4 @@
-# strerror.m4 serial 3
+# strerror.m4 serial 6
 dnl Copyright (C) 2002, 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,
@@ -6,21 +6,41 @@
 
 AC_DEFUN([gl_FUNC_STRERROR],
 [
-  AC_CHECK_FUNCS_ONCE([strerror])
-  if test $ac_cv_func_strerror = no; then
+  AC_REQUIRE([gl_FUNC_STRERROR_SEPARATE])
+  if test $gl_cv_func_working_strerror = no; then
     AC_LIBOBJ([strerror])
-    gl_PREREQ_STRERROR
+    AC_DEFINE_UNQUOTED([REPLACE_STRERROR], [$REPLACE_STRERROR],
+      [Define this to 1 if strerror is broken.])
   fi
 ])
 
 # Like gl_FUNC_STRERROR, except prepare for separate compilation (no 
AC_LIBOBJ).
 AC_DEFUN([gl_FUNC_STRERROR_SEPARATE],
 [
-  AC_CHECK_FUNCS_ONCE([strerror])
-  gl_PREREQ_STRERROR
+  AC_CACHE_CHECK([for working strerror function],
+   [gl_cv_func_working_strerror],
+   [AC_RUN_IFELSE(
+      [AC_LANG_PROGRAM(
+        [#include <string.h>
+        ],
+        [return !*strerror (-2);])],
+      [gl_cv_func_working_strerror=yes],
+      [gl_cv_func_working_strerror=no],
+      [dnl Assume crossbuild works if it compiles.
+       AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+           [#include <string.h>
+           ],
+           [return !*strerror (-2);])],
+        [gl_cv_func_working_strerror=yes],
+        [gl_cv_func_working_strerror=no])])])
+  if test $gl_cv_func_working_strerror = no ; then
+    REPLACE_STRERROR=1
+    gl_PREREQ_STRERROR
+  fi
 ])
 
 # Prerequisites of lib/strerror.c.
 AC_DEFUN([gl_PREREQ_STRERROR], [
-  :
+  AC_CHECK_DECLS([strerror])
 ])
Index: gnulib/m4/string_h.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/string_h.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnulib/m4/string_h.m4       25 Jun 2007 21:16:33 -0000      1.4
+++ gnulib/m4/string_h.m4       26 Nov 2007 19:12:43 -0000      1.5
@@ -57,6 +57,7 @@
   GNULIB_MBSSPN=0;      AC_SUBST([GNULIB_MBSSPN])
   GNULIB_MBSSEP=0;      AC_SUBST([GNULIB_MBSSEP])
   GNULIB_MBSTOK_R=0;    AC_SUBST([GNULIB_MBSTOK_R])
+  GNULIB_STRERROR=0;    AC_SUBST([GNULIB_STRERROR])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_DECL_MEMMEM=1;          AC_SUBST([HAVE_DECL_MEMMEM])
   HAVE_MEMPCPY=1;              AC_SUBST([HAVE_MEMPCPY])
@@ -74,4 +75,6 @@
   HAVE_STRSEP=1;               AC_SUBST([HAVE_STRSEP])
   HAVE_STRCASESTR=1;           AC_SUBST([HAVE_STRCASESTR])
   HAVE_DECL_STRTOK_R=1;                AC_SUBST([HAVE_DECL_STRTOK_R])
+  HAVE_DECL_STRERROR=1;                AC_SUBST([HAVE_DECL_STRERROR])
+  REPLACE_STRERROR=0;          AC_SUBST([REPLACE_STRERROR])
 ])
Index: gnulib/m4/uintmax_t.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/uintmax_t.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnulib/m4/uintmax_t.m4      18 Jun 2006 23:39:43 -0000      1.1
+++ gnulib/m4/uintmax_t.m4      26 Nov 2007 19:12:43 -0000      1.2
@@ -1,5 +1,5 @@
-# uintmax_t.m4 serial 9
-dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
+# uintmax_t.m4 serial 10
+dnl Copyright (C) 1997-2004, 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.
@@ -16,8 +16,8 @@
   AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
   AC_REQUIRE([gl_AC_HEADER_STDINT_H])
   if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; 
then
-    AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
-    test $ac_cv_type_unsigned_long_long = yes \
+    AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
+    test $ac_cv_type_unsigned_long_long_int = yes \
       && ac_type='unsigned long long' \
       || ac_type='unsigned long'
     AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
cvs diff: Tag HEAD refers to a dead (removed) revision in file 
`gnulib/m4/ulonglong.m4'.
cvs diff: No comparison available.  Pass `-N' to `cvs diff'?
Index: gnulib/m4/wcwidth.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/wcwidth.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnulib/m4/wcwidth.m4        8 Oct 2007 18:22:27 -0000       1.8
+++ gnulib/m4/wcwidth.m4        26 Nov 2007 19:12:43 -0000      1.9
@@ -1,4 +1,4 @@
-# wcwidth.m4 serial 12
+# wcwidth.m4 serial 13
 dnl Copyright (C) 2006, 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,
@@ -37,6 +37,7 @@
     REPLACE_WCWIDTH=1
   else
     dnl On MacOS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1.
+    dnl On OSF/1 5.1, wcwidth(0x200B) (ZERO WIDTH SPACE) returns 1.
     dnl This leads to bugs in 'ls' (coreutils).
     AC_CACHE_CHECK([whether wcwidth works reasonably in UTF-8 locales],
       [gl_cv_func_wcwidth_works],
@@ -63,7 +64,7 @@
 int main ()
 {
   if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL)
-    if (wcwidth (0x0301) > 0)
+    if (wcwidth (0x0301) > 0 || wcwidth (0x200B) > 0)
       return 1;
   return 0;
 }], [gl_cv_func_wcwidth_works=yes], [gl_cv_func_wcwidth_works=no],
Index: gnulib/m4/wint_t.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/wint_t.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnulib/m4/wint_t.m4 25 Jun 2007 21:16:34 -0000      1.3
+++ gnulib/m4/wint_t.m4 26 Nov 2007 19:12:43 -0000      1.4
@@ -1,4 +1,4 @@
-# wint_t.m4 serial 2 (gettext-0.16.2)
+# wint_t.m4 serial 2 (gettext-0.17)
 dnl Copyright (C) 2003, 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,
P gnulib/lib/.cvsignore
P gnulib/lib/Makefile.am
cvs update: `gnulib/lib/alloca_.h' is no longer in the repository
P gnulib/lib/config.charset
P gnulib/lib/error.c
P gnulib/lib/error.h
P gnulib/lib/exitfail.c
P gnulib/lib/exitfail.h
P gnulib/lib/getopt.c
P gnulib/lib/getopt1.c
cvs update: `gnulib/lib/getopt_.h' is no longer in the repository
P gnulib/lib/getopt_int.h
P gnulib/lib/gettext.h
P gnulib/lib/gettimeofday.c
P gnulib/lib/localcharset.c
P gnulib/lib/localcharset.h
P gnulib/lib/malloca.c
P gnulib/lib/malloca.h
P gnulib/lib/mbswidth.c
P gnulib/lib/mbswidth.h
P gnulib/lib/memcpy.c
P gnulib/lib/mkstemp.c
P gnulib/lib/ref-add.sin
P gnulib/lib/ref-del.sin
P gnulib/lib/setenv.c
P gnulib/lib/setenv.h
cvs update: `gnulib/lib/stdint_.h' is no longer in the repository
cvs update: `gnulib/lib/stdlib_.h' is no longer in the repository
P gnulib/lib/strcasecmp.c
P gnulib/lib/strdup.c
P gnulib/lib/streq.h
P gnulib/lib/strerror.c
cvs update: `gnulib/lib/string_.h' is no longer in the repository
P gnulib/lib/strncasecmp.c
cvs update: `gnulib/lib/sys_stat_.h' is no longer in the repository
cvs update: `gnulib/lib/sys_time_.h' is no longer in the repository
P gnulib/lib/tempname.c
P gnulib/lib/tempname.h
cvs update: `gnulib/lib/unistd_.h' is no longer in the repository
P gnulib/lib/unitypes.h
P gnulib/lib/uniwidth.h
P gnulib/lib/unsetenv.c
cvs update: `gnulib/lib/wchar_.h' is no longer in the repository
cvs update: `gnulib/lib/wctype_.h' is no longer in the repository
P gnulib/lib/wcwidth.c
P gnulib/lib/xalloc-die.c
P gnulib/lib/xalloc.h
P gnulib/lib/xmalloc.c
P gnulib/lib/xsetenv.c
P gnulib/lib/xsetenv.h
P gnulib/lib/sys/stat.h
P gnulib/lib/sys/time.h
P gnulib/lib/uniwidth/cjk.h
P gnulib/lib/uniwidth/width.c
P gnulib/m4/gettext.m4
P gnulib/m4/gnulib-common.m4
P gnulib/m4/gnulib-comp.m4
P gnulib/m4/iconv.m4
P gnulib/m4/intdiv0.m4
P gnulib/m4/intl.m4
P gnulib/m4/intlmacosx.m4
P gnulib/m4/lib-link.m4
P gnulib/m4/lock.m4
P gnulib/m4/longlong.m4
P gnulib/m4/po.m4
P gnulib/m4/printf-posix.m4
P gnulib/m4/stdint.m4
P gnulib/m4/stdlib_h.m4
P gnulib/m4/strerror.m4
P gnulib/m4/string_h.m4
P gnulib/m4/uintmax_t.m4
cvs update: `gnulib/m4/ulonglong.m4' is no longer in the repository
P gnulib/m4/wcwidth.m4
P gnulib/m4/wint_t.m4




reply via email to

[Prev in Thread] Current Thread [Next in Thread]