[Libreoffice-commits] core.git: solenv/gbuild

[Matúš Kukan]

 solenv/gbuild/extensions/pre_MergedLibsList.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8165fc23014c8044c131cb6e1fd0c5e06fd0da2d
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Wed Sep 3 22:07:01 2014 +0200

    Fix mergelibs build by adding dbtools to libmerged
    
    Because svxcore links against dbtools since
    86bdb13704d9d85a247339071a86d301ce86cd7f
    
    Change-Id: Ibbdd76fc77c3739756d011ae0c1fd99bab57834b

diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 99f9302..859ea8a 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) \