diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-04 22:42:31 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-04 22:42:31 +0200 |
| commit | 3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d (patch) | |
| tree | 2ef4b78c728a2e1a323babc75205b19911a5ffc0 /build | |
| parent | 175efcbab02bbfea84e565cdea9ee96d6436a08f (diff) | |
| parent | 2860601772b392f3f6d2977269f11061f4e970ee (diff) | |
| download | UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.tar UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.tar.gz UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.tar.lz UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.tar.xz UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.zip | |
Merge branch 'intl-ICU-emoji-work'
Diffstat (limited to 'build')
| -rw-r--r-- | build/autoconf/icu.m4 | 38 | ||||
| -rw-r--r-- | build/moz.configure/old.configure | 1 |
2 files changed, 2 insertions, 37 deletions
diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4 index 794ddcdf4..89c53c52c 100644 --- a/build/autoconf/icu.m4 +++ b/build/autoconf/icu.m4 @@ -22,42 +22,8 @@ fi AC_SUBST(MOZ_SYSTEM_ICU) -MOZ_ARG_WITH_STRING(intl-api, -[ --with-intl-api, --with-intl-api=build, --without-intl-api - Determine the status of the ECMAScript Internationalization API. The first - (or lack of any of these) builds and exposes the API. The second builds it - but doesn't use ICU or expose the API to script. The third doesn't build - ICU at all.], - _INTL_API=$withval) - -ENABLE_INTL_API= -EXPOSE_INTL_API= -case "$_INTL_API" in -no) - ;; -build) - ENABLE_INTL_API=1 - ;; -yes) - ENABLE_INTL_API=1 - EXPOSE_INTL_API=1 - ;; -*) - AC_MSG_ERROR([Invalid value passed to --with-intl-api: $_INTL_API]) - ;; -esac - -if test -n "$ENABLE_INTL_API"; then - USE_ICU=1 -fi - -if test -n "$EXPOSE_INTL_API"; then - AC_DEFINE(EXPOSE_INTL_API) -fi - -if test -n "$ENABLE_INTL_API"; then - AC_DEFINE(ENABLE_INTL_API) -fi +dnl We always use ICU. +USE_ICU=1 dnl Settings for the implementation of the ECMAScript Internationalization API if test -n "$USE_ICU"; then diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure index 9f29e68c9..c1ad71d5f 100644 --- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -270,7 +270,6 @@ def old_configure_options(*options): '--with-doc-output-dir', '--with-float-abi', '--with-fpu', - '--with-intl-api', '--with-ios-sdk', '--with-jitreport-granularity', '--with-macbundlename-prefix', |