Bug 1045958 - Enable ICU on B2G Desktop OS X build r=josh.
authorTooru Fujisawa <arai_a@mac.com>
Wed, 08 Oct 2014 22:43:47 +0800
changeset 232569 6fc196832671632cc19fc08d5cbf1751fc5cbfad
parent 232568 d09b8e31e31912a590acbd55c76558d84a69a5f7
child 232570 bc30d29aaa7d45f04bcc1c66f0902dbc7478ab40
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjosh
bugs1045958
milestone35.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1045958 - Enable ICU on B2G Desktop OS X build r=josh.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -9054,19 +9054,25 @@ dnl ICU Support
 dnl ========================================================
 
 # Internationalization isn't built or exposed by default in non-desktop
 # builds.  Bugs to enable:
 #
 #   Android:  bug 864843
 #   B2G:      bug 866301
 
-if test "$MOZ_WIDGET_TOOLKIT" = "android" ||
-   test "$MOZ_BUILD_APP" = "b2g"; then
+if test "$MOZ_WIDGET_TOOLKIT" = "android"; then
     _INTL_API=no
+elif test "$MOZ_BUILD_APP" = "b2g"; then
+    if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
+        # nsCollationMacUC needs ICU
+        _INTL_API=yes
+    else
+        _INTL_API=no
+    fi
 else
     _INTL_API=yes
 fi
 
 MOZ_CONFIG_ICU()
 
 if test -z "$JS_SHARED_LIBRARY"; then
   AC_DEFINE(MOZ_STATIC_JS)