texinfo update (Mon Jul 23 10:53:01 EDT 2007)

[Karl Berry]

Index: gnulib/lib/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnulib/lib/Makefile.am      15 Jul 2007 22:30:26 -0000      1.16
+++ gnulib/lib/Makefile.am      23 Jul 2007 14:23:07 -0000      1.17
@@ -165,6 +165,8 @@
 # "gettextize --intl".
 AM_CPPFLAGS += -I$(top_builddir)/intl
 
+EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath
+
 ## end   gnulib module gettext
 
 ## begin gnulib module gettext-h
@@ -182,10 +184,19 @@
 
 ## end   gnulib module gettimeofday
 
+## begin gnulib module havelib
+
+
+EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath
+
+## end   gnulib module havelib
+
 ## begin gnulib module link-warning
 
 LINK_WARNING_H=$(top_srcdir)/build-aux/link-warning.h
 
+EXTRA_DIST += $(top_srcdir)/build-aux/link-warning.h
+
 ## end   gnulib module link-warning
 
 ## begin gnulib module localcharset
Index: gnulib/lib/error.c
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/lib/error.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnulib/lib/error.c  15 Oct 2006 21:09:15 -0000      1.4
+++ gnulib/lib/error.c  23 Jul 2007 14:23:07 -0000      1.5
@@ -1,5 +1,5 @@
 /* Error handler for noninteractive utilities
-   Copyright (C) 1990-1998, 2000-2005, 2006 Free Software Foundation, Inc.
+   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
@@ -31,6 +31,7 @@
 
 #if !_LIBC && ENABLE_NLS
 # include "gettext.h"
+# define _(msgid) gettext (msgid)
 #endif
 
 #ifdef _LIBC
Index: gnulib/m4/gnulib-cache.m4
===================================================================
RCS file: /sources/texinfo/texinfo/gnulib/m4/gnulib-cache.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnulib/m4/gnulib-cache.m4   7 Feb 2007 17:00:38 -0000       1.6
+++ gnulib/m4/gnulib-cache.m4   23 Jul 2007 14:23:07 -0000      1.7
@@ -23,8 +23,10 @@
 gl_AVOID([])
 gl_SOURCE_BASE([gnulib/lib])
 gl_M4_BASE([gnulib/m4])
+gl_PO_BASE([])
 gl_DOC_BASE([doc])
 gl_TESTS_BASE([tests])
 gl_LIB([libgnu])
 gl_MAKEFILE_NAME([])
 gl_MACRO_PREFIX([gl])
+gl_PO_DOMAIN([])
P gnulib/lib/Makefile.am
P gnulib/lib/error.c
U gnulib/lib/uniwidth/cjk.h
U gnulib/lib/uniwidth/width.c
P gnulib/m4/gnulib-cache.m4