[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - ucb/Library_ucpdav1.mk

Tor Lillqvist tml at collabora.com
Wed Apr 30 05:04:38 PDT 2014


 ucb/Library_ucpdav1.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit b918a7fc0d1042d2e93e9c0ac2e865da1a71d739
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Apr 30 15:02:57 2014 +0300

    apr needs libiconv at least on OS X
    
    Change-Id: I8c5be8b8a72b0529b974f2618cad323601854720

diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk
index 51225d2..4322dfc 100644
--- a/ucb/Library_ucpdav1.mk
+++ b/ucb/Library_ucpdav1.mk
@@ -62,6 +62,7 @@ else # WITH_WEBDAV == serf
 $(eval $(call gb_Library_use_externals,ucpdav1,\
 	boost_headers \
 	apr \
+	$(if $(filter $(OS),MACOSX),iconv) \
 	openssl \
 	serf \
 	zlib \


More information about the Libreoffice-commits mailing list