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

[Noriko Hosoi (nhosoi)]

Author: nhosoi

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

Modified Files:
	components.mk 
Log Message:
[175900] Setup Util build (RPM); comment#9
Preparation for the RPM build.
1) If these environment variables are set, the paths are used instead of the
"local paths" or "internal paths".
2) If the environment variables are set, use shared libraries not the static
libraries.  Since the dependency on the LDAP C SDK is guaranteed to be solved
when we use rpm for the installation, we don't need to link the static
libraries (Plus, the static libraries -- libldap50.a, liblber50.a, libldif50.a
are not part of mozldap nor mozldap-devel).



Index: components.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/components.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- components.mk	23 Feb 2006 22:50:21 -0000	1.2
+++ components.mk	19 Jun 2006 16:53:13 -0000	1.3
@@ -208,15 +208,26 @@
 # LDAP SDK
 ###################################################
 
-ifdef LDAPSDK_SOURCE_ROOT
-  LDAPSDK_LIBPATH = $(LDAPSDK_SOURCE_ROOT)/dist/lib
+ifdef LDAPCSDK_INCLUDE_DIR
+ LDAPSDK_INCDIR = $(LDAPCSDK_INCLUDE_DIR)
+else
+ ifdef LDAPSDK_SOURCE_ROOT
   LDAPSDK_INCDIR = $(LDAPSDK_SOURCE_ROOT)/dist/public/ldap
-  LDAPSDK_BINPATH = $(LDAPSDK_SOURCE_ROOT)/dist/bin
+ else
+  LDAPSDK_INCDIR = $(LDAP_ROOT)/include
+ endif
+endif
+
+ifdef LDAPCSDK_LIB_DIR
+ LDAPSDK_LIBPATH = $(LDAPCSDK_LIB_DIR)
 else
+ ifdef LDAPSDK_SOURCE_ROOT
+  LDAPSDK_LIBPATH = $(LDAPSDK_SOURCE_ROOT)/dist/lib
+ else
   LDAPSDK_LIBPATH = $(LDAP_ROOT)/lib
-  LDAPSDK_INCDIR = $(LDAP_ROOT)/include
-  LDAPSDK_BINPATH = $(LDAP_ROOT)/bin
+ endif
 endif
+
 LDAPSDK_INCLUDE = -I$(LDAPSDK_INCDIR)
 
 # package the command line programs
@@ -229,22 +240,24 @@
 
 LDAP_LIBPATH = $(LDAPSDK_LIBPATH)
 LDAP_INCLUDE = $(LDAPSDK_INCDIR)
-LDAP_TOOLDIR = $(LDAPSDK_BINPATH)
 
 ifeq ($(ARCH), WINNT)
-	LDAP_LIBNAMES = ldapssl32v$(LDAP_SUF) ldap32v$(LDAP_SUF) ldappr32v$(LDAP_SUF)
-	LDAPDLL_NAME = $(addprefix ns, $(LDAP_LIBNAMES))
-	LDAPOBJNAME = $(addsuffix .lib, $(LDAPDLL_NAME))
+  LDAP_LIBNAMES = ldapssl32v$(LDAP_SUF) ldap32v$(LDAP_SUF) ldappr32v$(LDAP_SUF)
+  LDAPDLL_NAME = $(addprefix ns, $(LDAP_LIBNAMES))
+  LDAPOBJNAME = $(addsuffix .lib, $(LDAPDLL_NAME))
+  LDAPLINK = $(addprefix $(LDAP_LIBPATH)/, $(LDAPOBJNAME))
 else
-	LDAP_SOLIB_NAMES = ssldap$(LDAP_SUF)$(LDAP_DLL_PRESUF) ldap$(LDAP_SUF)$(LDAP_DLL_PRESUF) prldap$(LDAP_SUF)$(LDAP_DLL_PRESUF)
-	LDAP_LIBNAMES = ldap$(LDAP_SUF)$(LDAP_DLL_PRESUF) lber$(LDAP_SUF)$(LDAP_DLL_PRESUF)
-	LDAP_SOLIBS = $(addsuffix .$(LDAP_DLL_SUFFIX), $(addprefix lib, $(LDAP_SOLIB_NAMES)))
-	LDAPOBJNAME = $(addsuffix .a, $(addprefix lib, $(LDAP_LIBNAMES)))
-	LDAPLINK = -L$(LDAP_LIBPATH) $(addprefix -l, $(LDAP_SOLIB_NAMES))
+  LDAP_SOLIB_NAMES = ssldap$(LDAP_SUF)$(LDAP_DLL_PRESUF) ldap$(LDAP_SUF)$(LDAP_DLL_PRESUF) prldap$(LDAP_SUF)$(LDAP_DLL_PRESUF)
+  LDAP_LIBNAMES = ldap$(LDAP_SUF)$(LDAP_DLL_PRESUF) lber$(LDAP_SUF)$(LDAP_DLL_PRESUF)
+  LDAP_SOLIBS = $(addsuffix .$(LDAP_DLL_SUFFIX), $(addprefix lib, $(LDAP_SOLIB_NAMES)))
+  LDAPOBJNAME = $(addsuffix .a, $(addprefix lib, $(LDAP_LIBNAMES)))
+  ifdef LDAPCSDK_LIB_DIR # we are using the system LDAPCSDK.
+    LDAPLINK = -L$(LDAP_LIBPATH) $(addprefix -l, $(LDAP_SOLIB_NAMES))
+  else
+    LDAPLINK = $(addprefix $(LDAP_LIBPATH)/, $(LDAPOBJNAME))
+  endif
 endif
 
-LDAPLINK = $(addprefix $(LDAP_LIBPATH)/, $(LDAPOBJNAME))
-
 #################################################################
 # Infozip (for Windows Packaging)
 #################################################################