Author: rmeggins
Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5575
Modified Files: components.mk Log Message: Change the way ldapserver links with SASL. Rather than specifying a hard coded link path of /usr/lib, which will not work on 64 bit systems, just don't specify a -L option for SASL if we want the linker to just use the default path. The linker will find the system SASL in /usr/lib or /usr/lib64 or wherever it is.
Index: components.mk =================================================================== RCS file: /cvs/dirsec/ldapserver/components.mk,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- components.mk 10 Oct 2006 20:37:05 -0000 1.55 +++ components.mk 13 Oct 2006 23:03:27 -0000 1.56 @@ -365,8 +365,11 @@ ifeq ($(ARCH), Linux) ifeq ($(BUILD_ARCH), RHEL3) SASL_LIBPATH = /usr/kerberos/lib + SASL_LINK = -L$(SASL_LIBPATH) else - SASL_LIBPATH = /usr/lib +# just use default linker path + SASL_LIBPATH = + SASL_LINK = endif SASL_INCDIR = /usr/include/sasl else @@ -377,6 +380,7 @@ SASL_LIBPATH = $(SASL_BUILD_DIR)/lib SASL_INCDIR = $(SASL_BUILD_DIR)/include/sasl endif + SASL_LINK = -L$(SASL_LIBPATH) endif SASL_INCLUDE = $(SASL_INCDIR)
@@ -403,7 +407,7 @@ endif endif
- SASL_LINK = -L$(SASL_LIBPATH) -l$(SASL_LIB_ROOT_NAME) $(GSSAPI_LIBS) + SASL_LINK += -l$(SASL_LIB_ROOT_NAME) $(GSSAPI_LIBS) endif ###########################################################