Use more modern gnulib module names.

diff --git a/ChangeLog b/ChangeLog
index 968e5ab1967dd62410a3f8b9c6f3f83dc8bce0d7..dd1b4c02fc3530328f49bbd2a0d3d9c682760855 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-11  Bruno Haible  <bruno@clisp.org>
+
+       * autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC,
+       GNULIB_MODULES_LIBGETTEXTPO): Replace ucs4-utf8, utf8-ucs4, utf16-ucs4
+       with their modern equivalents.
+
 2009-12-26  Bruno Haible  <bruno@clisp.org>
 
        * windows/gettext.rc: Update.

diff --git a/autogen.sh b/autogen.sh
index 0581cd210ecbd674084bc1d8cd1fc1f1748e6a45..94cfdfee629d41c5fe85bcb5d4e664b63714d35b 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -192,14 +192,14 @@ if ! $skip_gnulib; then
       sys_stat
       sys_time
       term-styled-ostream
-      ucs4-utf8
       unilbrk/ulc-width-linebreaks
       uniname/uniname
       unistd
+      unistr/u8-mbtouc
+      unistr/u8-uctomb
+      unistr/u16-mbtouc
       uniwidth/width
       unlocked-io
-      utf8-ucs4
-      utf16-ucs4
       vasprintf
       wait-process
       write
@@ -267,12 +267,12 @@ if ! $skip_gnulib; then
       stdbool
       stdio
       strerror
-      ucs4-utf8
       unilbrk/ulc-width-linebreaks
+      unistr/u8-mbtouc
+      unistr/u8-uctomb
+      unistr/u16-mbtouc
       uniwidth/width
       unlocked-io
-      utf8-ucs4
-      utf16-ucs4
       vasprintf
       xalloc
       xconcat-filename

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index d5e21eb469818fda90135d1d8fdb41f553660885..ee17f9cc114dadb23227a3c88e85c865a814946e 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-11  Bruno Haible  <bruno@clisp.org>
+
+       * modules/html-ostream (Depends-on): Remove utf8-ucs4. Instead add
+       unistr/u8-mbtouc.
+
 2009-12-25  Bruno Haible  <bruno@clisp.org>
 
        * lib/html-ostream.oo.c: Include gl_xlist.h instead of gl_list.h.

diff --git a/gnulib-local/modules/html-ostream b/gnulib-local/modules/html-ostream
index 15f9dad3ba26724a1fa63208265cfdbfa6e41a4e..9521336b560fbd9d4b75c48755d63f535488c427 100644 (file)
--- a/gnulib-local/modules/html-ostream
+++ b/gnulib-local/modules/html-ostream
@@ -9,7 +9,7 @@ Depends-on:
 ostream
 array-list
 xlist
-utf8-ucs4
+unistr/u8-mbtouc
 xalloc
 
 configure.ac: