summaryrefslogtreecommitdiff
path: root/xmlsecurity
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2005-03-30 10:36:32 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2005-03-30 10:36:32 +0000
commit109a35e5e3a5752dc43f83b39470ec03795278de (patch)
tree36d8a248c4c1136b7561ba6efb67858b42b810ff /xmlsecurity
parent7c01e6050f776d92baed8b4115f37de7d3ae7804 (diff)
INTEGRATION: CWS systemmozilla (1.3.14); FILE MERGED
2005/03/03 13:40:21 rene 1.3.14.4: #i17187# reanimate --disable-mozilla 2005/01/17 19:03:45 rene 1.3.14.3: revert MOZ_NSS_HACK part of last commit, broken/incomplete 2005/01/17 13:32:05 rene 1.3.14.2: implement MOZ_NSS_HACK to build even without PK11_GetCertFromPrivateKey missing from mozilla and use nssrenam.h, needed for e.g. CERT_DecodeDERCertificate availavailablity 2005/01/06 18:58:38 rene 1.3.14.1: #i17187# use system mozilla ... (patch)
Diffstat (limited to 'xmlsecurity')
-rw-r--r--xmlsecurity/source/xmlsec/nss/makefile.mk24
1 files changed, 20 insertions, 4 deletions
diff --git a/xmlsecurity/source/xmlsec/nss/makefile.mk b/xmlsecurity/source/xmlsec/nss/makefile.mk
index 067d14fac86a..d15808b9223f 100644
--- a/xmlsecurity/source/xmlsec/nss/makefile.mk
+++ b/xmlsecurity/source/xmlsec/nss/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.3 $
+# $Revision: 1.4 $
#
-# last change: $Author: pjunck $ $Date: 2004-10-27 14:57:28 $
+# last change: $Author: rt $ $Date: 2005-03-30 11:36:32 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -84,10 +84,20 @@ LIBTARGET=NO
.IF "$(CRYPTO_ENGINE)" == "nss"
+.IF "$(WITH_MOZILLA)" == "NO"
+@all:
+ @echo "No mozilla -> no nss -> no libxmlsec -> no xmlsecurity/nss"
+.ENDIF
+
+.IF "$(SYSTEM_MOZILLA)" != "YES"
MOZ_INC = $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
NSS_INC = $(MOZ_INC)$/nss
NSPR_INC = $(MOZ_INC)$/nspr
-
+.ELSE
+# MOZ_INC already defined from environment
+NSS_INC = $(MOZ_NSS_CFLAGS)
+NSPR_INC = $(MOZ_INC)$/nspr
+.ENDIF
.IF "$(GUI)"=="UNX"
.IF "$(COMNAME)"=="sunpro5"
@@ -136,12 +146,18 @@ CDEFS += -DTRACING
CDEFS += -DXMLSEC_CRYPTO_NSS -DXMLSEC_NO_XSLT
# --- Files --------------------------------------------------------
+
SOLARINC += \
-I$(MOZ_INC) \
-I$(NSPR_INC) \
--I$(NSS_INC) \
-I$(PRJ)$/source$/xmlsec
+.IF "$(SYSTEM_MOZILLA)" == "YES"
+SOLARINC += -DSYSTEM_MOZILLA $(NSS_INC)
+.ELSE
+SOLARINC += -I$(NSS_INC)
+.ENDIF
+
SLOFILES = \
$(SLO)$/moz_profile.obj \
$(SLO)$/securityenvironment_nssimpl.obj \