[Libreoffice-commits] core.git: configure.ac

[Libreoffice Gerrit user]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ac9ff2df4b02a24394935e27b184009edca9d6c5
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Feb 25 15:40:02 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Feb 25 15:43:09 2019 +0200

    Check enable_mpl_subset, too, for mysqlc
    
    Change-Id: I083583b86fa404eb16eea354ef9e6d22cf4c62fe

diff --git a/configure.ac b/configure.ac
index 54cdf16f7faf..3b28ca40cef1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8616,7 +8616,7 @@ AC_SUBST(PYTHON_VERSION_MAJOR)
 AC_SUBST(PYTHON_VERSION_MINOR)
 
 ENABLE_MARIADBC=TRUE
-if test "$_os" = "Android" -o "$_os" = "iOS"; then
+if test "$_os" = "Android" -o "$_os" = "iOS" -o "$enable_mpl_subset" = "yes"; then
     ENABLE_MARIADBC=
 fi
 MARIADBC_MAJOR=1