summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-01-29 15:13:55 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-01-29 15:13:55 +0100
commit00a5321c958de1f378ac9dacafb6f81ded57441e (patch)
tree7922f80956c0cac29b2324dd59483df3a4530790 /build
parente57998f68bfbfdd4408eacd0ba29419771a588bd (diff)
downloadUXP-00a5321c958de1f378ac9dacafb6f81ded57441e.tar
UXP-00a5321c958de1f378ac9dacafb6f81ded57441e.tar.gz
UXP-00a5321c958de1f378ac9dacafb6f81ded57441e.tar.lz
UXP-00a5321c958de1f378ac9dacafb6f81ded57441e.tar.xz
UXP-00a5321c958de1f378ac9dacafb6f81ded57441e.zip
Issue #1342 - Remove support for system ICU
Diffstat (limited to 'build')
-rw-r--r--build/autoconf/icu.m417
-rw-r--r--build/moz.configure/old.configure1
2 files changed, 2 insertions, 16 deletions
diff --git a/build/autoconf/icu.m4 b/build/autoconf/icu.m4
index d3cc3113d..b5111598c 100644
--- a/build/autoconf/icu.m4
+++ b/build/autoconf/icu.m4
@@ -8,19 +8,6 @@ dnl ICU library, as well as a few other things.
AC_DEFUN([MOZ_CONFIG_ICU], [
ICU_LIB_NAMES=
-MOZ_SYSTEM_ICU=
-MOZ_ARG_WITH_BOOL(system-icu,
-[ --with-system-icu
- Use system ICU (located with pkgconfig)],
- MOZ_SYSTEM_ICU=1)
-
-if test -n "$MOZ_SYSTEM_ICU"; then
- PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 58.1)
- CFLAGS="$CFLAGS $MOZ_ICU_CFLAGS"
- CXXFLAGS="$CXXFLAGS $MOZ_ICU_CFLAGS"
-fi
-
-AC_SUBST(MOZ_SYSTEM_ICU)
dnl We always use ICU.
USE_ICU=1
@@ -51,7 +38,7 @@ if test -n "$USE_ICU"; then
dnl We also don't do it on Windows because sometimes the file goes
dnl missing -- possibly due to overzealous antivirus software? --
dnl which prevents the browser from starting up :(
- if test -z "$JS_STANDALONE" -a -z "$MOZ_SYSTEM_ICU" -a "$OS_TARGET" != WINNT -a "$MOZ_WIDGET_TOOLKIT" != "android"; then
+ if test -z "$JS_STANDALONE" -a "$OS_TARGET" != WINNT -a "$MOZ_WIDGET_TOOLKIT" != "android"; then
MOZ_ICU_DATA_ARCHIVE=1
else
MOZ_ICU_DATA_ARCHIVE=
@@ -64,7 +51,7 @@ AC_SUBST(USE_ICU)
AC_SUBST(ICU_DATA_FILE)
AC_SUBST(MOZ_ICU_DATA_ARCHIVE)
-if test -n "$USE_ICU" -a -z "$MOZ_SYSTEM_ICU"; then
+if test -n "$USE_ICU"; then
if test -z "$YASM" -a -z "$GNU_AS" -a "$COMPILE_ENVIRONMENT"; then
AC_MSG_ERROR([Building ICU requires either yasm or a GNU assembler. If you do not have either of those available for this platform you must use --without-intl-api])
fi
diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
index 65add5cdc..03b1d4cdc 100644
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -287,7 +287,6 @@ def old_configure_options(*options):
'--with-sixgill',
'--with-soft-float',
'--with-system-bz2',
- '--with-system-icu',
'--with-system-jpeg',
'--with-system-libevent',
'--with-system-libvpx',