[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - postprocess/Rdb_services.mk

[Libreoffice Gerrit user]

 postprocess/Rdb_services.mk |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c7c3b3105cffa047721f00b3ca56a1ef4ed8b8aa
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Jan 23 23:57:42 2019 +0000
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Jan 24 09:29:22 2019 +0000

    don't build MariaDB Connector with MPLv2 subset
    
    Change-Id: I77159776e2f6625cdd23d1b11b36485325da2a3c

diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 6e569eacda73..934c458720cb 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -252,7 +252,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 $(filter $(ENABLE_MARIADBC),TRUE), \
+		connectivity/source/drivers/mysqlc/mysqlc \
+	) \
 	$(if $(filter MACOSX,$(OS)), \
 		connectivity/source/drivers/macab/macab1 \
 	) \