Update gnulib

* autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC): Explicitly pull 'gettext',
as the module is now marked as obsolete.
* gnulib-local/Makefile.am (EXTRA_DIST): Remove m4/hard-locale.m4.diff.
* gnulib-local/m4/hard-locale.m4.diff: Remove, as it is no longer
needed.
* gettext-tools/gnulib-lib/.gitignore: Ignore files brought by gnulib-tool.
* gettext-tools/gnulib-tests/.gitignore: Likewise.
* gettext-tools/libgettextpo/.gitignore: Likewise.

diff --git a/autogen.sh b/autogen.sh
index 7a0a19a41ca103239f86df3ddae35897f1b49794..51bdf053260adb28521463907c7baac0a83b9202 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -208,6 +208,7 @@ if ! $skip_gnulib; then
       gcd
       getline
       getopt-gnu
+      gettext
       gettext-h
       hash
       html-styled-ostream

diff --git a/gettext-tools/gnulib-lib/.gitignore b/gettext-tools/gnulib-lib/.gitignore
index 9ef54ac169d2e01d2781479556f9e1b3a99f0ab0..d6ae633eda77d00bb11881d4a73336a1e35ab136 100644 (file)
--- a/gettext-tools/gnulib-lib/.gitignore
+++ b/gettext-tools/gnulib-lib/.gitignore
@@ -71,6 +71,7 @@
 /diffseq.h
 /dirent-private.h
 /dirent.in.h
+/dirfd.c
 /dosname.h
 /dup-safer-flag.c
 /dup-safer.c
@@ -146,6 +147,8 @@
 /gl_xlist.h
 /glib.in.h
 /glibconfig.in.h
+/hard-locale.c
+/hard-locale.h
 /hash.c
 /hash.h
 /html-ostream.c

diff --git a/gettext-tools/gnulib-tests/.gitignore b/gettext-tools/gnulib-tests/.gitignore
index aa7ad59f8b123702b06eb49198a9cfde62eef15a..69eddcd3626e6b7d8d1ebe093caf951afadfbe53 100644 (file)
--- a/gettext-tools/gnulib-tests/.gitignore
+++ b/gettext-tools/gnulib-tests/.gitignore
@@ -157,6 +157,7 @@
 /test-mbrtowc2.sh
 /test-mbrtowc3.sh
 /test-mbrtowc4.sh
+/test-mbrtowc5.sh
 /test-mbsinit.c
 /test-mbsinit.sh
 /test-mbsrtowcs.c

diff --git a/gettext-tools/libgettextpo/.gitignore b/gettext-tools/libgettextpo/.gitignore
index 41424a8b4bf967eb66a02b25b783cb51f1dc08b2..10e2973f8cf611bbaf5b15922e92c9f173598d47 100644 (file)
--- a/gettext-tools/libgettextpo/.gitignore
+++ b/gettext-tools/libgettextpo/.gitignore
@@ -74,6 +74,8 @@
 /gl_list.h
 /gl_xlist.c
 /gl_xlist.h
+/hard-locale.c
+/hard-locale.h
 /hash.c
 /hash.h
 /iconv.c

diff --git a/gnulib b/gnulib
index 271dfe37985ff3a6e9cf9d08ab67e8ea3e239162..6f9206d4db914cf904cd4711e3044d99c36dae8b 160000 (submodule)
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 271dfe37985ff3a6e9cf9d08ab67e8ea3e239162
+Subproject commit 6f9206d4db914cf904cd4711e3044d99c36dae8b

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index 1ff47e2840fc8f3dec4be603dc22097703ad1edf..da460616a470d6d40ad9e5f80930919013ba4916 100644 (file)
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -248,7 +248,6 @@ m4/alloca.m4 \
 m4/backupfile.m4 \
 m4/curses.m4 \
 m4/gcj.m4 \
-m4/hard-locale.m4.diff \
 m4/libcroco.m4 \
 m4/libglib.m4 \
 m4/libxml.m4 \

diff --git a/gnulib-local/m4/hard-locale.m4.diff b/gnulib-local/m4/hard-locale.m4.diff
deleted file mode 100644 (file)
index 1071d48..0000000
--- a/gnulib-local/m4/hard-locale.m4.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-*** gnulib/m4/hard-locale.m4   2005-03-21 23:06:27.000000000 +0100
---- gettext-tools/m4/hard-locale.m4    2005-03-09 00:49:02.000000000 +0100
-***************
-*** 5,11 ****
-  dnl with or without modifications, as long as this notice is preserved.
-  
-  dnl No prerequisites of lib/hard-locale.c.
-! AC_DEFUN([gl_HARD_LOCALE],
-! [
-!   AC_LIBOBJ([hard-locale])
-! ])
---- 5,8 ----
-  dnl with or without modifications, as long as this notice is preserved.
-  
-  dnl No prerequisites of lib/hard-locale.c.
-! AC_DEFUN([gl_HARD_LOCALE], [:])