diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2006-10-13 23:03:27 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2006-10-13 23:03:27 +0000 |
| commit | 791ae2ed693312b0c79798fb3b06930d07c8f68a (patch) | |
| tree | 0ab880a7fd55fe9b3bf778028328d167cec58a2d | |
| parent | e5bace3a74097cf4ae9d3f092da674e2aa30dffe (diff) | |
| download | ds-791ae2ed693312b0c79798fb3b06930d07c8f68a.tar.gz ds-791ae2ed693312b0c79798fb3b06930d07c8f68a.tar.xz ds-791ae2ed693312b0c79798fb3b06930d07c8f68a.zip | |
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.
| -rw-r--r-- | components.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/components.mk b/components.mk index 860fa088..efe62f77 100644 --- a/components.mk +++ b/components.mk @@ -365,8 +365,11 @@ LIBLDAP = $(addprefix $(LDAP_LIBPATH)/, $(LDAPOBJNAME)) 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 @@ else 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 @@ else endif endif - SASL_LINK = -L$(SASL_LIBPATH) -l$(SASL_LIB_ROOT_NAME) $(GSSAPI_LIBS) + SASL_LINK += -l$(SASL_LIB_ROOT_NAME) $(GSSAPI_LIBS) endif ########################################################### |