diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-29 15:13:55 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 12:18:21 +0200 |
| commit | e2a478072a0c814d4e83e6c46a01c901f1cf3a94 (patch) | |
| tree | 1d1ac43040971e7c32f6250e9b05d756577ccc8c /build | |
| parent | cb06cac81d3730d602c11e554ea3408e9f2b14a7 (diff) | |
| download | UXP-e2a478072a0c814d4e83e6c46a01c901f1cf3a94.tar UXP-e2a478072a0c814d4e83e6c46a01c901f1cf3a94.tar.gz UXP-e2a478072a0c814d4e83e6c46a01c901f1cf3a94.tar.lz UXP-e2a478072a0c814d4e83e6c46a01c901f1cf3a94.tar.xz UXP-e2a478072a0c814d4e83e6c46a01c901f1cf3a94.zip | |
Issue #1342 - Remove support for system ICU
Diffstat (limited to 'build')
| -rw-r--r-- | build/autoconf/icu.m4 | 17 | ||||
| -rw-r--r-- | build/moz.configure/old.configure | 1 |
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', |