[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - configure.ac

[Libreoffice Gerrit user]

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

New commits:
commit 05a5fa6cb71b9482be45e803512e33f977d8af03
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Feb 25 15:40:02 2019 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Feb 27 16:15:49 2019 +0100

    Check enable_mpl_subset, too, for mysqlc
    
    Change-Id: I083583b86fa404eb16eea354ef9e6d22cf4c62fe
    Reviewed-on: https://gerrit.libreoffice.org/68346
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/configure.ac b/configure.ac
index 56ecb282d60e..9d06e2a7961d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8472,7 +8472,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