[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - Repository.mk

[Libreoffice Gerrit user]

 Repository.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit edf9184e33e58e8d0064354016ac56a2f0d9054b
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Mar 5 17:28:55 2019 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Mar 6 11:29:08 2019 +0100

    Make mysqlc conditional on MARIADBC, too
    
    Change-Id: I7e8541b8918ea5011fe9669d11b51c941544f794
    Reviewed-on: https://gerrit.libreoffice.org/68764
    Tested-by: Jenkins
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/68783
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/Repository.mk b/Repository.mk
index 36b35b7a4262..f4899a1f66f7 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -404,7 +404,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	$(call gb_Helper_optional,SCRIPTING,msforms) \
 	mtfrenderer \
 	$(if $(ENABLE_JAVA),mysql_jdbc) \
-	$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc) \
+	$(call gb_Helper_optional,MARIADBC,$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc)) \
 	numbertext \
 	odbc \
 	odfflatxml \