normalize values of BUNDLE_MARIADB

Change-Id: I993640f5d4042a75f64fbdd9a6f1e4157a72f909

configure.ac

@@ -8105,7 +8105,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
         AC_MSG_CHECKING([whether to bundle the MySQL/MariaDB client library])
         if test "$enable_bundle_mariadb" = "yes"; then
             AC_MSG_RESULT([yes])
-            BUNDLE_MARIADB=YES
+            BUNDLE_MARIADB=TRUE
             LIBMARIADB=lib$(echo "${MARIADB_LIBS}" | sed -e 's/[[[:space:]]]\+-l/\n/g' | grep -E '(mysqlclient|mariadb)')
             if test "$_os" = "Darwin"; then
                 LIBMARIADB=${LIBMARIADB}.dylib
@@ -8125,7 +8125,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
             fi
         else
             AC_MSG_RESULT([no])
-            BUNDLE_MARIADB=NO
+            BUNDLE_MARIADB=
         fi
     else
         AC_MSG_RESULT([internal])

mysqlc/Extension_mysql-connector-ooo.mk

@@ -26,7 +26,7 @@ ifeq ($(SYSTEM_MYSQL_CPPCONN),)
 $(eval $(call gb_Extension_add_library,mysql-connector-ooo,mysqlcppconn))
 endif
 
-ifeq ($(BUNDLE_MARIADB),YES)
+ifneq ($(BUNDLE_MARIADB),)
 $(eval $(call gb_Extension_add_files,mysql-connector-ooo,,\
        $(LIBMARIADB_PATH)/$(LIBMARIADB) \
 ))

mysqlc/Library_mysqlc.mk

@@ -40,8 +40,7 @@ $(eval $(call gb_Library_add_defs,mysqlc,\
 	-DMARIADBC_VERSION_MICRO=$(MARIADBC_MICRO) \
 	$(if $(SYSTEM_MYSQL_CPPCONN),,\
 	-DCPPCONN_LIB=\"$(call gb_Library_get_runtime_filename,mysqlcppconn)\") \
-	$(if $(filter YES,$(BUNDLE_MARIADB)),\
-	-DBUNDLE_MARIADB=\"$(LIBMARIADB)\") \
+	$(if $(BUNDLE_MARIADB),-DBUNDLE_MARIADB=\"$(LIBMARIADB)\") \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,mysqlc,\