[Fedora-directory-commits] adminserver nsconfig.mk,1.24,1.25

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2666

Modified Files:
	nsconfig.mk 
Log Message:
Have to add back softokn3 to the link line - adminutil, setuputil, and ldapsdk didn't remove them as dependencies, so the linker forces it to be present at link time.



Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- nsconfig.mk	15 Feb 2006 22:53:03 -0000	1.24
+++ nsconfig.mk	24 Feb 2006 22:49:20 -0000	1.25
@@ -718,8 +718,7 @@
   SECURITY_INCLUDE = $(SECURITY_BUILD_DIR)/include
 endif
 
-# with NSS 3.11, only need smime, ssl and nss to link - all others at runtime only
-SECURITY_LIBNAMES = smime3 ssl3 nss3
+SECURITY_LIBNAMES = smime3 ssl3 nss3 softokn3
 
 # For NSS3, nssckbi shared library must be put in the same directory
 # where secmod.db file is, rather than in the LD_LIBRARY_PATH 
@@ -742,7 +741,7 @@
 endif # USE_64
 
 # These files are only needed at runtime, not to link with
-SECURITY_EXTRA_RUNTIME_LIBNAMES = softokn3 $(FREEBL_LIBS)
+SECURITY_EXTRA_RUNTIME_LIBNAMES = $(FREEBL_LIBS)
 # these shared libs need the corresponding .chk files at runtime
 SECURITY_NEED_CHK = softokn3 $(FREEBL_LIBS)