[Fedora-directory-commits] ldapserver components.mk,1.41,1.42

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2735

Modified Files:
	components.mk 
Log Message:
Have to add back softokn3 to the link libs - dependent libs are linked directly against it and expect it to be present at link time.



Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- components.mk	23 Feb 2006 19:30:23 -0000	1.41
+++ components.mk	24 Feb 2006 22:52:10 -0000	1.42
@@ -218,13 +218,12 @@
 SECURITY_INCLUDE = -I$(SECURITY_INCDIR)
 # add crlutil and ocspclnt when we support CRL and OCSP cert checking in DS
 SECURITY_BINNAMES = certutil derdump pp pk12util ssltap modutil shlibsign
-# as of NSS 3.11, no longer need to link with softokn3
-SECURITY_LIBNAMES = ssl3 nss3
+SECURITY_LIBNAMES = ssl3 nss3 softokn3
 # these libs have a corresponding .chk file
 SECURITY_NEED_CHK = softokn3
 
 # these are the libs we need at runtime
-SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3 softokn3
+SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3
 
 # freebl for all platforms is new for NSS 3.11
 # there are some platform specific versions as well