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 /internal_comp_deps.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 'internal_comp_deps.mk')
| -rw-r--r-- | internal_comp_deps.mk | 7 |
1 files changed, 3 insertions, 4 deletions
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 |