wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 960505 - Make it easier for Mozilla code to include ICU headers. r=glandium

Browse Source
This commit is contained in:
Jonathan Watt 2014-01-15 23:45:45 +00:00
parent dd00554d2b
commit 6e6c591ba5
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.in
View File

@ -3932,6 +3932,9 @@ if test -n "$MOZ_NATIVE_ICU"; then
PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_ICU_LIBS"
MOZ_SHARED_ICU=1
else
MOZ_ICU_CFLAGS='-I$(topsrcdir)/intl/icu/source/common -I$(topsrcdir)/intl/icu/source/i18n'
AC_SUBST(MOZ_ICU_CFLAGS)
fi
AC_SUBST(MOZ_NATIVE_ICU)

7
js/src/Makefile.in
View File

@ -105,14 +105,7 @@ include $(topsrcdir)/config/rules.mk
# ICU headers need to be available whether we build with the complete
# Internationalization API or not - ICU stubs rely on them.
ifdef MOZ_NATIVE_ICU
LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS)
else
LOCAL_INCLUDES += \
-I$(topsrcdir)/intl/icu/source/common \
-I$(topsrcdir)/intl/icu/source/i18n \
$(NULL)
endif
ifdef ENABLE_INTL_API
ifndef MOZ_NATIVE_ICU

3
js/src/configure.in
View File

@ -4229,6 +4229,9 @@ MOZ_ARG_WITH_BOOL(system-icu,
if test -n "$MOZ_NATIVE_ICU"; then
PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
MOZ_SHARED_ICU=1
else
MOZ_ICU_CFLAGS='-I$(topsrcdir)/intl/icu/source/common -I$(topsrcdir)/intl/icu/source/i18n'
AC_SUBST(MOZ_ICU_CFLAGS)
fi
MOZ_ARG_WITH_STRING(intl-api,