diff options
| -rw-r--r-- | RepositoryExternal.mk | 6 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | desktop/Pagein_common.mk | 2 | ||||
| -rw-r--r-- | external/firebird/ExternalProject_firebird.mk | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ae186b793e6a..c9ed72fc45cf 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -45,7 +45,7 @@ endef endif -ifeq ($(SYSTEM_NPAPI_HEADERS),YES) +ifneq ($(SYSTEM_NPAPI_HEADERS),) # yes this uses internal headers too... # they are split across 2 dirs for this reason @@ -1200,7 +1200,7 @@ endef endif # SYSTEM_GRAPHITE -ifeq ($(SYSTEM_ICU),YES) +ifneq ($(SYSTEM_ICU),) gb_LinkTarget__use_icu_headers:= gb_ExternalProject__use_icu:= @@ -3202,7 +3202,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\ ) endef -ifneq ($(SYSTEM_ICU),YES) +ifeq ($(SYSTEM_ICU),) define gb_Executable__register_gendict $(call gb_Executable_add_runtime_dependencies,gendict,\ diff --git a/configure.ac b/configure.ac index f660a9b1d083..f090ddb7f593 100644 --- a/configure.ac +++ b/configure.ac @@ -8961,7 +8961,7 @@ AC_MSG_CHECKING([which NPAPI headers to use]) if test "$with_system_npapi_headers" = "yes"; then AC_MSG_RESULT([external]) - SYSTEM_NPAPI_HEADERS=YES + SYSTEM_NPAPI_HEADERS=TRUE # First try npapi-sdk: PKG_CHECK_MODULES(NPAPI_HEADERS, npapi-sdk, [LOCATED=yes], [LOCATED=no]) # Then go with libxul: @@ -8998,7 +8998,7 @@ else AC_MSG_RESULT([internal]) dnl ...but will not be built/used unless ENABLE_NPAPI_FROM_BROWSER or dnl ENABLE_NPAPI_INTO_BROWSER is TRUE - SYSTEM_NPAPI_HEADERS=NO + SYSTEM_NPAPI_HEADERS= fi AC_SUBST(NPAPI_HEADERS_CFLAGS) AC_SUBST(SYSTEM_NPAPI_HEADERS) @@ -9033,7 +9033,7 @@ ICU_RECLASSIFIED_HEBREW_LETTER="YES" AC_MSG_CHECKING([which icu to use]) if test "$with_system_icu" = "yes"; then AC_MSG_RESULT([external]) - SYSTEM_ICU=YES + SYSTEM_ICU=TRUE AC_LANG_PUSH([C++]) AC_MSG_CHECKING([for unicode/rbbi.h]) AC_PREPROC_IFELSE([AC_LANG_SOURCE([[unicode/rbbi.h]])],[AC_MSG_RESULT(checked.)],[AC_MSG_ERROR(icu headers not found.)]) @@ -9118,7 +9118,7 @@ You can use --with-system-icu-for-build=force to use it anyway.]) libo_MINGW_CHECK_DLL([icuuc][$ICU_MAJOR][$ICU_MINOR]) else AC_MSG_RESULT([internal]) - SYSTEM_ICU="NO" + SYSTEM_ICU= BUILD_TYPE="$BUILD_TYPE ICU" # surprisingly set these only for "internal" (to be used by various other # external libs): the system icu-config is quite unhelpful and spits out diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk index 1ba1b94a1fbc..cabd4f51b7c5 100644 --- a/desktop/Pagein_common.mk +++ b/desktop/Pagein_common.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Pagein_add_objects,common,\ $(if $(MERGELIBS),merged) \ $(if $(URELIBS),urelibs) \ i18nlangtag \ - $(if $(findstring YES,$(SYSTEM_ICU)),,\ + $(if $(SYSTEM_ICU),,\ icui18n \ icuuc \ ) \ diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index 5bfb99800042..470500f8b3e3 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -39,12 +39,12 @@ $(call gb_ExternalProject_get_state_target,firebird,build): -I$(call gb_UnpackedTarball_get_dir,boost) \ -L$(call gb_UnpackedTarball_get_dir,boost)/source/lib \ ) \ - $(if $(filter NO,$(SYSTEM_ICU)), \ + $(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \ -I$(call gb_UnpackedTarball_get_dir,icu)/source \ -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ -I$(call gb_UnpackedTarball_get_dir,icu)/source/common \ -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \ - ,$(ICU_CPPFLAGS)) \ + ) \ " \ && ./configure \ --without-editline \ |