[Fedora-directory-commits] ldapserver components.mk, 1.35, 1.36 internal_comp_deps.mk, 1.31, 1.32

[Noriko Hosoi (nhosoi)]

Author: nhosoi

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

Modified Files:
	components.mk internal_comp_deps.mk 
Log Message:
[172411] Use system SASL on RHEL



Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- components.mk	31 Oct 2005 15:55:24 -0000	1.35
+++ components.mk	4 Nov 2005 02:45:20 -0000	1.36
@@ -354,14 +354,17 @@
 
 ### SASL package ##########################################
 
-ifdef SASL_SOURCE_ROOT
-  SASL_LIBPATH = $(SASL_SOURCE_ROOT)/lib
-  SASL_BINPATH = $(SASL_SOURCE_ROOT)/bin
-  SASL_INCDIR = $(SASL_SOURCE_ROOT)/include
-else
-  SASL_LIBPATH = $(SASL_BUILD_DIR)/lib
-  SASL_BINPATH = $(SASL_BUILD_DIR)/bin
-  SASL_INCDIR = $(SASL_BUILD_DIR)/include
+ifeq ($(ARCH), Linux)
+  SASL_LIBPATH = /usr/lib
+  SASL_INCDIR = /usr/include/sasl
+else
+  ifdef SASL_SOURCE_ROOT
+    SASL_LIBPATH = $(SASL_SOURCE_ROOT)/lib
+    SASL_INCDIR = $(SASL_SOURCE_ROOT)/include
+  else
+    SASL_LIBPATH = $(SASL_BUILD_DIR)/lib
+    SASL_INCDIR = $(SASL_BUILD_DIR)/include
+  endif
 endif
 SASL_INCLUDE = $(SASL_INCDIR)
 
@@ -374,7 +377,7 @@
   SASL_LIB_ROOT_NAME = sasl2
   SASL_LIBS = lib$(SASL_LIB_ROOT_NAME).a
   ifeq ($(ARCH), Linux)
-    GSSAPI_LIBS=-L/usr/kerberos/lib -lgssapi_krb5
+    GSSAPI_LIBS=-lgssapi_krb5
   endif
   ifeq ($(ARCH), SOLARIS)
     GSSAPI_LIBS=-lgss


Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- internal_comp_deps.mk	1 Nov 2005 23:00:05 -0000	1.31
+++ internal_comp_deps.mk	4 Nov 2005 02:45:20 -0000	1.32
@@ -244,6 +244,7 @@
 endif # LDAPSDK_SOURCE_ROOT
 
 ifndef SASL_SOURCE_ROOT
+ifneq ($(ARCH), Linux)
 #SASL_RELEASE = $(COMPONENTS_DIR_DEV)/sasl/$(SASL_VERSDIR)/$(SASL_RELDATE)/$(NSOBJDIR_NAME)
 SASL_RELEASE = $(COMPONENTS_DIR)/sasl/$(SASL_VERSDIR)/$(SASL_RELDATE)/$(NSOBJDIR_NAME)
 SASL_DEP = $(SASL_INCLUDE)/sasl.h
@@ -255,14 +256,12 @@
 ifdef COMPONENT_DEPS
 	$(FTP_PULL) -method $(SASL_PULL_METHOD) \
 		-objdir $(SASL_BUILD_DIR) -componentdir $(SASL_RELEASE) \
-		-files include
-	$(FTP_PULL) -method $(SASL_PULL_METHOD) \
-		-objdir $(SASL_BUILD_DIR)/lib -componentdir $(SASL_RELEASE)/lib \
-		-files $(SASL_LIBS)
+		-files include,lib
 endif
 	- at if [ ! -f $@ ] ; \
 	then echo "Error: could not get component SASL file $@" ; \
 	fi
+endif # not Linux
 endif # SASL_SOURCE_ROOT
 
 ifndef ICU_SOURCE_ROOT