From 8165fc23014c8044c131cb6e1fd0c5e06fd0da2d Mon Sep 17 00:00:00 2001
From: Matúš Kukan <matus.kukan@collabora.com>
Date: Wed, 3 Sep 2014 22:07:01 +0200
Subject: Fix mergelibs build by adding dbtools to libmerged

Because svxcore links against dbtools since
86bdb13704d9d85a247339071a86d301ce86cd7f

Change-Id: Ibbdd76fc77c3739756d011ae0c1fd99bab57834b
---
 solenv/gbuild/extensions/pre_MergedLibsList.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'solenv')

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 99f93021b546..859ea8a0da73 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -113,6 +113,7 @@ gb_MERGEDLIBS := \
 	canvastools \
 	configmgr \
 	cppcanvas \
+	$(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \
 	deployment \
 	deploymentmisc \
 	$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
-- 
cgit