From bbd3b87eb5c2e23549ccccd7e92430d540d1060a Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 4 May 2018 10:08:02 +0200 Subject: Remove the option to build without INTL/ICU This resolves #324. --- build/autoconf/icu.m4 | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) (limited to 'build/autoconf/icu.m4') diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4 index 794ddcdf4..87d0f0ade 100644 --- a/build/autoconf/icu.m4 +++ b/build/autoconf/icu.m4 @@ -22,30 +22,12 @@ 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 +dnl Determine the status of the ECMAScript Internationalization API. +dnl ENABLE_INTL_API builds it, but doesn't determine if it's used or exposed +dnl EXPOSE_INTL_API (when built) uses ICU and exposes the API to js + +ENABLE_INTL_API=1 +EXPOSE_INTL_API=1 if test -n "$ENABLE_INTL_API"; then USE_ICU=1 -- cgit v1.2.3 From 2860601772b392f3f6d2977269f11061f4e970ee Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 4 May 2018 22:13:41 +0200 Subject: Issue #325 Part 15: Remove ENABLE_INTL_API and EXPOSE_INTL_API flags. --- build/autoconf/icu.m4 | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'build/autoconf/icu.m4') diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4 index 87d0f0ade..89c53c52c 100644 --- a/build/autoconf/icu.m4 +++ b/build/autoconf/icu.m4 @@ -22,24 +22,8 @@ fi AC_SUBST(MOZ_SYSTEM_ICU) -dnl Determine the status of the ECMAScript Internationalization API. -dnl ENABLE_INTL_API builds it, but doesn't determine if it's used or exposed -dnl EXPOSE_INTL_API (when built) uses ICU and exposes the API to js - -ENABLE_INTL_API=1 -EXPOSE_INTL_API=1 - -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 -- cgit v1.2.3