diff options
| author | Tomas Chvatal <tchvatal@suse.cz> | 2011-11-02 17:36:27 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-11-02 17:37:53 +0100 |
| commit | f6f5c89259867b5aeb86d5509f826da949d122c4 (patch) | |
| tree | 89fd68e2d15904c775be50d163b9826ba7aee345 /nss | |
| parent | b5ec39a65e8b5d78f9f58bc179e9130c81ec347a (diff) | |
Rename --enable-nss-module to --with-system-nss + introduce --enable-xmlsec.
This also finishes the uncoupling of NSS from the --with-system-mozilla.
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/makefile.mk | 4 | ||||
| -rwxr-xr-x | nss/readme.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk index 9fdc9e601074..bc7b827be1ae 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -36,9 +36,9 @@ TARGET=nss # --- Files -------------------------------------------------------- -.IF "$(ENABLE_NSS_MODULE)"!="YES" +.IF "$(SYSTEM_NSS)"=="YES" all: - @echo "NSS will not be built. ENABLE_NSS_MODULE is '$(ENABLE_NSS_MODULE)'" + @echo "NSS will not be built. Using system one instead." .ENDIF VER_MAJOR=3 diff --git a/nss/readme.txt b/nss/readme.txt index df65908204c4..21d7d5487221 100755 --- a/nss/readme.txt +++ b/nss/readme.txt @@ -4,7 +4,7 @@ nss containes the security libraries which are also part of moz. However nss is meant to be more current, that is it to be updated more often. This should be easier than doing this with moz. -If nss is build depends on an environment variable (ENABLE_NSS_MODULE=YES) which +If nss is build depends on an environment variable (SYSTEM_NSS=NO) which is per default set to YES. In this case nss is build before moz. The nss libraries/lib files/headers built in moz are then not delivered. Otherwise they would overwrite those from nss. That is, the nss libraries build in moz are |