configure.ac | 7 ++++++-
postprocess/Rdb_services.mk | 4 +++-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 91e6d9c757ee16a3219b57aca9b6b00b99a840f1
Author: Miklos Vajna <vmik...@collabora.co.uk>
AuthorDate: Mon Aug 27 11:45:21 2018 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Mon Aug 27 13:34:45 2018 +0200
Android: disable mariadb
Change-Id: I32502b6b412afbe4c46a6efe0ca49dc50913673d
Reviewed-on: https://gerrit.libreoffice.org/59651
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/configure.ac b/configure.ac
index 72d560d1b8d6..26f66b92d1a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8316,10 +8316,15 @@ AC_SUBST(PYTHON_VERSION_MAJOR)
AC_SUBST(PYTHON_VERSION_MINOR)
ENABLE_MARIADBC=TRUE
+if test "$_os" = "Android"; then
+ ENABLE_MARIADBC=
+fi
MARIADBC_MAJOR=1
MARIADBC_MINOR=0
MARIADBC_MICRO=2
-BUILD_TYPE="$BUILD_TYPE MARIADBC"
+if test "$ENABLE_MARIADBC" = "TRUE"; then
+ BUILD_TYPE="$BUILD_TYPE MARIADBC"
+fi
AC_SUBST(ENABLE_MARIADBC)
AC_SUBST(MARIADBC_MAJOR)
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 054af64345af..e5ab844e28ad 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -257,7 +257,9 @@ $(eval $(call gb_Rdb_add_components,services,\
connectivity/source/drivers/firebird/firebird_sdbc \
) \
connectivity/source/drivers/flat/flat \
- connectivity/source/drivers/mysqlc/mysqlc \
+ $(if $(ENABLE_MARIADBC), \
+ connectivity/source/drivers/mysqlc/mysqlc \
+ ) \
$(if $(filter MACOSX,$(OS)), \
connectivity/source/drivers/macab/macab1 \
) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
