Bug 1307358 - Config ICU before assigning OS_*FLAGS. r=glandium, a=ritu
authorXidorn Quan <me@upsuper.org>
Wed, 05 Oct 2016 17:37:03 +1100
changeset 436107 e899c491933dac700bee619e7b14020f0e1e1b8e
parent 436106 e666c7433e2fb5bd3f49a1e011170feca4571bd2
child 436108 137deb246a95cf8e93bdab6bce62612d6cd03bb4
push id35151
push userbmo:bob.silverberg@gmail.com
push dateWed, 09 Nov 2016 13:14:58 +0000
reviewersglandium, ritu
bugs1307358
milestone51.0a2
Bug 1307358 - Config ICU before assigning OS_*FLAGS. r=glandium, a=ritu MozReview-Commit-ID: 3WFvykl9h40
js/src/old-configure.in
old-configure.in
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -2139,16 +2139,25 @@ AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
 AC_SUBST(MOZ_APP_NAME)
 AC_SUBST(MOZ_APP_DISPLAYNAME)
 AC_SUBST(MOZ_APP_VERSION)
 
 AC_SUBST(MOZ_PKG_SPECIAL)
 
 AC_SUBST(MOZILLA_OFFICIAL)
 
+dnl ========================================================
+dnl ECMAScript Internationalization API Support (uses ICU)
+dnl ========================================================
+
+dnl top-level configure may override this with --without-intl-api
+_INTL_API=yes
+
+MOZ_CONFIG_ICU()
+
 dnl Echo the CFLAGS to remove extra whitespace.
 CFLAGS=`echo \
 	$_WARNINGS_CFLAGS \
 	$CFLAGS`
 
 CXXFLAGS=`echo \
 	$_WARNINGS_CXXFLAGS \
 	$CXXFLAGS`
@@ -2238,25 +2247,16 @@ if test -z "$GNU_CC" -a "$OS_ARCH" = "WI
     PREPROCESS_OPTION="-P -Fi"
 else
     PREPROCESS_OPTION="-E -o "
 fi
 
 AC_SUBST(PREPROCESS_OPTION)
 
 dnl ========================================================
-dnl ECMAScript Internationalization API Support (uses ICU)
-dnl ========================================================
-
-dnl top-level configure may override this with --without-intl-api
-_INTL_API=yes
-
-MOZ_CONFIG_ICU()
-
-dnl ========================================================
 dnl JavaScript shell
 dnl ========================================================
 
 MOZ_CHECK_ALLOCATOR
 
 AC_CHECK_FUNCS(setlocale localeconv)
 
 AC_SUBST(MOZILLA_VERSION)
--- a/old-configure.in
+++ b/old-configure.in
@@ -5724,16 +5724,35 @@ if test -n "$MOZ_TELEMETRY_REPORTING" ||
   AC_DEFINE(MOZ_DATA_REPORTING)
   AC_SUBST(MOZ_DATA_REPORTING)
 fi
 
 dnl win32 options
 AC_SUBST(WIN32_REDIST_DIR)
 AC_SUBST(WIN_UCRT_REDIST_DIR)
 
+dnl ========================================================
+dnl ICU Support
+dnl ========================================================
+
+# Internationalization is not built or exposed on Fennec.
+# See Bug 1215256
+
+if test "$MOZ_BUILD_APP" = "mobile/android"; then
+    _INTL_API=no
+else
+    _INTL_API=yes
+fi
+
+if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
+    USE_ICU=1
+fi
+
+MOZ_CONFIG_ICU()
+
 dnl Echo the CFLAGS to remove extra whitespace.
 CFLAGS=`echo \
     $_WARNINGS_CFLAGS \
     $CFLAGS`
 
 CXXFLAGS=`echo \
     $_WARNINGS_CXXFLAGS \
     $CXXFLAGS`
@@ -5978,35 +5997,16 @@ if test -z "$GNU_CC" -a "$OS_ARCH" = "WI
     PREPROCESS_OPTION="-P -Fi"
 else
     PREPROCESS_OPTION="-E -o "
 fi
 
 AC_SUBST(PREPROCESS_OPTION)
 
 dnl ========================================================
-dnl ICU Support
-dnl ========================================================
-
-# Internationalization is not built or exposed on Fennec.
-# See Bug 1215256
-
-if test "$MOZ_BUILD_APP" = "mobile/android"; then
-    _INTL_API=no
-else
-    _INTL_API=yes
-fi
-
-if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
-    USE_ICU=1
-fi
-
-MOZ_CONFIG_ICU()
-
-dnl ========================================================
 dnl mask as shorthand property
 dnl ========================================================
 
 # The control structure code will be removed as soon as the feature is stable
 # Refer to bug 1281101 for more details.
 
 # Enable mask-as-shorthand property by default for nightly and aurora channels
 if test -z "$RELEASE_BUILD"; then