From: Bruno Haible <bruno@clisp.org>
Date: Sat, 14 Mar 2009 12:18:42 +0000 (+0100)
Subject: Straighten some module dependencies.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53b55e21270aa30cd703e9b0fe82aa7584ea2ffb;p=pspp

Straighten some module dependencies.
---

diff --git a/ChangeLog b/ChangeLog
index e745bca918..bd7d4501c5 100644
--- 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 2b9a86762b..5f79aa5667 100644
--- 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 7989c95000..6f6db8804b 100644
--- 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 f963afdc32..6bd41ae80c 100644
--- 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 f89449cd0a..83a2e25de4 100644
--- 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 d4e9fe3685..7ef4abeff2 100644
--- 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 c4114b467d..555695faa1 100644
--- 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 83deea97d1..4ceddbc3d3 100644
--- 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 09f2799ea6..b90dab04c9 100644
--- 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 a85cc9f81b..a025b90541 100644
--- 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 85e0f67fa8..656b904779 100644
--- 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: