[Libreoffice-commits] core.git: Repository.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Mar 5 21:55:29 UTC 2019


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

New commits:
commit 525bc99af37787cfee8408fb14a88adf2bf735b2
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Mar 5 17:28:55 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Mar 5 22:55:05 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>

diff --git a/Repository.mk b/Repository.mk
index c0e797b7106b..59c93c206466 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -405,7 +405,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	$(call gb_Helper_optional,SCRIPTING,msforms) \
 	mtfrenderer \
 	$(call gb_Helper_optional,DBCONNECTIVITY,mysql_jdbc) \
-	$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc) \
+	$(call gb_Helper_optional,MARIADBC,$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc)) \
 	numbertext \
 	odbc \
 	odfflatxml \


More information about the Libreoffice-commits mailing list