From 645f327ec4009eddac512958bc022a8d668a762c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= <matus.kukan@gmail.com>
Date: Mon, 15 Apr 2013 10:06:30 +0200
Subject: [PATCH] libmerged: fix linking against cppunit again

Fix for: ./program/soffice.bin: error while loading shared libraries:
libcppunit-1.13.so.0: cannot open shared object file: No such file or
directory

Change-Id: Ib73010f69c7fcab0e5759df9e77e0848aa80579f
---
 Library_merged.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Library_merged.mk b/Library_merged.mk
index 044df38720db..43c64891ead8 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_Library_use_libraries,merged,\
 $(eval $(call gb_Library_use_externals,merged,\
 	boostdatetime \
 	$(call gb_Helper_optional,DESKTOP,clucene) \
-	cppunit \
 	cups \
 	curl \
 	expat \
@@ -58,14 +57,20 @@ $(eval $(call gb_Library_use_externals,merged,\
 	lcms2 \
 	libxml2 \
 	libxslt \
-	libexslt \
 	$(if $(filter-out IOS,$(OS)),lpsolve) \
 	mythes \
 	nss3 \
-	$(call gb_Helper_optional,PYUNO,python) \
 	zlib \
 ))
 
+ifeq (ALL,$(MERGELIBS))
+$(eval $(call gb_Library_use_externals,merged,\
+	cppunit \
+	libexslt \
+	$(call gb_Helper_optional,PYUNO,python) \
+))
+endif
+
 ifeq ($(ENABLE_GRAPHITE),TRUE)
 $(eval $(call gb_Library_use_externals,merged,\
 	graphite \