From 379f978387a8b017a41c2682c0b39444f17a2230 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Tue, 11 Feb 2014 16:49:19 +0100
Subject: normalize values of SYSTEM_FREETYPE, SYSTEM_LIBXML, SYSTEM_MARIADB

Change-Id: Iffcc671ca41c5880579effe0786a3b4d3be0dab0
---
 RepositoryExternal.mk                             | 10 +++++-----
 configure.ac                                      | 10 +++++-----
 external/libabw/ExternalProject_libabw.mk         |  2 +-
 external/libebook/ExternalProject_libebook.mk     |  2 +-
 external/libetonyek/ExternalProject_libetonyek.mk |  2 +-
 external/liblangtag/ExternalProject_langtag.mk    |  6 +++---
 external/libvisio/ExternalProject_libvisio.mk     |  2 +-
 external/libxmlsec/ExternalProject_xmlsec.mk      |  2 +-
 external/libxslt/ExternalProject_xslt.mk          |  2 +-
 external/redland/ExternalProject_raptor.mk        |  6 +++---
 external/redland/ExternalProject_rasqal.mk        |  4 ++--
 external/redland/ExternalProject_redland.mk       |  4 ++--
 sw/Library_swui.mk                                |  2 +-
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ffe0dde04b03..80d91253cc94 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -254,7 +254,7 @@ $(call gb_LinkTarget_add_libs,$(1),-liconv)
 
 endef
 
-ifeq ($(SYSTEM_MARIADB),YES)
+ifneq ($(SYSTEM_MARIADB),)
 
 define gb_LinkTarget__use_mariadb
 $(call gb_LinkTarget_set_include,$(1),\
@@ -286,7 +286,7 @@ endef
 endif # SYSTEM_MARIADB
 
 
-ifeq ($(SYSTEM_MARIADB),YES)
+ifneq ($(SYSTEM_MARIADB),)
 
 define gb_LinkTarget__use_mysql
 
@@ -805,7 +805,7 @@ endef
 endif # SYSTEM_LIBEXTTEXTCAT
 
 
-ifeq ($(SYSTEM_LIBXML),YES)
+ifneq ($(SYSTEM_LIBXML),)
 
 define gb_LinkTarget__use_libxml2
 $(call gb_LinkTarget_add_defs,$(1),\
@@ -1107,7 +1107,7 @@ endef
 
 endif # SYSTEM_CAIRO
 
-ifeq ($(SYSTEM_FREETYPE),YES)
+ifneq ($(SYSTEM_FREETYPE),)
 
 define gb_LinkTarget__use_freetype_headers
 $(call gb_LinkTarget_set_include,$(1),\
@@ -3261,7 +3261,7 @@ endef
 
 # External executables
 
-ifneq ($(SYSTEM_LIBXML_FOR_BUILD),YES)
+ifneq ($(SYSTEM_LIBXML_FOR_BUILD),)
 
 gb_ExternalExecutable__register_xmllint :=
 
diff --git a/configure.ac b/configure.ac
index 4fecc7b5327a..fc59e5a0ed76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7877,7 +7877,7 @@ if test  "$test_freetype" = "yes"; then
     # 9.9.3 is 2.2.0
     PKG_CHECK_MODULES(FREETYPE, freetype2 >= 9.9.3)
     FREETYPE_CFLAGS=$(printf '%s' "$FREETYPE_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
-    SYSTEM_FREETYPE=YES
+    SYSTEM_FREETYPE=TRUE
     _save_libs="$LIBS"
     _save_cflags="$CFLAGS"
     LIBS="$LIBS $FREETYPE_LIBS"
@@ -7980,7 +7980,7 @@ AC_SUBST(XSLTPROC)
 AC_MSG_CHECKING([which libxml to use])
 if test "$with_system_libxml" = "yes"; then
     AC_MSG_RESULT([external])
-    SYSTEM_LIBXML=YES
+    SYSTEM_LIBXML=TRUE
     if test "$_os" = "Darwin"; then
         dnl make sure to use SDK path
         LIBXML_CFLAGS="-I$MACOSX_SDK_PATH/usr/include/libxml2"
@@ -8006,7 +8006,7 @@ if test "$with_system_libxml" = "yes"; then
     libo_MINGW_TRY_DLL([zlib1])
 else
     AC_MSG_RESULT([internal])
-    SYSTEM_LIBXML=NO
+    SYSTEM_LIBXML=
     BUILD_TYPE="$BUILD_TYPE LIBXML2"
 fi
 AC_SUBST(SYSTEM_LIBXML)
@@ -8262,7 +8262,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
     AC_MSG_CHECKING([which MariaDB to use])
     if test "$with_system_mariadb" = "yes"; then
         AC_MSG_RESULT([external])
-        SYSTEM_MARIADB=YES
+        SYSTEM_MARIADB=TRUE
         #AC_PATH_PROG(MARIADBCONFIG, [mariadb_config])
         if test -z "$MARIADBCONFIG"; then
             AC_PATH_PROG(MARIADBCONFIG, [mysql_config])
@@ -8314,7 +8314,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
     else
         AC_MSG_RESULT([internal])
         AC_MSG_ERROR([libmariadb is known to be broken as of 2013-10; use libmysqlclient])
-        SYSTEM_MARIADB=NO
+        SYSTEM_MARIADB=
         MARIADB_CFLAGS="-I${WORKDIR}/UnpackedTarball/mariadb/include"
         MARIADB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lmariadblib"
         BUILD_TYPE="$BUILD_TYPE MARIADB"
diff --git a/external/libabw/ExternalProject_libabw.mk b/external/libabw/ExternalProject_libabw.mk
index d3b3b9f97caf..66be64f55cff 100644
--- a/external/libabw/ExternalProject_libabw.mk
+++ b/external/libabw/ExternalProject_libabw.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
 			--disable-debug \
 			--disable-werror \
 			CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS)) \
-			$(if $(filter NO,$(SYSTEM_LIBXML)),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
+			$(if $(SYSTEM_LIBXML),,-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
 		    $(if $(VERBOSE)$(verbose),V=1) \
diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk
index 05f856647a64..242777fc89f5 100644
--- a/external/libebook/ExternalProject_libebook.mk
+++ b/external/libebook/ExternalProject_libebook.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) :
 			--disable-werror \
 			--disable-weffc \
 			CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS))" \
-			XML_CFLAGS="$(if $(filter NO,$(SYSTEM_LIBXML)),-I$(call gb_UnpackedTarball_get_dir,xml2)/include,$(LIBXML_CFLAGS))" \
+			XML_CFLAGS="$(if $(SYSTEM_LIBXML),$(LIBXML_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
 			XML_LIBS="$(LIBXML_LIBS)" \
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& cd src/lib \
diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk
index b4b558970930..c081d3d4725e 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
 			--disable-weffc \
 			--without-tools \
 			BOOST_CFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS))" \
-			XML_CFLAGS="$(if $(filter NO,$(SYSTEM_LIBXML)),-I$(call gb_UnpackedTarball_get_dir,xml2)/include,$(LIBXML_CFLAGS))" \
+			XML_CFLAGS="$(if $(SYSTEM_LIBXML),$(LIBXML_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
 			XML_LIBS="$(LIBXML_LIBS)" \
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(MAKE) $(if $(VERBOSE)$(verbose),V=1) \
diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk
index b4f17ced3e13..17708155bb10 100644
--- a/external/liblangtag/ExternalProject_langtag.mk
+++ b/external/liblangtag/ExternalProject_langtag.mk
@@ -26,10 +26,10 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
 		$(if $(filter WNTMSC,$(OS)$(COM)),--disable-rebuild-data) \
 		$(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") \
 		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \
-		$(if $(filter NO,$(SYSTEM_LIBXML)),\
+		$(if $(SYSTEM_LIBXML),\
+			$(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)"), \
 			LIBXML2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" \
-			LIBXML2_LIBS=$(if $(filter WNTMSC,$(OS)$(COM)),"-L$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc -llibxml2","-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2"),\
-			$(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)")) \
+			LIBXML2_LIBS=$(if $(filter WNTMSC,$(OS)$(COM)),"-L$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc -llibxml2","-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2")) \
 		$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 		$(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
 		$(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk
index ea6b8515f452..26859e8c4f2d 100644
--- a/external/libvisio/ExternalProject_libvisio.mk
+++ b/external/libvisio/ExternalProject_libvisio.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
 			--disable-debug \
 			--disable-werror \
 			CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS)) \
-			$(if $(filter NO,$(SYSTEM_LIBXML)),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
+			$(if $(SYSTEM_LIBXML),,-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
 		    $(if $(VERBOSE)$(verbose),V=1) \
diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk
index 851a2680539c..06043acd52c3 100644
--- a/external/libxmlsec/ExternalProject_xmlsec.mk
+++ b/external/libxmlsec/ExternalProject_xmlsec.mk
@@ -59,7 +59,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 			$(if $(SYSTEM_NSS),,$(if $(filter MACOSX,$(OS)),--disable-pkgconfig)) \
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-			$(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" LIBXML_LIBS="-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2")\
+			$(if $(SYSTEM_LIBXML),,LIBXML_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" LIBXML_LIBS="-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2")\
 			$(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include" \
 			LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),,-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib)) \
 		&& $(MAKE) \
diff --git a/external/libxslt/ExternalProject_xslt.mk b/external/libxslt/ExternalProject_xslt.mk
index 2b5e89c6bc8c..3fd0b863f1bb 100644
--- a/external/libxslt/ExternalProject_xslt.mk
+++ b/external/libxslt/ExternalProject_xslt.mk
@@ -50,7 +50,7 @@ $(call gb_ExternalProject_get_state_target,xslt,build):
 			$(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
 			$(if $(filter IOS,$(OS)),LIBS="-liconv") \
 			--disable-shared,--disable-static) \
-			$(if $(filter NO,$(SYSTEM_LIBXML)),--with-libxml-src=$(call gb_UnpackedTarball_get_dir,xml2)) \
+			$(if $(SYSTEM_LIBXML),,--with-libxml-src=$(call gb_UnpackedTarball_get_dir,xml2)) \
 		&& chmod 777 xslt-config \
 		&& $(MAKE) \
 	)
diff --git a/external/redland/ExternalProject_raptor.mk b/external/redland/ExternalProject_raptor.mk
index 70d6fe7bf7a6..49a1cdca3b9b 100644
--- a/external/redland/ExternalProject_raptor.mk
+++ b/external/redland/ExternalProject_raptor.mk
@@ -21,14 +21,14 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
 		CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
 		LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;, -L,$(ILIB))" \
 		OBJDUMP="$(HOST_PLATFORM)-objdump" \
-		$(if $(and $(filter YES,$(SYSTEM_LIBXML)),$(filter GCC,$(COM))),PATH="$(MINGW_SYSROOT)/bin:$$PATH") \
+		$(if $(and $(SYSTEM_LIBXML),$(filter GCC,$(COM))),PATH="$(MINGW_SYSROOT)/bin:$$PATH") \
 		./configure --disable-static --enable-shared --disable-gtk-doc \
 			--enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \
 			--with-www=xml \
 			--without-xslt-config \
 			--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --target=$(HOST_PLATFORM) \
 			lt_cv_cc_dll_switch="-shared" \
-			$(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
+			$(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
 		&& $(MAKE) \
 	)
 else
@@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 			$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
-			$(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
+			$(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
 		&& $(MAKE) \
 	)
 endif
diff --git a/external/redland/ExternalProject_rasqal.mk b/external/redland/ExternalProject_rasqal.mk
index 6b695de2ead3..35b46d320fb2 100644
--- a/external/redland/ExternalProject_rasqal.mk
+++ b/external/redland/ExternalProject_rasqal.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
 			--with-digest-library=internal \
 			--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
 			lt_cv_cc_dll_switch="-shared" \
-			$(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
+			$(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
 		&& $(MAKE) \
 	)
 else
@@ -57,7 +57,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 			$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
-			$(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
+			$(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
 		&& $(MAKE) \
 		$(if $(filter MACOSX,$(OS)),&& $(PERL) \
 			$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
diff --git a/external/redland/ExternalProject_redland.mk b/external/redland/ExternalProject_redland.mk
index 9b96c9cfbfa6..552d242d9c2d 100644
--- a/external/redland/ExternalProject_redland.mk
+++ b/external/redland/ExternalProject_redland.mk
@@ -29,7 +29,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
 		PKG_CONFIG="" \
 		RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
 		RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 \
-			$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2)" \
+			$(if $(SYSTEM_LIBXML),$(LIBXML_LIBS),-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2)" \
 		RASQAL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,rasqal)/src" \
 		RASQAL_LIBS="-L$(call gb_UnpackedTarball_get_dir,rasqal)/src/.libs -lrasqal" \
 		./configure --disable-static --disable-gtk-doc \
@@ -52,7 +52,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
 		PKG_CONFIG="" \
 		RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
 		RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2  \
-			$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2)" \
+			$(if $(SYSTEM_LIBXML),$(LIBXML_LIBS),-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2)" \
 		RASQAL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,rasqal)/src" \
 		RASQAL_LIBS="-L$(call gb_UnpackedTarball_get_dir,rasqal)/src/.libs -lrasqal" \
 		./configure --disable-gtk-doc \
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index ab0c2642e78b..b9ef786e8869 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_Library_use_custom_headers,swui,\
 
 $(eval $(call gb_Library_use_sdk_api,swui))
 
-ifeq ($(SYSTEM_LIBXML),YES)
+ifneq ($(SYSTEM_LIBXML),)
 $(eval $(call gb_Library_add_cxxflags,swui,\
 	$(LIBXML_CFLAGS) \
 ))
-- 
cgit