Bug 1307358 - Config ICU before assigning OS_*FLAGS. r?glandium
MozReview-Commit-ID: 3WFvykl9h40
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -2145,16 +2145,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`
@@ -2244,25 +2253,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
@@ -5728,16 +5728,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`
@@ -5982,35 +6001,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