diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 9bc692a279e..b9076f10a94 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -352,6 +352,8 @@ MOZ_XFT_CFLAGS = @MOZ_XFT_CFLAGS@
MOZ_XFT_LIBS = @MOZ_XFT_LIBS@
MOZ_ENABLE_COREXFONTS = @MOZ_ENABLE_COREXFONTS@
+MOZ_EXTRA_X11CONVERTERS = @MOZ_EXTRA_X11CONVERTERS@
+
MOZ_ENABLE_XINERAMA = @MOZ_ENABLE_XINERAMA@
MOZ_XINERAMA_LIBS = @MOZ_XINERAMA_LIBS@
diff --git a/intl/uconv/macbuild/uconv.xml b/intl/uconv/macbuild/uconv.xml
index c3256f97347..bc1543b899d 100644
--- a/intl/uconv/macbuild/uconv.xml
+++ b/intl/uconv/macbuild/uconv.xml
@@ -1248,20 +1248,6 @@
Text
Debug
-
- Name
- nsUnicodeToJISx0212.cpp
- MacOS
- Text
- Debug
-
-
- Name
- nsUnicodeToJISx0208.cpp
- MacOS
- Text
- Debug
-
Name
nsUnicodeToJISx0201.cpp
@@ -1304,13 +1290,6 @@
Text
Debug
-
- Name
- nsUnicodeToKSC5601.cpp
- MacOS
- Text
- Debug
-
Name
nsUnicodeToISO2022KR.cpp
@@ -1339,13 +1318,6 @@
Text
Debug
-
- Name
- nsUnicodeToX11Johab.cpp
- MacOS
- Text
- Debug
-
Name
nsUnicodeToJohab.cpp
@@ -1360,13 +1332,6 @@
Text
Debug
-
- Name
- nsUnicodeToJohabNoAscii.cpp
- MacOS
- Text
- Debug
-
Name
nsUnicodeToBIG5.cpp
@@ -1381,13 +1346,6 @@
Text
Debug
-
- Name
- nsUnicodeToBIG5NoAscii.cpp
- MacOS
- Text
- Debug
-
Name
nsUnicodeToCP950.cpp
@@ -1556,13 +1514,6 @@
Text
Debug
-
- Name
- nsUnicodeToGBKNoAscii.cpp
- MacOS
- Text
- Debug
-
Name
nsGB2312ToUnicodeV2.cpp
@@ -2724,16 +2675,6 @@
nsCP932ToUnicode.cpp
MacOS
-
- Name
- nsUnicodeToJISx0212.cpp
- MacOS
-
-
- Name
- nsUnicodeToJISx0208.cpp
- MacOS
-
Name
nsUnicodeToJISx0201.cpp
@@ -2764,11 +2705,6 @@
nsUnicodeToEUCKR.cpp
MacOS
-
- Name
- nsUnicodeToKSC5601.cpp
- MacOS
-
Name
nsUnicodeToISO2022KR.cpp
@@ -2789,11 +2725,6 @@
nsCP949ToUnicode.cpp
MacOS
-
- Name
- nsUnicodeToX11Johab.cpp
- MacOS
-
Name
nsUnicodeToJohab.cpp
@@ -2804,11 +2735,6 @@
nsJohabToUnicode.cpp
MacOS
-
- Name
- nsUnicodeToJohabNoAscii.cpp
- MacOS
-
Name
nsUnicodeToBIG5.cpp
@@ -2819,11 +2745,6 @@
nsBIG5ToUnicode.cpp
MacOS
-
- Name
- nsUnicodeToBIG5NoAscii.cpp
- MacOS
-
Name
nsUnicodeToCP950.cpp
@@ -2944,11 +2865,6 @@
nsUnicodeToGB2312V2.cpp
MacOS
-
- Name
- nsUnicodeToGBKNoAscii.cpp
- MacOS
-
Name
nsGB2312ToUnicodeV2.cpp
@@ -4856,20 +4772,6 @@
Text
Debug
-
- Name
- nsUnicodeToJISx0212.cpp
- MacOS
- Text
- Debug
-
-
- Name
- nsUnicodeToJISx0208.cpp
- MacOS
- Text
- Debug
-
Name
nsUnicodeToJISx0201.cpp
@@ -4912,13 +4814,6 @@
Text
Debug
-
- Name
- nsUnicodeToKSC5601.cpp
- MacOS
- Text
- Debug
-
Name
nsUnicodeToISO2022KR.cpp
@@ -4947,13 +4842,6 @@
Text
Debug
-
- Name
- nsUnicodeToX11Johab.cpp
- MacOS
- Text
- Debug
-
Name
nsUnicodeToJohab.cpp
@@ -4968,13 +4856,6 @@
Text
Debug
-
- Name
- nsUnicodeToJohabNoAscii.cpp
- MacOS
- Text
- Debug
-
Name
nsUnicodeToBIG5.cpp
@@ -4989,13 +4870,6 @@
Text
Debug
-
- Name
- nsUnicodeToBIG5NoAscii.cpp
- MacOS
- Text
- Debug
-
Name
nsUnicodeToCP950.cpp
@@ -5164,13 +5038,6 @@
Text
Debug
-
- Name
- nsUnicodeToGBKNoAscii.cpp
- MacOS
- Text
- Debug
-
Name
nsGB2312ToUnicodeV2.cpp
@@ -6332,16 +6199,6 @@
nsCP932ToUnicode.cpp
MacOS
-
- Name
- nsUnicodeToJISx0212.cpp
- MacOS
-
-
- Name
- nsUnicodeToJISx0208.cpp
- MacOS
-
Name
nsUnicodeToJISx0201.cpp
@@ -6372,11 +6229,6 @@
nsUnicodeToEUCKR.cpp
MacOS
-
- Name
- nsUnicodeToKSC5601.cpp
- MacOS
-
Name
nsUnicodeToISO2022KR.cpp
@@ -6397,11 +6249,6 @@
nsCP949ToUnicode.cpp
MacOS
-
- Name
- nsUnicodeToX11Johab.cpp
- MacOS
-
Name
nsUnicodeToJohab.cpp
@@ -6412,11 +6259,6 @@
nsJohabToUnicode.cpp
MacOS
-
- Name
- nsUnicodeToJohabNoAscii.cpp
- MacOS
-
Name
nsUnicodeToBIG5.cpp
@@ -6427,11 +6269,6 @@
nsBIG5ToUnicode.cpp
MacOS
-
- Name
- nsUnicodeToBIG5NoAscii.cpp
- MacOS
-
Name
nsUnicodeToCP950.cpp
@@ -6552,11 +6389,6 @@
nsUnicodeToGB2312V2.cpp
MacOS
-
- Name
- nsUnicodeToGBKNoAscii.cpp
- MacOS
-
Name
nsGB2312ToUnicodeV2.cpp
@@ -7574,12 +7406,6 @@
nsUnicodeToGB2312V2.cpp
MacOS
-
- uconv.shlb
- Name
- nsUnicodeToGBKNoAscii.cpp
- MacOS
-
uconv.shlb
Name
@@ -7662,12 +7488,6 @@
nsBIG5ToUnicode.cpp
MacOS
-
- uconv.shlb
- Name
- nsUnicodeToBIG5NoAscii.cpp
- MacOS
-
uconv.shlb
Name
@@ -7712,12 +7532,6 @@
nsUnicodeToEUCKR.cpp
MacOS
-
- uconv.shlb
- Name
- nsUnicodeToKSC5601.cpp
- MacOS
-
uconv.shlb
Name
@@ -7742,12 +7556,6 @@
nsCP949ToUnicode.cpp
MacOS
-
- uconv.shlb
- Name
- nsUnicodeToX11Johab.cpp
- MacOS
-
uconv.shlb
Name
@@ -7760,12 +7568,6 @@
nsJohabToUnicode.cpp
MacOS
-
- uconv.shlb
- Name
- nsUnicodeToJohabNoAscii.cpp
- MacOS
-
ucvja
@@ -7786,18 +7588,6 @@
nsCP932ToUnicode.cpp
MacOS
-
- uconv.shlb
- Name
- nsUnicodeToJISx0212.cpp
- MacOS
-
-
- uconv.shlb
- Name
- nsUnicodeToJISx0208.cpp
- MacOS
-
uconv.shlb
Name
diff --git a/intl/uconv/src/nsUConvModule.cpp b/intl/uconv/src/nsUConvModule.cpp
index bf4a7c554f2..577d738f193 100644
--- a/intl/uconv/src/nsUConvModule.cpp
+++ b/intl/uconv/src/nsUConvModule.cpp
@@ -226,8 +226,10 @@
#include "nsUnicodeToEUCJP.h"
#include "nsUnicodeToISO2022JP.h"
#include "nsUnicodeToJISx0201.h"
+#ifdef MOZ_EXTRA_X11CONVERTERS
#include "nsUnicodeToJISx0208.h"
#include "nsUnicodeToJISx0212.h"
+#endif
// ucvtw2
#include "nsUCvTW2CID.h"
@@ -247,7 +249,9 @@
#include "nsUCvTWDll.h"
#include "nsBIG5ToUnicode.h"
#include "nsUnicodeToBIG5.h"
+#ifdef MOZ_EXTRA_X11CONVERTERS
#include "nsUnicodeToBIG5NoAscii.h"
+#endif
#include "nsBIG5HKSCSToUnicode.h"
#include "nsUnicodeToBIG5HKSCS.h"
#include "nsUnicodeToHKSCS.h"
@@ -257,11 +261,13 @@
#include "nsUCvKODll.h"
#include "nsEUCKRToUnicode.h"
#include "nsUnicodeToEUCKR.h"
-#include "nsUnicodeToKSC5601.h"
-#include "nsUnicodeToX11Johab.h"
#include "nsJohabToUnicode.h"
#include "nsUnicodeToJohab.h"
+#ifdef MOZ_EXTRA_X11CONVERTERS
+#include "nsUnicodeToKSC5601.h"
+#include "nsUnicodeToX11Johab.h"
#include "nsUnicodeToJohabNoAscii.h"
+#endif
#include "nsCP949ToUnicode.h"
#include "nsUnicodeToCP949.h"
#include "nsISO2022KRToUnicode.h"
@@ -273,7 +279,9 @@
#include "nsUnicodeToHZ.h"
#include "nsGBKToUnicode.h"
#include "nsUnicodeToGBK.h"
+#ifdef MOZ_EXTRA_X11CONVERTERS
#include "nsUnicodeToGBKNoAscii.h"
+#endif
#include "nsCP936ToUnicode.h"
#include "nsUnicodeToCP936.h"
#include "nsGB2312ToUnicodeV2.h"
@@ -373,8 +381,10 @@ NS_UCONV_REG_UNREG("ISO-2022-JP", NS_ISO2022JPTOUNICODE_CID, NS_UNICODETOISO2022
NS_UCONV_REG_UNREG("EUC-JP", NS_EUCJPTOUNICODE_CID, NS_UNICODETOEUCJP_CID)
NS_UCONV_REG_UNREG_ENCODER("jis_0201" , NS_UNICODETOJISX0201_CID)
+#ifdef MOZ_EXTRA_X11CONVERTERS
NS_UCONV_REG_UNREG_ENCODER("jis_0208-1983" , NS_UNICODETOJISX0208_CID)
NS_UCONV_REG_UNREG_ENCODER("jis_0212-1990" , NS_UNICODETOJISX0212_CID)
+#endif
// ucvtw2
NS_UCONV_REG_UNREG("x-euc-tw", NS_EUCTWTOUNICODE_CID, NS_UNICODETOEUCTW_CID)
@@ -391,7 +401,9 @@ NS_UCONV_REG_UNREG("Big5", NS_BIG5TOUNICODE_CID, NS_UNICODETOBIG5_CID)
NS_UCONV_REG_UNREG("Big5-HKSCS", NS_BIG5HKSCSTOUNICODE_CID, NS_UNICODETOBIG5HKSCS_CID)
NS_UCONV_REG_UNREG_ENCODER("hkscs-1" , NS_UNICODETOHKSCS_CID)
+#ifdef MOZ_EXTRA_X11CONVERTERS
NS_UCONV_REG_UNREG_ENCODER("x-x-big5", NS_UNICODETOBIG5NOASCII_CID)
+#endif
// ucvko
NS_UCONV_REG_UNREG("EUC-KR", NS_EUCKRTOUNICODE_CID, NS_UNICODETOEUCKR_CID)
@@ -399,15 +411,19 @@ NS_UCONV_REG_UNREG("x-johab", NS_JOHABTOUNICODE_CID, NS_UNICODETOJOHAB_CID)
NS_UCONV_REG_UNREG("x-windows-949", NS_CP949TOUNICODE_CID, NS_UNICODETOCP949_CID)
NS_UCONV_REG_UNREG_DECODER("ISO-2022-KR", NS_ISO2022KRTOUNICODE_CID)
+#ifdef MOZ_EXTRA_X11CONVERTERS
NS_UCONV_REG_UNREG_ENCODER("ks_c_5601-1987", NS_UNICODETOKSC5601_CID)
NS_UCONV_REG_UNREG_ENCODER("x-x11johab", NS_UNICODETOX11JOHAB_CID)
NS_UCONV_REG_UNREG_ENCODER("x-johab-noascii", NS_UNICODETOJOHABNOASCII_CID)
+#endif
// ucvcn
NS_UCONV_REG_UNREG("GB2312", NS_GB2312TOUNICODE_CID, NS_UNICODETOGB2312_CID)
NS_UCONV_REG_UNREG("windows-936", NS_CP936TOUNICODE_CID, NS_UNICODETOCP936_CID)
NS_UCONV_REG_UNREG("x-gbk", NS_GBKTOUNICODE_CID, NS_UNICODETOGBK_CID)
+#ifdef MOZ_EXTRA_X11CONVERTERS
NS_UCONV_REG_UNREG_ENCODER("x-gbk-noascii", NS_UNICODETOGBKNOASCII_CID)
+#endif
NS_UCONV_REG_UNREG("HZ-GB-2312", NS_HZTOUNICODE_CID, NS_UNICODETOHZ_CID)
NS_UCONV_REG_UNREG_ENCODER("gb_2312-80", NS_UNICODETOGB2312GL_CID)
NS_UCONV_REG_UNREG("gb18030", NS_GB18030TOUNICODE_CID, NS_UNICODETOGB18030_CID)
@@ -459,10 +475,14 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToISO2022JP);
// ucvtw2
// ucvtw
+#ifdef MOZ_EXTRA_X11CONVERTERS
NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToBIG5NoAscii);
+#endif
// ucvko
+#ifdef MOZ_EXTRA_X11CONVERTERS
NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToX11Johab);
+#endif
NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO2022KRToUnicode);
// ucvcn
@@ -472,7 +492,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP936ToUnicode);
NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP936);
NS_GENERIC_FACTORY_CONSTRUCTOR(nsGBKToUnicode);
NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGBK);
+#ifdef MOZ_EXTRA_X11CONVERTERS
NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGBKNoAscii);
+#endif
NS_GENERIC_FACTORY_CONSTRUCTOR(nsHZToUnicode);
NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToHZ);
NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGB2312GL);
@@ -1433,6 +1455,7 @@ static const nsModuleComponentInfo components[] =
NS_UNICODEENCODER_CONTRACTID_BASE "jis_0201",
nsUnicodeToJISx0201Constructor,
},
+#ifdef MOZ_EXTRA_X11CONVERTERS
{
ENCODER_NAME_BASE "jis_0208-1983" , NS_UNICODETOJISX0208_CID,
NS_UNICODEENCODER_CONTRACTID_BASE "jis_0208-1983",
@@ -1443,6 +1466,7 @@ static const nsModuleComponentInfo components[] =
NS_UNICODEENCODER_CONTRACTID_BASE "jis_0212-1990",
nsUnicodeToJISx0212Constructor,
},
+#endif
// ucvtw2
{
@@ -1497,11 +1521,13 @@ static const nsModuleComponentInfo components[] =
NS_UNICODEENCODER_CONTRACTID_BASE "Big5",
nsUnicodeToBIG5Constructor,
},
+#ifdef MOZ_EXTRA_X11CONVERTERS
{
ENCODER_NAME_BASE "x-x-big5" , NS_UNICODETOBIG5NOASCII_CID,
NS_UNICODEENCODER_CONTRACTID_BASE "x-x-big5",
nsUnicodeToBIG5NoAsciiConstructor,
},
+#endif
{
DECODER_NAME_BASE "Big5" , NS_BIG5TOUNICODE_CID,
NS_UNICODEDECODER_CONTRACTID_BASE "Big5",
@@ -1534,6 +1560,17 @@ static const nsModuleComponentInfo components[] =
NS_UNICODEENCODER_CONTRACTID_BASE "EUC-KR",
nsUnicodeToEUCKRConstructor,
},
+ {
+ DECODER_NAME_BASE "x-johab" , NS_JOHABTOUNICODE_CID,
+ NS_UNICODEDECODER_CONTRACTID_BASE "x-johab",
+ nsJohabToUnicodeConstructor ,
+ },
+ {
+ ENCODER_NAME_BASE "x-johab" , NS_UNICODETOJOHAB_CID,
+ NS_UNICODEENCODER_CONTRACTID_BASE "x-johab",
+ nsUnicodeToJohabConstructor,
+ },
+#ifdef MOZ_EXTRA_X11CONVERTERS
{
ENCODER_NAME_BASE "ks_c_5601-1987" , NS_UNICODETOKSC5601_CID,
NS_UNICODEENCODER_CONTRACTID_BASE "ks_c_5601-1987",
@@ -1544,21 +1581,12 @@ static const nsModuleComponentInfo components[] =
NS_UNICODEENCODER_CONTRACTID_BASE "x-x11johab",
nsUnicodeToX11JohabConstructor,
},
- {
- DECODER_NAME_BASE "x-johab" , NS_JOHABTOUNICODE_CID,
- NS_UNICODEDECODER_CONTRACTID_BASE "x-johab",
- nsJohabToUnicodeConstructor ,
- },
- {
- ENCODER_NAME_BASE "x-johab" , NS_UNICODETOJOHAB_CID,
- NS_UNICODEENCODER_CONTRACTID_BASE "x-johab",
- nsUnicodeToJohabConstructor,
- },
{
ENCODER_NAME_BASE "x-johab-noascii", NS_UNICODETOJOHABNOASCII_CID,
NS_UNICODEENCODER_CONTRACTID_BASE "x-johab-noascii",
nsUnicodeToJohabNoAsciiConstructor,
},
+#endif
{
DECODER_NAME_BASE "x-windows-949" , NS_CP949TOUNICODE_CID,
NS_UNICODEDECODER_CONTRACTID_BASE "x-windows-949",
@@ -1605,11 +1633,13 @@ static const nsModuleComponentInfo components[] =
NS_UNICODEENCODER_CONTRACTID_BASE "x-gbk",
nsUnicodeToGBKConstructor,
},
+#ifdef MOZ_EXTRA_X11CONVERTERS
{
ENCODER_NAME_BASE "x-gbk-noascii" , NS_UNICODETOGBKNOASCII_CID,
NS_UNICODEENCODER_CONTRACTID_BASE "x-gbk-noascii",
nsUnicodeToGBKNoAsciiConstructor,
},
+#endif
{
DECODER_NAME_BASE "HZ-GB-2312" , NS_HZTOUNICODE_CID,
NS_UNICODEDECODER_CONTRACTID_BASE "HZ-GB-2312",
diff --git a/intl/uconv/ucvcn/Makefile.in b/intl/uconv/ucvcn/Makefile.in
index be94ac29257..43a437b68ce 100644
--- a/intl/uconv/ucvcn/Makefile.in
+++ b/intl/uconv/ucvcn/Makefile.in
@@ -42,7 +42,6 @@ CPPSRCS = \
nsUnicodeToGB2312GL.cpp \
nsGBKToUnicode.cpp \
nsUnicodeToGBK.cpp \
- nsUnicodeToGBKNoAscii.cpp \
nsISO2022CNToUnicode.cpp \
nsUnicodeToISO2022CN.cpp \
nsHZToUnicode.cpp \
@@ -52,6 +51,12 @@ CPPSRCS = \
nsGBKConvUtil.cpp \
$(NULL)
+ifdef MOZ_EXTRA_X11CONVERTERS
+CPPSRCS += \
+ nsUnicodeToGBKNoAscii.cpp \
+ $(NULL)
+endif
+
EXPORTS = nsUCvCnCID.h
LOCAL_INCLUDES = -I$(srcdir)/../util
diff --git a/intl/uconv/ucvcn/nsUCvCnCID.h b/intl/uconv/ucvcn/nsUCvCnCID.h
index 3c76ec7d8f0..bdc8970f203 100644
--- a/intl/uconv/ucvcn/nsUCvCnCID.h
+++ b/intl/uconv/ucvcn/nsUCvCnCID.h
@@ -75,10 +75,12 @@
#define NS_UNICODETOGBK_CID \
{ 0xba61519b, 0x1dfa, 0x11d3, {0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
+#ifdef MOZ_EXTRA_X11CONVERTERS
// Class ID for our UnicodeToGBKNoAscii charset converter
// {af0de730-1dd1-11b2-a8a1-b60772efe214}
#define NS_UNICODETOGBKNOASCII_CID \
{ 0xaf0de730, 0x1dd1, 0x11b2, {0xa8, 0xa1, 0xb6, 0x07, 0x72, 0xef, 0xe2, 0x14}}
+#endif
// Class ID for our UnicodeToISO2022CN charset converter
// {BA61519C-1DFA-11d3-B3BF-00805F8A6670}
diff --git a/intl/uconv/ucvja/Makefile.in b/intl/uconv/ucvja/Makefile.in
index 8e7e44e8c22..c12ee680cb0 100644
--- a/intl/uconv/ucvja/Makefile.in
+++ b/intl/uconv/ucvja/Makefile.in
@@ -46,9 +46,14 @@ CPPSRCS = \
nsUnicodeToEUCJP.cpp \
nsUnicodeToISO2022JP.cpp \
nsUnicodeToJISx0201.cpp \
+ $(NULL)
+
+ifdef MOZ_EXTRA_X11CONVERTERS
+CPPSRCS += \
nsUnicodeToJISx0208.cpp \
nsUnicodeToJISx0212.cpp \
$(NULL)
+endif
EXPORTS = \
nsUCVJACID.h \
diff --git a/intl/uconv/ucvja/nsUCVJA2CID.h b/intl/uconv/ucvja/nsUCVJA2CID.h
index b62dc76f2de..d9f3a02a530 100644
--- a/intl/uconv/ucvja/nsUCVJA2CID.h
+++ b/intl/uconv/ucvja/nsUCVJA2CID.h
@@ -66,6 +66,7 @@
#define NS_UNICODETOJISX0201_CID \
{0xba615191, 0x1dfa, 0x11d3, {0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
+#ifdef MOZ_EXTRA_X11CONVERTERS
// Class ID for our UnicodeToJISx0208 charset converter
// {BA615192-1DFA-11d3-B3BF-00805F8A6670}
#define NS_UNICODETOJISX0208_CID \
@@ -75,6 +76,7 @@
// {BA615193-1DFA-11d3-B3BF-00805F8A6670}
#define NS_UNICODETOJISX0212_CID \
{0xba615193, 0x1dfa, 0x11d3, {0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
+#endif
#endif /* nsUCVJA2CID_h___ */
diff --git a/intl/uconv/ucvko/Makefile.in b/intl/uconv/ucvko/Makefile.in
index d4a6e7e197b..70d0bc5f42f 100644
--- a/intl/uconv/ucvko/Makefile.in
+++ b/intl/uconv/ucvko/Makefile.in
@@ -38,16 +38,21 @@ REQUIRES = xpcom \
CPPSRCS = \
nsEUCKRToUnicode.cpp \
nsUnicodeToEUCKR.cpp \
- nsUnicodeToKSC5601.cpp \
nsISO2022KRToUnicode.cpp \
nsUnicodeToISO2022KR.cpp \
nsCP949ToUnicode.cpp \
nsUnicodeToCP949.cpp \
- nsUnicodeToX11Johab.cpp \
nsUnicodeToJohab.cpp \
nsJohabToUnicode.cpp \
+ $(NULL)
+
+ifdef MOZ_EXTRA_X11CONVERTERS
+CPPSRCS += \
+ nsUnicodeToKSC5601.cpp \
+ nsUnicodeToX11Johab.cpp \
nsUnicodeToJohabNoAscii.cpp \
$(NULL)
+endif
EXPORTS = nsUCvKOCID.h
diff --git a/intl/uconv/ucvko/nsUCvKOCID.h b/intl/uconv/ucvko/nsUCvKOCID.h
index 8d01e238e06..31974585502 100644
--- a/intl/uconv/ucvko/nsUCvKOCID.h
+++ b/intl/uconv/ucvko/nsUCvKOCID.h
@@ -61,10 +61,12 @@
#define NS_UNICODETOISO2022KR_CID \
{ 0xba6151a0, 0x1dfa, 0x11d3, {0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
+#ifdef MOZ_EXTRA_X11CONVERTERS
// Class ID for our UnicodeToKSC5601 charset converter
// {BA615194-1DFA-11d3-B3BF-00805F8A6670}
#define NS_UNICODETOKSC5601_CID \
{ 0xba615194, 0x1dfa, 0x11d3, {0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
+#endif
// Class ID for our UnicodeToCP949 charset converter
#define NS_UNICODETOCP949_CID \
@@ -74,9 +76,11 @@
#define NS_CP949TOUNICODE_CID \
{ 0x9416bfbf, 0x1f93, 0x11d3, {0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
+#ifdef MOZ_EXTRA_X11CONVERTERS
// Class ID for our UnicodeToX11Johab charset converter
#define NS_UNICODETOX11JOHAB_CID \
{ 0x21dd6a01, 0x413c, 0x11d3, {0xb3, 0xc3, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
+#endif
// Class ID for our UnicodeToJohab charset converter
// {D9B1F97E-CFA0-80b6-FB92-9972E48E3DCC}
@@ -88,9 +92,11 @@
#define NS_JOHABTOUNICODE_CID \
{ 0xd9b1f97f, 0xcfa0, 0x80b6, {0xfb, 0x92, 0x99, 0x72, 0xe4, 0x8e, 0x3d, 0xcc}}
+#ifdef MOZ_EXTRA_X11CONVERTERS
// Class ID for our UnicodeToJohabNoAscii charset converter
// {7090544B-C885-4c52-95F8-3C8F0C2FDE67}
#define NS_UNICODETOJOHABNOASCII_CID \
{ 0x7090544b, 0xc885, 0x4c52, {0x95, 0xf8, 0x3c, 0x8f, 0xc, 0x2f, 0xde, 0x67}}
+#endif
#endif /* nsUCvKOCID_h___ */
diff --git a/intl/uconv/ucvtw/Makefile.in b/intl/uconv/ucvtw/Makefile.in
index 5ba4df9dcca..d7319deafe2 100644
--- a/intl/uconv/ucvtw/Makefile.in
+++ b/intl/uconv/ucvtw/Makefile.in
@@ -43,8 +43,13 @@ CPPSRCS = \
nsUnicodeToHKSCS.cpp \
nsCP950ToUnicode.cpp \
nsUnicodeToCP950.cpp \
+ $(NULL)
+
+ifdef MOZ_EXTRA_X11CONVERTERS
+CPPSRCS += \
nsUnicodeToBIG5NoAscii.cpp \
$(NULL)
+endif
EXPORTS = nsUCvTWCID.h
diff --git a/intl/uconv/ucvtw/nsUCvTWCID.h b/intl/uconv/ucvtw/nsUCvTWCID.h
index 7757aa5fa60..c3e9369c8b2 100644
--- a/intl/uconv/ucvtw/nsUCvTWCID.h
+++ b/intl/uconv/ucvtw/nsUCvTWCID.h
@@ -52,10 +52,12 @@
{ 0xefc323e2, 0xec62, 0x11d2, {0x8a, 0xac, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36}}
+#ifdef MOZ_EXTRA_X11CONVERTERS
// Class ID for our UnicodeToBIG5NoAscii charset converter
// {BA615195-1DFA-11d3-B3BF-00805F8A6670}
#define NS_UNICODETOBIG5NOASCII_CID \
{ 0xba615195, 0x1dfa, 0x11d3, {0xb3, 0xbf, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
+#endif
// Class ID for our CP950ToUnicode charset converter
#define NS_CP950TOUNICODE_CID \