mirror of
https://github.com/roytam1/UXP.git
synced 2026-05-26 14:54:25 +00:00
Issue #324 - Follow-up: Remove more traces of *INTL_API.
The trace in Spidermonkey's old-configure is causing the MOZ_CONFIG_ICU function to be called twice, which is not desirable as it can cause the MOZ_SHARED_ICU check in build/autoconf/icu.m4 to fail and build an ICU data file even if we're building ICU as a shared library.
This commit is contained in:
@@ -45,7 +45,6 @@ if test -n "$USE_ICU"; then
|
||||
fi
|
||||
|
||||
AC_SUBST(MOZ_ICU_VERSION)
|
||||
AC_SUBST(ENABLE_INTL_API)
|
||||
AC_SUBST(USE_ICU)
|
||||
AC_SUBST(ICU_DATA_FILE)
|
||||
AC_SUBST(MOZ_ICU_DATA_ARCHIVE)
|
||||
|
||||
@@ -2128,15 +2128,6 @@ AC_SUBST(MOZ_PKG_SPECIAL)
|
||||
AC_SUBST(MOZILLA_OFFICIAL)
|
||||
AC_SUBST(MC_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 \
|
||||
|
||||
@@ -5527,10 +5527,6 @@ ac_configure_args="$_SUBDIR_CONFIG_ARGS"
|
||||
# and $NSPR_LIBS.
|
||||
ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr\S* *//'`"
|
||||
|
||||
if test "$_INTL_API" = no; then
|
||||
ac_configure_args="$ac_configure_args --without-intl-api"
|
||||
fi
|
||||
|
||||
if test -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then
|
||||
ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"
|
||||
ac_configure_args="$ac_configure_args --with-nspr-libs='$NSPR_LIBS'"
|
||||
|
||||
Reference in New Issue
Block a user