configure.ac | 6 +++---
mysqlc/Module_mysqlc.mk | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 94730f359023a3e90fd6d5239a12a150f41f4dd2
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Fri Aug 30 22:25:51 2013 -0500
ENABLE_MARIADBC Harmonize ENABLE_* variable to TRUE/<nothing>
Change-Id: Icd6f385a8c9fcb67d2e448580e66ab97f63a99a6
diff --git a/configure.ac b/configure.ac
index f613f9f..0cd3093 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8035,21 +8035,21 @@ AC_SUBST(PYTHON_VERSION_MINOR)
AC_MSG_CHECKING([whether to build the MariaDB/MySQL Connector extension])
if test "x$enable_ext_mariadb_connector" = "xyes" -a
"x$enable_extension_integration" != "xno"; then
AC_MSG_RESULT([yes])
- ENABLE_MARIADBC=YES
+ ENABLE_MARIADBC=TRUE
MARIADBC_MAJOR=1
MARIADBC_MINOR=0
MARIADBC_MICRO=2
BUILD_TYPE="$BUILD_TYPE MARIADBC"
else
AC_MSG_RESULT([no])
- ENABLE_MARIADBC=NO
+ ENABLE_MARIADBC=
fi
AC_SUBST(ENABLE_MARIADBC)
AC_SUBST(MARIADBC_MAJOR)
AC_SUBST(MARIADBC_MINOR)
AC_SUBST(MARIADBC_MICRO)
-if test "$ENABLE_MARIADBC" = "YES"; then
+if test "$ENABLE_MARIADBC" = "TRUE"; then
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_MARIADBC"
diff --git a/mysqlc/Module_mysqlc.mk b/mysqlc/Module_mysqlc.mk
index 70629a1..8274b0d 100644
--- a/mysqlc/Module_mysqlc.mk
+++ b/mysqlc/Module_mysqlc.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,mysqlc))
-ifeq ($(ENABLE_MARIADBC),YES)
+ifeq ($(ENABLE_MARIADBC),TRUE)
$(eval $(call gb_Module_add_targets,mysqlc,\
Configuration_mysql \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
