diff options
Diffstat (limited to 'xmlsecurity/source/xmlsec')
| -rw-r--r-- | xmlsecurity/source/xmlsec/makefile.mk | 6 | ||||
| -rw-r--r-- | xmlsecurity/source/xmlsec/nss/makefile.mk | 10 |
2 files changed, 4 insertions, 12 deletions
diff --git a/xmlsecurity/source/xmlsec/makefile.mk b/xmlsecurity/source/xmlsec/makefile.mk index 2b243e42904a..34088dc26979 100644 --- a/xmlsecurity/source/xmlsec/makefile.mk +++ b/xmlsecurity/source/xmlsec/makefile.mk @@ -37,11 +37,9 @@ ENABLE_EXCEPTIONS = TRUE CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) .ENDIF -.IF "$(WITH_MOZILLA)" == "NO" || "$(ENABLE_NSS_MODULE)"!="YES" -.IF "$(SYSTEM_MOZILLA)" != "YES" +.IF "$(ENABLE_NSS_MODULE)"!="YES" @all: - @echo "No mozilla -> no nss -> no libxmlsec -> no xmlsecurity.." -.ENDIF + @echo "No nss -> no libxmlsec -> no xmlsecurity.." .ENDIF .IF "$(CRYPTO_ENGINE)" == "mscrypto" diff --git a/xmlsecurity/source/xmlsec/nss/makefile.mk b/xmlsecurity/source/xmlsec/nss/makefile.mk index 18b07ce4707f..c267e1151b40 100644 --- a/xmlsecurity/source/xmlsec/nss/makefile.mk +++ b/xmlsecurity/source/xmlsec/nss/makefile.mk @@ -37,11 +37,9 @@ ENABLE_EXCEPTIONS = TRUE CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS) .ENDIF -.IF "$(WITH_MOZILLA)" == "NO" || "$(ENABLE_NSS_MODULE)"!="YES" -.IF "$(SYSTEM_MOZILLA)" != "YES" +.IF "$(ENABLE_NSS_MODULE)"!="YES" @all: - @echo "No mozilla -> no nss -> no libxmlsec -> no xmlsecurity/nss" -.ENDIF + @echo "No nss -> no libxmlsec -> no xmlsecurity/nss" .ENDIF .IF "$(SYSTEM_MOZILLA)" != "YES" @@ -118,11 +116,7 @@ SOLARINC += \ -I$(NSPR_INC) \ -I$(PRJ)$/source$/xmlsec -.IF "$(SYSTEM_MOZILLA)" == "YES" -SOLARINC += -DSYSTEM_MOZILLA $(NSS_INC) -.ELSE SOLARINC += -I$(NSS_INC) -.ENDIF SLOFILES = \ $(SLO)$/nssinitializer.obj \ |