[Fedora-directory-commits] ldapserver components.mk,1.39,1.40

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	components.mk 
Log Message:
Wan-Teh pointed out that the platform specific freebl libs are needed _instead of_ libfreebl3, not _in addition to_.  So, set the list of platform specific freebl libs and add them to the list of libs to package.



Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- components.mk	13 Feb 2006 22:25:27 -0000	1.39
+++ components.mk	14 Feb 2006 04:26:54 -0000	1.40
@@ -213,30 +213,30 @@
 # as of NSS 3.11, no longer need to link with softokn3
 SECURITY_LIBNAMES = ssl3 nss3
 # these libs have a corresponding .chk file
-# freebl is new for NSS 3.11
-SECURITY_NEED_CHK = softokn3 freebl3
+SECURITY_NEED_CHK = softokn3
 
-SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3 softokn3 freebl3
+# these are the libs we need at runtime
+SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3 softokn3
 
-ifneq ($(USE_64), 1)
+# freebl for all platforms is new for NSS 3.11
+# there are some platform specific versions as well
+FREEBL_LIBS = freebl3
+ifeq ($(USE_64), 1)
 ifeq ($(ARCH), SOLARIS)
-SECURITY_LIBNAMES.pkg += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
-# these libs have a corresponding .chk file
-SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
+FREEBL_LIBS = freebl_64fpu_3 freebl_64int_3
+endif
+else  # USE_64
+ifeq ($(ARCH), SOLARIS)
+FREEBL_LIBS = freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
 endif # SOLARIS
 ifeq ($(ARCH), HPUX)
-SECURITY_LIBNAMES.pkg += freebl_32fpu_3 freebl_32int_3
-# these libs have a corresponding .chk file
-SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int_3
+FREEBL_LIBS = freebl_32fpu_3 freebl_32int_3
 endif # HPUX
-else  # USE_64
-ifeq ($(ARCH), SOLARIS)
-SECURITY_LIBNAMES.pkg += freebl_64fpu_3 freebl_64int_3
-# these libs have a corresponding .chk file
-SECURITY_NEED_CHK += freebl_64fpu_3 freebl_64int_3
-endif
 endif # USE_64
 
+SECURITY_LIBNAMES.pkg += $(FREEBL_LIBS)
+SECURITY_NEED_CHK += $(FREEBL_LIBS)
+
 SECURITY_TOOLS = $(addsuffix $(EXE_SUFFIX),$(SECURITY_BINNAMES))
 SECURITY_TOOLS_FULLPATH = $(addprefix $(SECURITY_BINPATH)/, $(SECURITY_TOOLS))