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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Nov 5 10:16:35 UTC 2018


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

New commits:
commit 3c92c347881eee4c63d111fc576c2fb2312f0de7
Author:     Tamas Bunth <tamas.bunth at collabora.co.uk>
AuthorDate: Mon Nov 5 11:11:48 2018 +0100
Commit:     Tamás Bunth <btomi96 at gmail.com>
CommitDate: Mon Nov 5 11:15:37 2018 +0100

    mysql_jdbc should be enabled in Repository.mk..
    
    ..only if java is enabled:
    
    Change-Id: Iaf210e7044e854545518336ed7a40ce615443356
    Reviewed-on: https://gerrit.libreoffice.org/62882
    Reviewed-by: Tamás Bunth <btomi96 at gmail.com>
    Tested-by: Tamás Bunth <btomi96 at gmail.com>

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


More information about the Libreoffice-commits mailing list