Straighten some module dependencies.

diff --git a/ChangeLog b/ChangeLog
index e745bca918f2933cfc1b1b20e482d2d80c8c4499..bd7d4501c592fd74c355d506ae6989b50a05cb7d 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 2b9a86762bc028e0d47947d15a8d4684e973fcee..5f79aa5667866f06640c234cd9496d576f82048b 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 7989c9500086da8eac82613ead99a94ed44a272e..6f6db8804b34e553d2221045d202d53b09023083 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 f963afdc32f76992ffe32a308b8078e53872f1c3..6bd41ae80c0c7a7143678a6a5829079bcd2d1a5d 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 f89449cd0a28924966371f30885530b00525ddab..83a2e25de4f7deeaeb71a1cd18233e55956eae58 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 d4e9fe3685c4e3d5e3e8bbdbe0bf20f1b3f84669..7ef4abeff2f545993a561f8b24d37c13f46c52d9 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 c4114b467d65a0e4f076e06677cf77ee037d56eb..555695faa1ff29514437b94190e9327799cc5d2f 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 83deea97d19a7f7ad80825da3126afc090cb7426..4ceddbc3d371a62150b7ead261807b4c12b59947 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 09f2799ea6558e52d37a72334cbbf71461f609b3..b90dab04c9e9ec3e00c5c0d75aefc86d72183fe8 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 a85cc9f81b5b4fdf3f7f979971542836e70bb5bc..a025b90541bc192a3f08cd6a7f7248452f8482b9 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 85e0f67fa824907ed2881fc65fa363a317d5e851..656b9047798585757472b2c2d74e89ede4a80d8a 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: