diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-26 11:43:52 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-26 11:43:52 +0000 |
| commit | 786b715d390a98ade7835d99b8b5909cbfe30d7e (patch) | |
| tree | 37d9e47fb8e4ea98cf6b9a87d7eaebf892c65606 /ucb/source/ucp/webdav/makefile.mk | |
| parent | 475c67ca23043b92a52d86bef280fe747980562d (diff) | |
INTEGRATION: CWS openssl01 (1.40.4); FILE MERGED
2007/11/21 14:19:14 rt 1.40.4.1: #i83731# System openssl. Fix by rene, joined from CWS configure22.
Diffstat (limited to 'ucb/source/ucp/webdav/makefile.mk')
| -rw-r--r-- | ucb/source/ucp/webdav/makefile.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ucb/source/ucp/webdav/makefile.mk b/ucb/source/ucp/webdav/makefile.mk index 70f48bda066d..d8c3059656d6 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.40 $ +# $Revision: 1.41 $ # -# last change: $Author: rt $ $Date: 2007-11-07 10:24:03 $ +# last change: $Author: ihi $ $Date: 2007-11-26 12:43:52 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -83,6 +83,10 @@ LIBXMLINCDIR=external$/libxml CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDIR) .ENDIF +.IF "$(SYSTEM_OPENSSL)" == "YES" +CFLAGS+= $(OPENSSL_CFLAGS) +.ENDIF + # --- General ----------------------------------------------------- SLOFILES=\ @@ -142,7 +146,11 @@ SHL1STDLIBS+= -lnsl -lsocket -ldl .IF "$(OS)"=="OS2" SHL1STDLIBS+= pthread.lib libz.lib .ENDIF # OS2 +.IF "$(SYSTEM_OPENSSL)"=="YES" +SHL1STDLIBS+= $(OPENSSLLIB) +.ELSE SHL1STDLIBS+= $(OPENSSLLIBST) +.ENDIF .ENDIF # WNT |