[Fedora-directory-commits] setuputil components.mk,1.3,1.4

[Doctor Conrad]

Author: nhosoi

Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30205

Modified Files:
    components.mk 
Log Message:
[175900] Setup Util build (RPM); Comment#12
Preparation for the RPM build.
Since rpm/pkg build needs to use shared version of LDAP C SDK libraries, NSPR
and NSS libraries need to be dynamically linked to setup and uninstall.

Index: components.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/components.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- components.mk	19 Jun 2006 16:53:13 -0000	1.3
+++ components.mk	21 Jun 2006 18:44:26 -0000	1.4
@@ -59,12 +59,23 @@
   endif
 endif
 NSPR_LIBNAMES += nspr4
-ifdef NSPR_SOURCE_ROOT
-  NSPR_LIBPATH = $(NSPR_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/lib
+ifdef NSPR_INCLUDE_DIR
+ NSPR_INCDIR = $(NSPR_INCLUDE_DIR)
+else
+ ifdef NSPR_SOURCE_ROOT
   NSPR_INCDIR = $(NSPR_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/include
+ else
+  NSPR_INCDIR = $(NSPR_BUILD_DIR)/include
+ endif
+endif
+ifdef NSPR_LIB_DIR
+ NSPR_LIBPATH = $(NSPR_LIB_DIR)
 else
+ ifdef NSPR_SOURCE_ROOT
+  NSPR_LIBPATH = $(NSPR_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/lib
+ else
   NSPR_LIBPATH = $(NSPR_BUILD_DIR)/lib
-  NSPR_INCDIR = $(NSPR_BUILD_DIR)/include
+ endif
 endif
 NSPR_INCLUDE = -I$(NSPR_INCDIR)
 NSPR_LIBS_TO_PKG = $(addsuffix .$(DLL_SUFFIX),$(addprefix $(NSPR_LIBPATH)/lib,$(NSPR_LIBNAMES)))
@@ -88,7 +99,11 @@
   NSPR_SOLIBS = $(addsuffix .$(DLL_SUFFIX),  $(addprefix $(LIB_PREFIX), $(NSPR_LIBNAMES)))
   NSPROBJNAME = $(addsuffix .a, $(addprefix $(LIB_PREFIX), $(NSPR_LIBNAMES))
   LIBNSPR = $(addprefix $(NSPR_LIBPATH)/, $(NSPR_SOLIBS))
-  NSPRLINK = -L$(NSPR_LIBPATH) $(addprefix -l, $(NSPR_LIBNAMES))
+  ifdef NSPR_LIB_DIR # we are using the system NSPR (shared lib)
+    NSPRLINK = -L$(NSPR_LIBPATH) $(addprefix -l, $(NSPR_LIBNAMES)) 
+  else
+    NSPRLINK = 
+  endif
 endif

### DBM #############################
@@ -117,18 +132,27 @@
 ### DBM END #############################

### SECURITY #############################
-ifdef SECURITY_SOURCE_ROOT
-  SECURITY_LIBPATH = $(SECURITY_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/lib
-  SECURITY_BINPATH = $(SECURITY_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/bin
+ifdef NSS_INCLUDE_DIR
+ SECURITY_INCDIR = $(NSS_INCLUDE_DIR)
+else
+ ifdef SECURITY_SOURCE_ROOT
   SECURITY_INCDIR = $(SECURITY_SOURCE_ROOT)/dist/public/nss
+ else
+  SECURITY_INCDIR = $(SECURITY_BUILD_DIR)/include
+ endif
+endif
+
+ifdef NSS_LIB_DIR
+ SECURITY_LIBPATH = $(NSS_LIB_DIR)
 else
+ ifdef SECURITY_SOURCE_ROOT
+  SECURITY_LIBPATH = $(SECURITY_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/lib
+ else
   SECURITY_LIBPATH = $(SECURITY_BUILD_DIR)/lib
-  SECURITY_BINPATH = $(SECURITY_BUILD_DIR)/bin
-  SECURITY_INCDIR = $(SECURITY_BUILD_DIR)/include
+ endif
 endif
 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
 SECURITY_LIBNAMES = ssl3 nss3 softokn3
 # these libs have a corresponding .chk file
 SECURITY_NEED_CHK = softokn3
@@ -149,9 +173,6 @@
 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)))
 SECURITY_LIBS_TO_PKG += $(addsuffix .chk,$(addprefix $(SECURITY_LIBPATH)/$(LIB_PREFIX),$(SECURITY_NEED_CHK)))
 LIBS_TO_PKG += $(SECURITY_LIBS_TO_PKG)
@@ -170,15 +191,16 @@
 else
   SECURITYOBJNAME = $(addsuffix .$(DLL_SUFFIX), $(addprefix $(LIB_PREFIX), $(SECURITY_LIBNAMES)))
   LIBSECURITY = $(addprefix $(SECURITY_LIBPATH)/, $(SECURITYOBJNAME))
-  SECURITYLINK = -L$(SECURITY_LIBPATH) $(addprefix -l, $(SECURITY_LIBNAMES))
+  ifdef NSPR_LIB_DIR # we are using the system NSPR (shared lib)
+    SECURITYLINK = -L$(SECURITY_LIBPATH) $(addprefix -l, $(SECURITY_LIBNAMES))
+  else
+    SECURITYLINK =
+  endif
 endif

# we need to package the root cert file in the alias directory
 PACKAGE_SRC_DEST += $(SECURITY_LIBPATH)/$(LIB_PREFIX)nssckbi.$(DLL_SUFFIX) alias

-# need to package the sec tools in shared/bin
-BINS_TO_PKG_SHARED += $(SECURITY_TOOLS_FULLPATH)
-
 ### SECURITY END #############################

### SVRCORE #############################