blob: adcdd427502334edcbfb3e996cd33ee78c8e250c (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
From edf9184e33e58e8d0064354016ac56a2f0d9054b Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Tue, 05 Mar 2019 17:28:55 +0200
Subject: [PATCH] Make mysqlc conditional on MARIADBC, too
Change-Id: I7e8541b8918ea5011fe9669d11b51c941544f794
Reviewed-on: https://gerrit.libreoffice.org/68764
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/68783
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
---
diff --git a/Repository.mk b/Repository.mk
index 36b35b7..f4899a1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -404,7 +404,7 @@
$(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 \
|
