diff options
| -rw-r--r-- | build/autoconf/icu.m4 | 17 | ||||
| -rw-r--r-- | build/moz.configure/old.configure | 1 | ||||
| -rw-r--r-- | config/Makefile.in | 1 | ||||
| -rw-r--r-- | config/external/icu/moz.build | 22 | ||||
| -rw-r--r-- | config/moz.build | 3 | ||||
| -rw-r--r-- | config/system-headers | 16 |
6 files changed, 12 insertions, 48 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', diff --git a/config/Makefile.in b/config/Makefile.in index 1512520e4..5fe0162f2 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -47,7 +47,6 @@ export:: $(export-preqs) -DMOZ_SYSTEM_PNG=$(MOZ_SYSTEM_PNG) \ -DMOZ_SYSTEM_JPEG=$(MOZ_SYSTEM_JPEG) \ -DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \ - -DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \ $(srcdir)/system-headers $(srcdir)/stl-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers $(INSTALL) system_wrappers $(DIST) diff --git a/config/external/icu/moz.build b/config/external/icu/moz.build index 248652a85..488a02159 100644 --- a/config/external/icu/moz.build +++ b/config/external/icu/moz.build @@ -6,16 +6,14 @@ Library('icu') -if CONFIG['MOZ_SYSTEM_ICU']: - OS_LIBS += CONFIG['MOZ_ICU_LIBS'] +DIRS += [ + 'common', + 'data', + 'i18n', +] + +if CONFIG['MOZ_ICU_DATA_ARCHIVE']: + DIRS += ['stubdata'] + USE_LIBS += ['icustubdata'] else: - DIRS += [ - 'common', - 'data', - 'i18n', - ] - if CONFIG['MOZ_ICU_DATA_ARCHIVE']: - DIRS += ['stubdata'] - USE_LIBS += ['icustubdata'] - else: - USE_LIBS += ['icudata'] + USE_LIBS += ['icudata'] diff --git a/config/moz.build b/config/moz.build index 7bcac7992..c512bd07d 100644 --- a/config/moz.build +++ b/config/moz.build @@ -29,9 +29,6 @@ if CONFIG['HOST_OS_ARCH'] != 'WINNT': # while the program here is in C. HostProgram('nsinstall_real', c_only=True) -if CONFIG['MOZ_SYSTEM_ICU']: - DEFINES['MOZ_SYSTEM_ICU'] = True - PYTHON_UNIT_TESTS += [ 'tests/test_mozbuild_reading.py', 'tests/unit-expandlibs.py', diff --git a/config/system-headers b/config/system-headers index 29eef3210..a2d3b813d 100644 --- a/config/system-headers +++ b/config/system-headers @@ -1312,22 +1312,6 @@ kvm.h spawn.h err.h xlocale.h -#ifdef MOZ_SYSTEM_ICU -unicode/locid.h -unicode/numsys.h -unicode/timezone.h -unicode/ucal.h -unicode/uchar.h -unicode/uclean.h -unicode/ucol.h -unicode/udat.h -unicode/udatpg.h -unicode/uenum.h -unicode/unorm.h -unicode/unum.h -unicode/ustring.h -unicode/utypes.h -#endif libutil.h unwind.h fenv.h |