diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-11 16:21:04 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 09:53:08 +0100 |
| commit | 04ff535f72c1fbc5f7dbc8cc54ed9b23f7e130f9 (patch) | |
| tree | 52cb40ab9b0e01c26e6b94f1039bc5d36a578f59 /external/liborcus | |
| parent | 23647595d77b85b5dac0d5762987a3ba2533ffd9 (diff) | |
normalize values of SYSTEM_ZLIB, SYSTEM_DICTS, SYSTEM_FONTCONFIG
Change-Id: I7530cb9d0797df5fc86695b0379cc44c159d2ab5
Diffstat (limited to 'external/liborcus')
| -rw-r--r-- | external/liborcus/ExternalProject_liborcus.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index 171ea5981c83..432423a2a3e4 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -32,7 +32,7 @@ $(eval $(call gb_ExternalProject_register_targets,liborcus,\ #$(if $(filter MSC,$(COM)),CPPFLAGS+="-DBOOST_ALL_NO_LIB") CXXFLAGS+="$(BOOST_CXXFLAGS)) liborcus_LIBS= -ifeq ($(SYSTEM_ZLIB),YES) +ifneq ($(SYSTEM_ZLIB),) liborcus_LIBS+=-lz endif ifeq ($(SYSTEM_BOOST),YES) @@ -48,7 +48,7 @@ liborcus_CPPCLAGS=$(CPPFLAGS) ifeq ($(COM),MSC) liborcus_CPPFLAGS+=-DBOOST_ALL_NO_LIB endif -ifeq ($(SYSTEM_ZLIB),NO) +ifeq ($(SYSTEM_ZLIB),) liborcus_CPPFLAGS+=$(ZLIB_CFLAGS) endif # patched boost needs to find config_global.h |