diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2005-03-25 19:05:37 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2005-03-25 19:05:37 +0000 |
| commit | 103a9559a8eb01a9240490fdabd53002e0367eec (patch) | |
| tree | 19613a16bd6c1fd37278b592c13f6d53ed066ae2 /components.mk | |
| parent | 362bedccdc6e27683e033798d8b0bbbba88d3228 (diff) | |
| download | ds-103a9559a8eb01a9240490fdabd53002e0367eec.tar.gz ds-103a9559a8eb01a9240490fdabd53002e0367eec.tar.xz ds-103a9559a8eb01a9240490fdabd53002e0367eec.zip | |
1) remove fortezza stuff
2) make sure the .chk files are there
3) fix secmod.db on 64 bit platforms to have the 32 bit nssckbi in there
Diffstat (limited to 'components.mk')
| -rw-r--r-- | components.mk | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/components.mk b/components.mk index ad957f35..b9652e9a 100644 --- a/components.mk +++ b/components.mk @@ -177,38 +177,32 @@ else endif SECURITY_INCLUDE = -I$(SECURITY_INCDIR) # add crlutil and ocspclnt when we support CRL and OCSP cert checking in DS -ifeq ($(SECURITY_RELDATE), NSS_3_7_9_RTM) -SECURITY_BINNAMES = certutil derdump pp pk12util ssltap modutil -else SECURITY_BINNAMES = certutil derdump pp pk12util ssltap modutil shlibsign -endif SECURITY_LIBNAMES = ssl3 nss3 softokn3 +# these libs have a corresponding .chk file +SECURITY_NEED_CHK = softokn3 -SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) -SECURITY_LIBNAMES.pkg += smime3 +SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3 + +# these are only needed on 32 bit Solaris and HP-UX +ifneq ($(USE_64), 1) ifeq ($(ARCH), SOLARIS) -SECURITY_LIBNAMES.pkg += freebl_hybrid_3 freebl_pure32_3 fort swft +SECURITY_LIBNAMES.pkg += freebl_hybrid_3 freebl_pure32_3 +# these libs have a corresponding .chk file +SECURITY_NEED_CHK += freebl_hybrid_3 freebl_pure32_3 endif ifeq ($(ARCH), HPUX) -SECURITY_LIBNAMES.pkg += freebl_hybrid_3 freebl_pure32_3 fort swft -endif -ifeq ($(ARCH), AIX) -SECURITY_LIBNAMES.pkg += fort swft -endif -ifeq ($(ARCH), OSF1) -SECURITY_LIBNAMES.pkg += fort swft -endif -ifeq ($(ARCH), WINNT) -SECURITY_LIBNAMES.pkg += fort32 swft32 +SECURITY_LIBNAMES.pkg += freebl_hybrid_3 freebl_pure32_3 +# these libs have a corresponding .chk file +SECURITY_NEED_CHK += freebl_hybrid_3 freebl_pure32_3 endif +endif # USE_64 SECURITY_TOOLS = $(addsuffix $(EXE_SUFFIX),$(SECURITY_BINNAMES)) SECURITY_TOOLS_FULLPATH = $(addprefix $(SECURITY_BINPATH)/, $(SECURITY_TOOLS)) SECURITY_LIBS_TO_PKG = $(addsuffix .$(DLL_SUFFIX),$(addprefix $(SECURITY_LIBPATH)/$(LIB_PREFIX),$(SECURITY_LIBNAMES.pkg))) -ifneq ($(SECURITY_RELDATE), NSS_3_7_9_RTM) -SECURITY_LIBS_TO_PKG += $(addsuffix .chk,$(addprefix $(SECURITY_LIBPATH)/$(LIB_PREFIX),$(SECURITY_LIBNAMES.pkg))) -endif +SECURITY_LIBS_TO_PKG += $(addsuffix .chk,$(addprefix $(SECURITY_LIBPATH)/$(LIB_PREFIX),$(SECURITY_NEED_CHK))) LIBS_TO_PKG += $(SECURITY_LIBS_TO_PKG) LIBS_TO_PKG_SHARED += $(SECURITY_LIBS_TO_PKG) # for cmd line tools ifeq ($(USE_SETUPSDK), 1) |