diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2005-11-04 02:45:20 +0000 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2005-11-04 02:45:20 +0000 |
| commit | babae553ed4912bfca8171b6b3b6a605fa4f3e8b (patch) | |
| tree | 7d15a810a9d3523b402a9529bd753aed7103979c /components.mk | |
| parent | fa6ff3ab22b705bb2d6b4b8aefcf7082e4200c1e (diff) | |
| download | ds-babae553ed4912bfca8171b6b3b6a605fa4f3e8b.tar.gz ds-babae553ed4912bfca8171b6b3b6a605fa4f3e8b.tar.xz ds-babae553ed4912bfca8171b6b3b6a605fa4f3e8b.zip | |
[172411] Use system SASL on RHEL
Diffstat (limited to 'components.mk')
| -rw-r--r-- | components.mk | 19 |
1 files changed, 11 insertions, 8 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 |