diff options
| -rw-r--r-- | components.mk | 19 | ||||
| -rw-r--r-- | internal_comp_deps.mk | 7 |
2 files changed, 14 insertions, 12 deletions
diff --git a/components.mk b/components.mk index 2ec85975..008445d0 100644 --- a/components.mk +++ b/components.mk @@ -354,14 +354,17 @@ LIBLDAP = $(addprefix $(LDAP_LIBPATH)/, $(LDAPOBJNAME)) ### SASL package ########################################## -ifdef SASL_SOURCE_ROOT - SASL_LIBPATH = $(SASL_SOURCE_ROOT)/lib - SASL_BINPATH = $(SASL_SOURCE_ROOT)/bin - SASL_INCDIR = $(SASL_SOURCE_ROOT)/include +ifeq ($(ARCH), Linux) + SASL_LIBPATH = /usr/lib + SASL_INCDIR = /usr/include/sasl else - SASL_LIBPATH = $(SASL_BUILD_DIR)/lib - SASL_BINPATH = $(SASL_BUILD_DIR)/bin - SASL_INCDIR = $(SASL_BUILD_DIR)/include + 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 @@ else 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 diff --git a/internal_comp_deps.mk b/internal_comp_deps.mk index ece5cda3..847c26ce 100644 --- a/internal_comp_deps.mk +++ b/internal_comp_deps.mk @@ -244,6 +244,7 @@ endif 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 @@ $(SASL_DEP): $(NSCP_DISTDIR_FULL_RTL) 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 -@if [ ! -f $@ ] ; \ then echo "Error: could not get component SASL file $@" ; \ fi +endif # not Linux endif # SASL_SOURCE_ROOT ifndef ICU_SOURCE_ROOT |