summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-02-11 16:21:04 +0100
committerMichael Stahl <mstahl@redhat.com>2014-02-12 09:53:08 +0100
commit04ff535f72c1fbc5f7dbc8cc54ed9b23f7e130f9 (patch)
tree52cb40ab9b0e01c26e6b94f1039bc5d36a578f59
parent23647595d77b85b5dac0d5762987a3ba2533ffd9 (diff)
normalize values of SYSTEM_ZLIB, SYSTEM_DICTS, SYSTEM_FONTCONFIG
Change-Id: I7530cb9d0797df5fc86695b0379cc44c159d2ab5
-rw-r--r--RepositoryExternal.mk4
-rw-r--r--configure.ac10
-rw-r--r--external/cairo/ExternalProject_cairo.mk4
-rw-r--r--external/liborcus/ExternalProject_liborcus.mk4
-rw-r--r--external/nss/nss.patch2
-rw-r--r--external/zlib/Module_zlib.mk2
-rw-r--r--lingucomponent/StaticLibrary_ulingu.mk2
-rw-r--r--package/Library_package2.mk2
-rw-r--r--sc/Library_scfilt.mk2
9 files changed, 16 insertions, 16 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 24300dbe3bab..e3b6fc255713 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -353,7 +353,7 @@ endef
endif
-ifeq ($(SYSTEM_ZLIB),YES)
+ifneq ($(SYSTEM_ZLIB),)
define gb_LinkTarget__use_zlib
$(call gb_LinkTarget_add_defs,$(1),\
@@ -1148,7 +1148,7 @@ endef
endif # SYSTEM_FREETYPE
-ifeq ($(SYSTEM_FONTCONFIG),YES)
+ifneq ($(SYSTEM_FONTCONFIG),)
define gb_LinkTarget__use_fontconfig
$(call gb_LinkTarget_set_include,$(1),\
diff --git a/configure.ac b/configure.ac
index c936927ac3dc..2f3c87dd96c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4720,7 +4720,7 @@ AC_SUBST(ENABLE_CUPS)
# fontconfig checks
if test "$test_fontconfig" = "yes"; then
PKG_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.4.1])
- SYSTEM_FONTCONFIG=YES
+ SYSTEM_FONTCONFIG=TRUE
fi
AC_SUBST(FONTCONFIG_CFLAGS)
AC_SUBST(FONTCONFIG_LIBS)
@@ -4794,7 +4794,7 @@ fi
AC_MSG_CHECKING([whether to use dicts from external paths])
if test -z "$with_system_dicts" -o "$with_system_dicts" != "no"; then
AC_MSG_RESULT([yes])
- SYSTEM_DICTS=YES
+ SYSTEM_DICTS=TRUE
AC_MSG_CHECKING([for spelling dictionary directory])
if test -n "$with_external_dict_dir"; then
DICT_SYSTEM_DIR=file://$with_external_dict_dir
@@ -4821,7 +4821,7 @@ if test -z "$with_system_dicts" -o "$with_system_dicts" != "no"; then
AC_MSG_RESULT([$THES_SYSTEM_DIR])
else
AC_MSG_RESULT([no])
- SYSTEM_DICTS=NO
+ SYSTEM_DICTS=
fi
AC_SUBST(SYSTEM_DICTS)
AC_SUBST(DICT_SYSTEM_DIR)
@@ -7667,14 +7667,14 @@ dnl libo_CHECK_SYSTEM_MODULE([zlib],[ZLIB],[zlib])
AC_MSG_CHECKING([which zlib to use])
if test "$with_system_zlib" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_ZLIB=YES
+ SYSTEM_ZLIB=TRUE
AC_CHECK_HEADER(zlib.h, [],
[AC_MSG_ERROR(zlib.h not found. install zlib)], [])
AC_CHECK_LIB(z, deflate, [ ZLIB=-lz ],
[AC_MSG_ERROR(zlib not found or functional)], [])
else
AC_MSG_RESULT([internal])
- SYSTEM_ZLIB=NO
+ SYSTEM_ZLIB=
BUILD_TYPE="$BUILD_TYPE ZLIB"
ZLIB_CFLAGS="-I${WORKDIR}/UnpackedTarball/zlib"
ZLIB_LIBS="-lzlib"
diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk
index 90420f63dde3..d055db06429c 100644
--- a/external/cairo/ExternalProject_cairo.mk
+++ b/external/cairo/ExternalProject_cairo.mk
@@ -36,8 +36,8 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
$(if $(filter ANDROID IOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \
pixman_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman" \
pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \
- COMPRESS=$(if $(filter YES,$(SYSTEM_ZLIB)),compress,z_compress) \
- ZLIB3RDLIB="$(if $(filter YES,$(SYSTEM_ZLIB)),,-L$(WORKDIR)/LinkTarget/StaticLibrary) -lz" \
+ COMPRESS=$(if $(SYSTEM_ZLIB),compress,z_compress) \
+ ZLIB3RDLIB="$(if $(SYSTEM_ZLIB),,-L$(WORKDIR)/LinkTarget/StaticLibrary) -lz" \
png_REQUIRES="trick_configure_into_using_png_CFLAGS_and_LIBS" \
png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \
$(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \
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
diff --git a/external/nss/nss.patch b/external/nss/nss.patch
index 37caae09aeb7..95a00491c512 100644
--- a/external/nss/nss.patch
+++ b/external/nss/nss.patch
@@ -48,7 +48,7 @@
endif
endif
-+ifeq ($(SYSTEM_ZLIB),YES)
++ifneq ($(SYSTEM_ZLIB),)
+# Currently (3.12.4) only the tools modutil and signtool are linked with libz
+# If USE_SYSTEM_ZLIB is not set then the tools link statically libzlib.a which
+# is also build in nss.
diff --git a/external/zlib/Module_zlib.mk b/external/zlib/Module_zlib.mk
index 7241df0d63e9..8f71c506d476 100644
--- a/external/zlib/Module_zlib.mk
+++ b/external/zlib/Module_zlib.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,zlib))
-ifeq ($(SYSTEM_ZLIB),NO)
+ifeq ($(SYSTEM_ZLIB),)
$(eval $(call gb_Module_add_targets,zlib,\
StaticLibrary_zlib \
diff --git a/lingucomponent/StaticLibrary_ulingu.mk b/lingucomponent/StaticLibrary_ulingu.mk
index f5f8ed9c43c0..434775939a65 100644
--- a/lingucomponent/StaticLibrary_ulingu.mk
+++ b/lingucomponent/StaticLibrary_ulingu.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_StaticLibrary_use_api,ulingu,\
offapi \
))
-ifeq ($(SYSTEM_DICTS),YES)
+ifneq ($(SYSTEM_DICTS),)
$(eval $(call gb_StaticLibrary_add_defs,ulingu,\
-DSYSTEM_DICTS -DDICT_SYSTEM_DIR=\"$(DICT_SYSTEM_DIR)\" -DHYPH_SYSTEM_DIR=\"$(HYPH_SYSTEM_DIR)\" -DTHES_SYSTEM_DIR=\"$(THES_SYSTEM_DIR)\" \
))
diff --git a/package/Library_package2.mk b/package/Library_package2.mk
index a47e1b8847f6..4f3a2155e594 100644
--- a/package/Library_package2.mk
+++ b/package/Library_package2.mk
@@ -65,7 +65,7 @@ $(eval $(call gb_Library_add_exception_objects,package2,\
package/source/zippackage/ZipPackageStream \
))
-ifeq ($(SYSTEM_ZLIB),YES)
+ifneq ($(SYSTEM_ZLIB),)
$(eval $(call gb_Library_add_defs,package2,\
-DSYSTEM_ZLIB \
))
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index eb0d5d247036..061e0549b998 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -231,7 +231,7 @@ $(eval $(call gb_Library_use_externals,scfilt,\
zlib \
))
-ifeq ($(SYSTEM_ZLIB),YES)
+ifneq ($(SYSTEM_ZLIB),)
$(eval $(call gb_Library_add_defs,scfilt,\
-DSYSTEM_ZLIB \
))