From: Bruno Haible <bruno@clisp.org>
Date: Mon, 11 Jan 2010 20:48:22 +0000 (+0100)
Subject: Use more modern gnulib module names.
X-Git-Tag: v0.18~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98ec9caf67c053da44fba2d5ee5616e60a478ae2;p=thirdparty%2Fgettext.git

Use more modern gnulib module names.
---

diff --git a/ChangeLog b/ChangeLog
index 968e5ab19..dd1b4c02f 100644
--- 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 0581cd210..94cfdfee6 100755
--- 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 d5e21eb46..ee17f9cc1 100644
--- 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 15f9dad3b..9521336b5 100644
--- 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: