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

[Libreoffice Gerrit user]

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

New commits:
commit 117c88629df9fd922927f5aab1a1076183b9ddc9
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Nov 16 08:39:47 2018 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Nov 16 08:39:47 2018 +0100

    apparently libmysqllo.so is built only when Java is enabled
    
    Change-Id: I14c1a3650c5933f0435936afc82438a53a34bba1

diff --git a/Repository.mk b/Repository.mk
index 6c617dd2843b..2adacbe520f1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -390,7 +390,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	$(call gb_Helper_optional,SCRIPTING,msforms) \
 	mtfrenderer \
 	$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc) \
-	$(call gb_Helper_optional,DBCONNECTIVITY,mysql) \
+	$(if $(ENABLE_JAVA),$(call gb_Helper_optional,DBCONNECTIVITY,mysql)) \
 	odbc \
 	odfflatxml \
 	offacc \