configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f3818e9a3984c81e2eb4b9ed6e5421584dfbe028
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Jan 23 23:57:42 2019 +0000
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Jan 23 23:57:42 2019 +0000
don't build MariaDB Connector with MPLv2 subset
Change-Id: I77159776e2f6625cdd23d1b11b36485325da2a3c
diff --git a/configure.ac b/configure.ac
index 1dc26523921c..795712ea084e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8104,7 +8104,7 @@ AC_SUBST(PYTHON_VERSION_MAJOR)
AC_SUBST(PYTHON_VERSION_MINOR)
ENABLE_MARIADBC=TRUE
-if test "$_os" = "iOS"; then
+if test "$_os" = "iOS" -o "$enable_mpl_subset" = "yes"; then
ENABLE_MARIADBC=
fi
MARIADBC_MAJOR=1
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
