mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENABLE_MARIADBC Harmonize ENABLE_* variable to TRUE/<nothing>

Browse Source 
Change-Id: Icd6f385a8c9fcb67d2e448580e66ab97f63a99a6
This commit is contained in:
Norbert Thiebaud
2013-08-30 22:25:51 -05:00
parent 1bdc9d4380
commit 94730f3590
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@@ -8035,21 +8035,21 @@ AC_SUBST(PYTHON_VERSION_MINOR)
AC_MSG_CHECKING([whether to build the MariaDB/MySQL Connector extension]) 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 if test "x$enable_ext_mariadb_connector" = "xyes" -a "x$enable_extension_integration" != "xno"; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
ENABLE_MARIADBC=YES ENABLE_MARIADBC=TRUE
MARIADBC_MAJOR=1 MARIADBC_MAJOR=1
MARIADBC_MINOR=0 MARIADBC_MINOR=0
MARIADBC_MICRO=2 MARIADBC_MICRO=2
BUILD_TYPE="$BUILD_TYPE MARIADBC" BUILD_TYPE="$BUILD_TYPE MARIADBC"
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
ENABLE_MARIADBC=NO ENABLE_MARIADBC=
fi fi
AC_SUBST(ENABLE_MARIADBC) AC_SUBST(ENABLE_MARIADBC)
AC_SUBST(MARIADBC_MAJOR) AC_SUBST(MARIADBC_MAJOR)
AC_SUBST(MARIADBC_MINOR) AC_SUBST(MARIADBC_MINOR)
AC_SUBST(MARIADBC_MICRO) AC_SUBST(MARIADBC_MICRO)
if test "$ENABLE_MARIADBC" = "YES"; then if test "$ENABLE_MARIADBC" = "TRUE"; then
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_MARIADBC" SCPDEFS="$SCPDEFS -DWITH_EXTENSION_MARIADBC"

2
mysqlc/Module_mysqlc.mk
View File

@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,mysqlc)) $(eval $(call gb_Module_Module,mysqlc))
ifeq ($(ENABLE_MARIADBC),YES) ifeq ($(ENABLE_MARIADBC),TRUE)
$(eval $(call gb_Module_add_targets,mysqlc,\ $(eval $(call gb_Module_add_targets,mysqlc,\
Configuration_mysql \ Configuration_mysql \