normalize values of SYSTEM_ZLIB, SYSTEM_DICTS, SYSTEM_FONTCONFIG

Change-Id: I7530cb9d0797df5fc86695b0379cc44c159d2ab5

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),\

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"

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) \
+		COMPRESS=$(if $(SYSTEM_ZLIB),compress,z_compress) \
-		ZLIB3RDLIB="$(if $(filter YES,$(SYSTEM_ZLIB)),,-L$(WORKDIR)/LinkTarget/StaticLibrary) -lz" \
+		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) \

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

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.

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 \

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)\" \
 ))

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 \
 ))

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 \
 ))