mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 02:14:43 +00:00
Bug 1307358 - Config ICU before assigning OS_*FLAGS. r=glandium
MozReview-Commit-ID: 3WFvykl9h40 --HG-- extra : rebase_source : fe5c3c9fdafdd895239abadf91311ebf3d3dfb8c
This commit is contained in:
parent
64e6698302
commit
04ea7d3194
@ -2135,6 +2135,15 @@ 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 \
|
||||
@ -2233,15 +2242,6 @@ 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 ========================================================
|
||||
|
@ -5733,6 +5733,25 @@ 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 \
|
||||
@ -5986,25 +6005,6 @@ 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 ========================================================
|
||||
|
Loading…
Reference in New Issue
Block a user