normalize values of SYSTEM_PYTHON, SYSTEM_MYSQL_CPPCONN

Change-Id: I8932febdd39c35f23fb3a89703b69e25302f5678

RepositoryExternal.mk

@@ -316,7 +316,7 @@ endef
 
 endif
 
-ifeq ($(SYSTEM_MYSQL_CPPCONN),YES)
+ifneq ($(SYSTEM_MYSQL_CPPCONN),)
 
 define gb_LinkTarget__use_mysqlcppconn
 $(call gb_LinkTarget_add_libs,$(1),\
@@ -2604,7 +2604,7 @@ endif # ENABLE_GCONF
 
 # PYTHON
 # extra python_headers external because pyuno wrapper must not link python
-ifeq ($(SYSTEM_PYTHON),YES)
+ifneq ($(SYSTEM_PYTHON),)
 
 define gb_LinkTarget__use_python_headers
 $(call gb_LinkTarget_add_defs,$(1),\

configure.ac

@@ -8170,7 +8170,7 @@ fi
 dnl By now enable_python should be "system", "internal" or "no"
 case $enable_python in
 system)
-    SYSTEM_PYTHON=YES
+    SYSTEM_PYTHON=TRUE
 
     if test "$CROSS_COMPILING" != YES; then
         dnl Check if the headers really work
@@ -8201,7 +8201,7 @@ int main(int argc, char **argv) {
     ;;
 
 internal)
-    SYSTEM_PYTHON=NO
+    SYSTEM_PYTHON=
     PYTHON_VERSION_MAJOR=3
     PYTHON_VERSION_MINOR=3
     PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.3
@@ -8220,7 +8220,7 @@ internal)
     ;;
 no)
     DISABLE_PYTHON=TRUE
-    SYSTEM_PYTHON=NO
+    SYSTEM_PYTHON=
     ;;
 *)
     AC_MSG_ERROR([Internal configure script error, invalid enable_python value "$enable_python"])
@@ -8336,7 +8336,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
     AC_MSG_CHECKING([MySQL Connector/C++])
     if test "$with_system_mysql_cppconn" = "yes"; then
         AC_MSG_RESULT([external])
-        SYSTEM_MYSQL_CPPCONN=YES
+        SYSTEM_MYSQL_CPPCONN=TRUE
         AC_LANG_PUSH([C++])
         AC_CHECK_HEADER(mysql_driver.h, [],
                     [AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++ Connectivity)], [])
@@ -8365,7 +8365,7 @@ int main(int argc, char **argv) {
     else
         AC_MSG_RESULT([internal])
         BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN"
-        SYSTEM_MYSQL_CPPCONN=NO
+        SYSTEM_MYSQL_CPPCONN=
     fi
     AC_LANG_POP([C++])
 fi

external/python3/Module_python3.mk

@@ -10,7 +10,7 @@
 $(eval $(call gb_Module_Module,python3))
 
 ifneq ($(DISABLE_PYTHON),TRUE)
-ifeq ($(SYSTEM_PYTHON),NO)
+ifeq ($(SYSTEM_PYTHON),)
 
 $(eval $(call gb_Module_add_targets,python3,\
 	UnpackedTarball_python3 \

instsetoo_native/CustomTarget_setup.mk

@@ -86,7 +86,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	( \
 		printf '[Bootstrap]\n' && \
-		$(if $(filter YES,$(SYSTEM_PYTHON)),, \
+		$(if $(SYSTEM_PYTHON),, \
 			printf 'PYUNO_LOADER_PYTHONHOME=%s\n' \
 				$(if $(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE), \
 					'$$ORIGIN/../Frameworks/LibreOfficePython.framework', \
@@ -94,7 +94,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
 					'$$ORIGIN/LibreOfficePython.framework', \
 					'$$ORIGIN/python-core-$(PYTHON_VERSION)')) &&) \
 		printf 'PYUNO_LOADER_PYTHONPATH=%s$$ORIGIN\n' \
-			$(if $(filter YES,$(SYSTEM_PYTHON)), \
+			$(if $(SYSTEM_PYTHON), \
 				'', \
 			$(if $(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE), \
 				'$(foreach dir,/ /lib-dynload /lib-tk /site-packages,$(patsubst %/,%,$$ORIGIN/../Frameworks/LibreOfficePython.framework/Versions/Current/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(dir))) ', \

mysqlc/Extension_mysql-connector-ooo.mk

@@ -22,7 +22,7 @@ $(eval $(call gb_Extension_add_files,mysql-connector-ooo,images,\
     $(SRCDIR)/icon-themes/galaxy/desktop/res/extension_32.png \
 ))
 
-ifeq ($(SYSTEM_MYSQL_CPPCONN),NO)
+ifeq ($(SYSTEM_MYSQL_CPPCONN),)
 $(eval $(call gb_Extension_add_library,mysql-connector-ooo,mysqlcppconn))
 endif
 

mysqlc/Library_mysqlc.mk

@@ -16,7 +16,7 @@ $(eval $(call gb_Library_use_externals,mysqlc,\
 	mysqlcppconn \
 ))
 
-ifeq ($(SYSTEM_MYSQL_CPPCONN),NO)
+ifeq ($(SYSTEM_MYSQL_CPPCONN),)
 $(eval $(call gb_Library_add_libs,mysqlc,\
 	$(if $(filter-out WNT,$(OS)),$(if $(filter MACOSX SOLARIS,$(OS)),-lz -lm,\
 	-rdynamic -lz -lcrypt -lnsl -lm)) \
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_add_defs,mysqlc,\
 	-DMARIADBC_VERSION_MAJOR=$(MARIADBC_MAJOR) \
 	-DMARIADBC_VERSION_MINOR=$(MARIADBC_MINOR) \
 	-DMARIADBC_VERSION_MICRO=$(MARIADBC_MICRO) \
-	$(if $(filter NO,$(SYSTEM_MYSQL_CPPCONN)),\
+	$(if $(SYSTEM_MYSQL_CPPCONN),,\
 	-DCPPCONN_LIB=\"$(call gb_Library_get_runtime_filename,mysqlcppconn)\") \
 	$(if $(filter YES,$(BUNDLE_MARIADB)),\
 	-DBUNDLE_MARIADB=\"$(LIBMARIADB)\") \

pyuno/CustomTarget_zipcore.mk

@@ -10,7 +10,7 @@
 $(eval $(call gb_CustomTarget_CustomTarget,pyuno/zipcore))
 
 # system python (only mingw)
-ifeq ($(SYSTEM_PYTHON),YES)
+ifneq ($(SYSTEM_PYTHON),)
 # mingw: MINGW_SYSROOT is defined in configure
 ifeq ($(OS)$(COM),WNTGCC)
 pyuno_PYTHON_LIB_DIR=$(MINGW_SYSROOT)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)

pyuno/Module_pyuno.mk

@@ -28,7 +28,7 @@ endif
 # Windows: only --enable-python=internal possible
 # mingw: both cases possible: internal && system
 # that why it makes sense to handle the next 3 targets
-# with SYSTEM_PYTHON=YES and SYSTEM_PYTHON=NO
+# with SYSTEM_PYTHON=TRUE and SYSTEM_PYTHON=
 
 # zipcore: pyuno/python.exe on Windows
 ifeq ($(OS),WNT)
@@ -37,7 +37,7 @@ $(eval $(call gb_Module_add_targets,pyuno,\
 ))
 endif
 
-ifneq ($(SYSTEM_PYTHON),YES)
+ifeq ($(SYSTEM_PYTHON),)
 
 # zipcore: python.sh on Unix
 ifneq ($(OS),WNT)

scp2/InstallModule_ooo.mk

@@ -109,7 +109,7 @@ ifeq ($(DISABLE_PYTHON),TRUE)
 $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
 	-DDISABLE_PYUNO \
 ))
-else ifeq ($(SYSTEM_PYTHON),YES)
+else ifneq ($(SYSTEM_PYTHON),)
 $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
 	-DSYSTEM_PYTHON \
 ))

scp2/InstallModule_python.mk

@@ -13,7 +13,7 @@ ifeq ($(DISABLE_PYTHON),TRUE)
 $(eval $(call gb_InstallModule_add_defs,scp2/python,\
 	-DDISABLE_PYUNO \
 ))
-else ifeq ($(SYSTEM_PYTHON),YES)
+else ifneq ($(SYSTEM_PYTHON),)
 $(eval $(call gb_InstallModule_add_defs,scp2/python,\
 	-DSYSTEM_PYTHON \
 ))

solenv/gbuild/PythonTest.mk

@@ -9,7 +9,7 @@
 
 # PythonTest class
 
-ifeq ($(SYSTEM_PYTHON),NO)
+ifeq ($(SYSTEM_PYTHON),)
 gb_PythonTest_EXECUTABLE := $(gb_Python_INSTALLED_EXECUTABLE)
 gb_PythonTest_EXECUTABLE_GDB := $(gb_Python_INSTALLED_EXECUTABLE_GDB)
 else