Straighten some module dependencies.

diff --git a/ChangeLog b/ChangeLog
index e745bca..bd7d450 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2009-03-14  Bruno Haible  <bruno@clisp.org>
+
+       * modules/unilbrk/u8-possible-linebreaks (Depends-on): Replace
+       utf8-ucs4-unsafe with unistr/u8-mbtouc-unsafe.
+       * modules/unilbrk/u8-width-linebreaks (Depends-on): Likewise.
+       * modules/unilbrk/u16-possible-linebreaks (Depends-on): Replace
+       utf16-ucs4-unsafe with unistr/u16-mbtouc-unsafe.
+       * modules/unilbrk/u16-width-linebreaks (Depends-on): Likewise.
+       * modules/unistr/u8-chr (Depends-on): Replace ucs4-utf8 with
+       unistr/u8-uctomb.
+       * modules/unistr/u8-strchr (Depends-on): Likewise.
+       * modules/unistr/u8-strrchr (Depends-on): Likewise.
+       * modules/unistr/u16-chr (Depends-on): Replace ucs4-utf16 with
+       unistr/u16-uctomb.
+       * modules/unistr/u16-strchr (Depends-on): Likewise.
+       * modules/unistr/u16-strrchr (Depends-on): Likewise.
+
 2009-03-12  Bruno Haible  <bruno@clisp.org>
 
        Work around select() bug on Interix 3.5.

diff --git a/modules/unilbrk/u16-possible-linebreaks b/modules/unilbrk/u16-possible-linebreaks
index 2b9a867..5f79aa5 100644 (file)
--- a/modules/unilbrk/u16-possible-linebreaks
+++ b/modules/unilbrk/u16-possible-linebreaks
@@ -8,7 +8,7 @@ lib/uniwidth/cjk.h
 Depends-on:
 unilbrk/base
 unilbrk/tables
-utf16-ucs4-unsafe
+unistr/u16-mbtouc-unsafe
 streq
 
 configure.ac:

diff --git a/modules/unilbrk/u16-width-linebreaks b/modules/unilbrk/u16-width-linebreaks
index 7989c95..6f6db88 100644 (file)
--- a/modules/unilbrk/u16-width-linebreaks
+++ b/modules/unilbrk/u16-width-linebreaks
@@ -8,7 +8,7 @@ Depends-on:
 unilbrk/base
 unilbrk/u16-possible-linebreaks
 uniwidth/width
-utf16-ucs4-unsafe
+unistr/u16-mbtouc-unsafe
 
 configure.ac:
 

diff --git a/modules/unilbrk/u8-possible-linebreaks b/modules/unilbrk/u8-possible-linebreaks
index f963afd..6bd41ae 100644 (file)
--- a/modules/unilbrk/u8-possible-linebreaks
+++ b/modules/unilbrk/u8-possible-linebreaks
@@ -8,7 +8,7 @@ lib/uniwidth/cjk.h
 Depends-on:
 unilbrk/base
 unilbrk/tables
-utf8-ucs4-unsafe
+unistr/u8-mbtouc-unsafe
 streq
 
 configure.ac:

diff --git a/modules/unilbrk/u8-width-linebreaks b/modules/unilbrk/u8-width-linebreaks
index f89449c..83a2e25 100644 (file)
--- a/modules/unilbrk/u8-width-linebreaks
+++ b/modules/unilbrk/u8-width-linebreaks
@@ -8,7 +8,7 @@ Depends-on:
 unilbrk/base
 unilbrk/u8-possible-linebreaks
 uniwidth/width
-utf8-ucs4-unsafe
+unistr/u8-mbtouc-unsafe
 
 configure.ac:
 

diff --git a/modules/unistr/u16-chr b/modules/unistr/u16-chr
index d4e9fe3..7ef4abe 100644 (file)
--- a/modules/unistr/u16-chr
+++ b/modules/unistr/u16-chr
@@ -6,7 +6,7 @@ lib/unistr/u16-chr.c
 
 Depends-on:
 unistr/base
-ucs4-utf16
+unistr/u16-uctomb
 
 configure.ac:
 

diff --git a/modules/unistr/u16-strchr b/modules/unistr/u16-strchr
index c4114b4..555695f 100644 (file)
--- a/modules/unistr/u16-strchr
+++ b/modules/unistr/u16-strchr
@@ -6,7 +6,7 @@ lib/unistr/u16-strchr.c
 
 Depends-on:
 unistr/base
-ucs4-utf16
+unistr/u16-uctomb
 
 configure.ac:
 

diff --git a/modules/unistr/u16-strrchr b/modules/unistr/u16-strrchr
index 83deea9..4ceddbc 100644 (file)
--- a/modules/unistr/u16-strrchr
+++ b/modules/unistr/u16-strrchr
@@ -6,7 +6,7 @@ lib/unistr/u16-strrchr.c
 
 Depends-on:
 unistr/base
-ucs4-utf16
+unistr/u16-uctomb
 
 configure.ac:
 

diff --git a/modules/unistr/u8-chr b/modules/unistr/u8-chr
index 09f2799..b90dab0 100644 (file)
--- a/modules/unistr/u8-chr
+++ b/modules/unistr/u8-chr
@@ -6,7 +6,7 @@ lib/unistr/u8-chr.c
 
 Depends-on:
 unistr/base
-ucs4-utf8
+unistr/u8-uctomb
 
 configure.ac:
 

diff --git a/modules/unistr/u8-strchr b/modules/unistr/u8-strchr
index a85cc9f..a025b90 100644 (file)
--- a/modules/unistr/u8-strchr
+++ b/modules/unistr/u8-strchr
@@ -6,7 +6,7 @@ lib/unistr/u8-strchr.c
 
 Depends-on:
 unistr/base
-ucs4-utf8
+unistr/u8-uctomb
 
 configure.ac:
 

diff --git a/modules/unistr/u8-strrchr b/modules/unistr/u8-strrchr
index 85e0f67..656b904 100644 (file)
--- a/modules/unistr/u8-strrchr
+++ b/modules/unistr/u8-strrchr
@@ -6,7 +6,7 @@ lib/unistr/u8-strrchr.c
 
 Depends-on:
 unistr/base
-ucs4-utf8
+unistr/u8-uctomb
 
 configure.ac: