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 422526 02929136e12c119b544db6d8f7de1a88985423eb
parent 422525 6a4f08e8bbe882117b369fbe8b4bec1e909649bd
child 422527 f79842c6d1557dfd9550baed0a1d664c978b4c36
push id31738
push userbmo:giles@thaumas.net
push dateFri, 07 Oct 2016 20:30:41 +0000
reviewersglandium, ritu
bugs1307358
milestone50.0
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
@@ -2326,16 +2326,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`
@@ -2429,25 +2438,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
@@ -6333,16 +6333,35 @@ if test -n "$MOZ_TELEMETRY_REPORTING" ||
   AC_SUBST(MOZ_DATA_REPORTING)
 fi
 
 dnl win32 options
 AC_SUBST(WIN32_REDIST_DIR)
 AC_SUBST(WIN_UCRT_REDIST_DIR)
 AC_SUBST(MAKENSISU)
 
+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`
@@ -6603,35 +6622,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 short hand property
 dnl ========================================================
 dnl Uncommenting the next line would enable mask-as-shorthand feature.
 dnl MOZ_ENABLE_MASK_AS_SHORTHAND=1
 if test "$MOZ_ENABLE_MASK_AS_SHORTHAND"; then
   AC_DEFINE(MOZ_ENABLE_MASK_AS_SHORTHAND)
 fi
 AC_SUBST(MOZ_ENABLE_MASK_AS_SHORTHAND)