Finalized intl-update patches (trois)

Doing this on behalf of Arsen as obvious. Hopefully the last fixup.

* gdb: Regenerate.
* gnulib: Regenerate.

diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
index 997142396688365954442f7ec81f000fc9284fc3..05b492625dfcac6a15474e756e123a9147698f2b 100644 (file)
--- a/gdb/aclocal.m4
+++ b/gdb/aclocal.m4
@@ -199,6 +199,11 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
+m4_include([../libtool.m4])
+m4_include([../ltoptions.m4])
+m4_include([../ltsugar.m4])
+m4_include([../ltversion.m4])
+m4_include([../lt~obsolete.m4])
 m4_include([../config/acx.m4])
 m4_include([../config/ax_pthread.m4])
 m4_include([../config/bfd64.m4])
@@ -217,9 +222,4 @@ m4_include([../config/plugins.m4])
 m4_include([../config/po.m4])
 m4_include([../config/progtest.m4])
 m4_include([../config/tcl.m4])
-m4_include([../libtool.m4])
-m4_include([../ltoptions.m4])
-m4_include([../ltsugar.m4])
-m4_include([../ltversion.m4])
-m4_include([../lt~obsolete.m4])
 m4_include([acinclude.m4])

diff --git a/gnulib/Makefile.in b/gnulib/Makefile.in
index 8d5bf7f167298e9e89cbd39f6c3b69a26a0f4d34..02886fe877a6e545760b2cb184d45e1647a16a78 100644 (file)
--- a/gnulib/Makefile.in
+++ b/gnulib/Makefile.in
@@ -107,12 +107,7 @@ host_triplet = @host@
 target_triplet = @target@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
-       $(top_srcdir)/../config/largefile.m4 \
-       $(top_srcdir)/../config/lead-dot.m4 \
-       $(top_srcdir)/../config/override.m4 \
-       $(top_srcdir)/../config/plugins.m4 \
-       $(top_srcdir)/import/m4/00gnulib.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/import/m4/00gnulib.m4 \
        $(top_srcdir)/import/m4/__inline.m4 \
        $(top_srcdir)/import/m4/absolute-header.m4 \
        $(top_srcdir)/import/m4/alloca.m4 \
@@ -125,7 +120,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
        $(top_srcdir)/import/m4/clock_time.m4 \
        $(top_srcdir)/import/m4/close.m4 \
        $(top_srcdir)/import/m4/closedir.m4 \
-       $(top_srcdir)/import/m4/codeset.m4 \
        $(top_srcdir)/import/m4/ctype_h.m4 \
        $(top_srcdir)/import/m4/d-ino.m4 \
        $(top_srcdir)/import/m4/d-type.m4 \
@@ -282,7 +276,13 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
        $(top_srcdir)/import/m4/wmemchr.m4 \
        $(top_srcdir)/import/m4/wmempcpy.m4 \
        $(top_srcdir)/import/m4/year2038.m4 \
-       $(top_srcdir)/import/m4/zzgnulib.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/import/m4/zzgnulib.m4 \
+       $(top_srcdir)/../config/codeset.m4 \
+       $(top_srcdir)/../config/depstand.m4 \
+       $(top_srcdir)/../config/largefile.m4 \
+       $(top_srcdir)/../config/lead-dot.m4 \
+       $(top_srcdir)/../config/override.m4 \
+       $(top_srcdir)/../config/plugins.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \

diff --git a/gnulib/aclocal.m4 b/gnulib/aclocal.m4
index 707108d7abfc28d72fd73f4d15e3fbbd1b6df23a..c7f866eb8bffd28ec5ac8fd77af495ce439d0271 100644 (file)
--- a/gnulib/aclocal.m4
+++ b/gnulib/aclocal.m4
@@ -1169,11 +1169,6 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([../config/depstand.m4])
-m4_include([../config/largefile.m4])
-m4_include([../config/lead-dot.m4])
-m4_include([../config/override.m4])
-m4_include([../config/plugins.m4])
 m4_include([import/m4/00gnulib.m4])
 m4_include([import/m4/__inline.m4])
 m4_include([import/m4/absolute-header.m4])
@@ -1187,7 +1182,6 @@ m4_include([import/m4/chown.m4])
 m4_include([import/m4/clock_time.m4])
 m4_include([import/m4/close.m4])
 m4_include([import/m4/closedir.m4])
-m4_include([import/m4/codeset.m4])
 m4_include([import/m4/ctype_h.m4])
 m4_include([import/m4/d-ino.m4])
 m4_include([import/m4/d-type.m4])
@@ -1346,3 +1340,9 @@ m4_include([import/m4/wmemchr.m4])
 m4_include([import/m4/wmempcpy.m4])
 m4_include([import/m4/year2038.m4])
 m4_include([import/m4/zzgnulib.m4])
+m4_include([../config/codeset.m4])
+m4_include([../config/depstand.m4])
+m4_include([../config/largefile.m4])
+m4_include([../config/lead-dot.m4])
+m4_include([../config/override.m4])
+m4_include([../config/plugins.m4])

diff --git a/gnulib/configure b/gnulib/configure
index cc7e8287d5a0a250e2b4f55c1c2fa270399793bd..cb2a11359a195eab5bed7473e680c1bd9f2379e1 100644 (file)
--- a/gnulib/configure
+++ b/gnulib/configure
@@ -8433,7 +8433,7 @@ else
 int
 main ()
 {
-char* cs = nl_langinfo(CODESET); return !cs;
+char* cs = nl_langinfo(CODESET);
   ;
   return 0;
 }

diff --git a/gnulib/import/Makefile.in b/gnulib/import/Makefile.in
index 9893d17c28b9401404f9798aee41033078100b5f..1899bebba36892aab3ba5888f662f56741f54582 100644 (file)
--- a/gnulib/import/Makefile.in
+++ b/gnulib/import/Makefile.in
@@ -259,12 +259,7 @@ target_triplet = @target@
 @GL_COND_OBJ_WMEMPCPY_TRUE@am__append_81 = wmempcpy.c
 subdir = import
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
-       $(top_srcdir)/../config/largefile.m4 \
-       $(top_srcdir)/../config/lead-dot.m4 \
-       $(top_srcdir)/../config/override.m4 \
-       $(top_srcdir)/../config/plugins.m4 \
-       $(top_srcdir)/import/m4/00gnulib.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/import/m4/00gnulib.m4 \
        $(top_srcdir)/import/m4/__inline.m4 \
        $(top_srcdir)/import/m4/absolute-header.m4 \
        $(top_srcdir)/import/m4/alloca.m4 \
@@ -277,7 +272,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
        $(top_srcdir)/import/m4/clock_time.m4 \
        $(top_srcdir)/import/m4/close.m4 \
        $(top_srcdir)/import/m4/closedir.m4 \
-       $(top_srcdir)/import/m4/codeset.m4 \
        $(top_srcdir)/import/m4/ctype_h.m4 \
        $(top_srcdir)/import/m4/d-ino.m4 \
        $(top_srcdir)/import/m4/d-type.m4 \
@@ -434,7 +428,13 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
        $(top_srcdir)/import/m4/wmemchr.m4 \
        $(top_srcdir)/import/m4/wmempcpy.m4 \
        $(top_srcdir)/import/m4/year2038.m4 \
-       $(top_srcdir)/import/m4/zzgnulib.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/import/m4/zzgnulib.m4 \
+       $(top_srcdir)/../config/codeset.m4 \
+       $(top_srcdir)/../config/depstand.m4 \
+       $(top_srcdir)/../config/largefile.m4 \
+       $(top_srcdir)/../config/lead-dot.m4 \
+       $(top_srcdir)/../config/override.m4 \
+       $(top_srcdir)/../config/plugins.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS)