From b19e3c348c90594789574d6f619e417b60d1ce83 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Fri, 4 May 2018 10:08:02 +0200
Subject: [PATCH] Remove the option to build without INTL/ICU

This resolves #324.
---
 build/autoconf/icu.m4             | 28 +++++-----------------------
 build/moz.configure/old.configure |  1 -
 old-configure.in                  |  2 --
 3 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4
index 794ddcdf4e..87d0f0aded 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)
+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=
-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
+ENABLE_INTL_API=1
+EXPOSE_INTL_API=1
 
 if test -n "$ENABLE_INTL_API"; then
     USE_ICU=1
diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
index 7bacf7e7f7..2fa649d4a1 100644
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -271,7 +271,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',
diff --git a/old-configure.in b/old-configure.in
index 5b7bbfb60d..2fe3e3eea5 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -5516,8 +5516,6 @@ dnl ========================================================
 dnl ICU Support
 dnl ========================================================
 
-_INTL_API=yes
-
 if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
     USE_ICU=1
 fi