diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-07-19 08:39:08 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-07-19 08:39:08 +0000 |
| commit | ba113bdf1223901dc7ee867eb414a532c666a23f (patch) | |
| tree | 043fef3d01eb33f06e508e93d91fa21fd56292f1 /xmlsecurity/util | |
| parent | 770da6053b1349e1aa9fd8148a6148532dd3cba4 (diff) | |
INTEGRATION: CWS configure18 (1.18.70); FILE MERGED
2006/06/11 14:25:30 rene 1.18.70.1: #i64860# system mozilla with special nspr/nss library paths
Diffstat (limited to 'xmlsecurity/util')
| -rw-r--r-- | xmlsecurity/util/makefile.mk | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/xmlsecurity/util/makefile.mk b/xmlsecurity/util/makefile.mk index 63cbe19b0cba..d177340e2517 100644 --- a/xmlsecurity/util/makefile.mk +++ b/xmlsecurity/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.18 $ +# $Revision: 1.19 $ # -# last change: $Author: rt $ $Date: 2005-09-09 17:46:21 $ +# last change: $Author: kz $ $Date: 2006-07-19 09:39:08 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -108,6 +108,15 @@ SHL2STDLIBS += \ $(CPPUHELPERLIB) \ $(XMLOFFLIB) +.IF "$(SYSTEM_MOZILLA)" == "YES" +.IF "$(NSPR_LIB)" != "" +SHL2STDLIBS += $(NSPR_LIB) +.ENDIF +.IF "$(NSS_LIB)" != "" +SHL2STDLIBS += $(NSS_LIB) +.ENDIF +.ENDIF + .IF "$(CRYPTO_ENGINE)" == "mscrypto" SHL2STDLIBS+= $(MSCRYPTOLIBS) .ELSE |