From 5ce5293877aeeb38be4cf5c9716c8bd54b0fd9f7 Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Wed, 7 Nov 2007 09:24:03 +0000
Subject: INTEGRATION: CWS tkr05_SRC680 (1.37.20); FILE MERGED 2007/11/02
 12:41:11 tkr 1.37.20.6: #83234# host name mismatch 2007/11/02 09:49:11 tkr
 1.37.20.5: #83234# host name mismatch 2007/10/19 14:40:21 tkr 1.37.20.4:
 #31053# WebDAV Https Support 2007/10/04 09:08:24 tkr 1.37.20.3: #31053# https
 webdav support 2007/10/01 07:40:25 tkr 1.37.20.2: #31053#: HTTPS Support
 2007/09/20 11:01:16 tkr 1.37.20.1: #i31053#: WebDAV HTTPS Support

---
 ucb/source/ucp/webdav/makefile.mk | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'ucb')

diff --git a/ucb/source/ucp/webdav/makefile.mk b/ucb/source/ucp/webdav/makefile.mk
index 8baaf6b15fb8..70f48bda066d 100644
--- a/ucb/source/ucp/webdav/makefile.mk
+++ b/ucb/source/ucp/webdav/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.39 $
+#   $Revision: 1.40 $
 #
-#   last change: $Author: vg $ $Date: 2007-10-15 13:08:52 $
+#   last change: $Author: rt $ $Date: 2007-11-07 10:24:03 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -127,18 +127,25 @@ SHL1STDLIBS=\
         $(NEON3RDLIB)           \
         $(LIBXML2LIB)
 
+
+
 .IF "$(GUI)"=="WNT"
 SHL1STDLIBS+= $(WSOCK32LIB)
-.ENDIF # WNT
 .IF "$(WINDOWS_VISTA_PSDK)" != ""
-SHL1STDLIBS+= ws2_32.lib
+SHL1STDLIBS+= $(WS2_32LIB)
 .ENDIF
+SHL1STDLIBS+= $(OPENSSLLIB)
+.ELSE # WNT
 .IF "$(OS)"=="SOLARIS"
-SHL1STDLIBS+= -lnsl -lsocket
+SHL1STDLIBS+= -lnsl -lsocket -ldl
 .ENDIF # SOLARIS
 .IF "$(OS)"=="OS2"
 SHL1STDLIBS+= pthread.lib libz.lib
-.ENDIF # SOLARIS
+.ENDIF # OS2
+SHL1STDLIBS+= $(OPENSSLLIBST)
+.ENDIF # WNT
+
+
 
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 SHL1LIBS=$(LIB1TARGET)
-- 
cgit