From c360f03055b36adfa908222e8aeb411ca594c8f6 Mon Sep 17 00:00:00 2001
From: "alecf%netscape.com"
 <alecf%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 24 Sep 2002 22:16:53 +0000
Subject: [PATCH] oops, get embedding side of bug 169498, sr=bryner, r=ftang

git-svn-id: svn://10.0.0.236/trunk@130381 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/embedding/config/basebrowser-mac-cfm      |  6 +-----
 mozilla/embedding/config/basebrowser-mac-cfmDebug |  8 ++------
 mozilla/embedding/config/basebrowser-mac-macho    |  7 +------
 mozilla/embedding/config/basebrowser-unix         |  8 +-------
 mozilla/embedding/config/basebrowser-win          | 10 ++--------
 5 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/mozilla/embedding/config/basebrowser-mac-cfm b/mozilla/embedding/config/basebrowser-mac-cfm
index e079a833ea7..65353c13c44 100644
--- a/mozilla/embedding/config/basebrowser-mac-cfm
+++ b/mozilla/embedding/config/basebrowser-mac-cfm
@@ -193,14 +193,11 @@ Components:shistory.xpt
 
 ; required l10n libraries
 
-Components:unicharutil.shlb
+Components:i18n.shlb
 Components:unicharutil.xpt
 Components:uconv.shlb
 Components:uconv.xpt
-Components:lwbrk.shlb
-Components:nslocale.shlb
 Components:nslocale.xpt
-Components:chardet.shlb
 Components:chardet.xpt
 Components:Universalchardet.shlb
 
@@ -212,7 +209,6 @@ res:charsetalias.properties
 res:maccharset.properties
 
 ; required i18n libs
-Components:strres.shlb
 Components:nsIStringBundle.xpt
 
 ; required prefs files
diff --git a/mozilla/embedding/config/basebrowser-mac-cfmDebug b/mozilla/embedding/config/basebrowser-mac-cfmDebug
index 8955334b0a9..fb73fddbfdb 100644
--- a/mozilla/embedding/config/basebrowser-mac-cfmDebug
+++ b/mozilla/embedding/config/basebrowser-mac-cfmDebug
@@ -191,16 +191,13 @@ Components:rdf.xpt
 Components:shistoryDebug.shlb
 Components:shistory.xpt
 
-; required l10n libraries
+; required i18n libraries
 
-Components:unicharutilDebug.shlb
+Components:i18nDebug.shlb
 Components:unicharutil.xpt
 Components:uconvDebug.shlb
 Components:uconv.xpt
-Components:lwbrkDebug.shlb
-Components:nslocaleDebug.shlb
 Components:nslocale.xpt
-Components:chardetDebug.shlb
 Components:chardet.xpt
 Components:UniversalchardetDebug.shlb
 
@@ -212,7 +209,6 @@ res:charsetalias.properties
 res:maccharset.properties
 
 ; required i18n libs
-Components:strresDebug.shlb
 Components:nsIStringBundle.xpt
 
 ; required prefs files
diff --git a/mozilla/embedding/config/basebrowser-mac-macho b/mozilla/embedding/config/basebrowser-mac-macho
index 5b614fc0c87..3417c25da66 100644
--- a/mozilla/embedding/config/basebrowser-mac-macho
+++ b/mozilla/embedding/config/basebrowser-mac-macho
@@ -181,13 +181,10 @@ components/shistory.xpt
 
 ; required l10n libraries
 
-components/libunicharutil.dylib
 components/libuconv.dylib
+components/libi18n.dylib
 components/uconv.xpt
-components/liblwbrk.dylib
-components/libnslocale.dylib
 components/unicharutil.xpt
-components/libchardet.dylib
 
 res/language.properties
 res/langGroups.properties
@@ -196,8 +193,6 @@ res/charsetalias.properties
 res/maccharset.properties
 ; res/strres.properties 
 
-; required i18n libs
-components/libstrres.dylib
 
 ; required prefs files
 defaults/pref/all.js
diff --git a/mozilla/embedding/config/basebrowser-unix b/mozilla/embedding/config/basebrowser-unix
index c7e5bb97543..965a1338cfb 100644
--- a/mozilla/embedding/config/basebrowser-unix
+++ b/mozilla/embedding/config/basebrowser-unix
@@ -125,16 +125,10 @@ components/rdf.xpt
 
 components/intl.xpt
 components/locale.xpt
-components/libunicharutil.so
 components/libuconv.so
+components/libi18n.so
 components/uconv.xpt
-components/liblwbrk.so
-components/libnslocale.so
 components/unicharutil.xpt
-components/libchardet.so
-
-; required i18n libs
-components/libstrres.so
 
 ; 
 ; DOM:
diff --git a/mozilla/embedding/config/basebrowser-win b/mozilla/embedding/config/basebrowser-win
index d5472de0bbe..f88717a4768 100644
--- a/mozilla/embedding/config/basebrowser-win
+++ b/mozilla/embedding/config/basebrowser-win
@@ -130,19 +130,13 @@ components\shistory.xpt
 components\rdf.dll
 components\rdf.xpt
 
-; required l10n libraries
+; required i18n libraries
+components\i18n.dll
 components\intl.xpt
 components\locale.xpt
-components\ucharuti.dll
 components\uconv.dll
 components\uconv.xpt
-components\lwbrk.dll
-components\nslocale.dll
 components\unicharutil.xpt
-components\chardet.dll
-
-; required i18n libs
-components\strres.dll
 
 ; dom
 components\jsdom.dll