configure.ac | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
New commits:
commit 03c81f23d751bc0e77680b710d02e4722f1d5473
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Wed Sep 2 11:13:31 2020 +0200
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Fri Sep 11 18:24:43 2020 +0200
Add a MariadDB configure option
The code is already disabled on iOS and Android, so this just
allows changing this setting on all platforms via configure.
Also needed for the "minimal" build-tools setup.
Change-Id: I590fda4cdc63b58fc17dcfb9da49c75c858b8fc0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102477
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/configure.ac b/configure.ac
index 42329199cf80..60ad0d917006 100644
--- a/configure.ac
+++ b/configure.ac
@@ -757,6 +757,7 @@ ios*) # iOS
enable_lotuswordpro=no
enable_coinmp=no
enable_lpsolve=no
+ enable_mariadb_sdbc=no
enable_postgresql_sdbc=no
enable_extension_integration=no
enable_report_builder=no
@@ -851,6 +852,7 @@ linux-android*)
enable_mpl_subset=yes
enable_coinmp=yes
enable_lpsolve=no
+ enable_mariadb_sdbc=no
enable_report_builder=no
enable_odk=no
enable_postgresql_sdbc=no
@@ -1559,6 +1561,11 @@ libo_FUZZ_ARG_ENABLE(readonly-installset,
progress, probably not fully implemented. Always enabled for macOS.]),
,)
+libo_FUZZ_ARG_ENABLE(mariadb-sdbc,
+ AS_HELP_STRING([--disable-mariadb-sdbc],
+ [Disable the build of the MariaDB/MySQL-SDBC driver.])
+)
+
libo_FUZZ_ARG_ENABLE(postgresql-sdbc,
AS_HELP_STRING([--disable-postgresql-sdbc],
[Disable the build of the PostgreSQL-SDBC driver.])
@@ -4927,6 +4934,7 @@ if test "$cross_compiling" = "yes"; then
--disable-gpgmepp \
--disable-gstreamer-1-0 \
--disable-gtk3 \
+ --disable-mariadb-sdbc \
--disable-pdfimport \
--disable-postgresql-sdbc \
--enable-icecream="$enable_icecream" \
@@ -9136,17 +9144,18 @@ AC_SUBST(PYTHON_VERSION)
AC_SUBST(PYTHON_VERSION_MAJOR)
AC_SUBST(PYTHON_VERSION_MINOR)
-ENABLE_MARIADBC=TRUE
-if test "$_os" = "Android" -o "$_os" = "iOS" -o "$enable_mpl_subset" = "yes";
then
- ENABLE_MARIADBC=
-fi
+ENABLE_MARIADBC=
MARIADBC_MAJOR=1
MARIADBC_MINOR=0
MARIADBC_MICRO=2
-if test "$ENABLE_MARIADBC" = "TRUE"; then
+AC_MSG_CHECKING([whether to build the MariaDB/MySQL SDBC driver])
+if test "x$enable_mariadb_sdbc" != "xno" -a "$enable_mpl_subset" != "yes"; then
+ ENABLE_MARIADBC=TRUE
+ AC_MSG_RESULT([yes])
BUILD_TYPE="$BUILD_TYPE MARIADBC"
+else
+ AC_MSG_RESULT([no])
fi
-
AC_SUBST(ENABLE_MARIADBC)
AC_SUBST(MARIADBC_MAJOR)
AC_SUBST(MARIADBC_MINOR)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
