From 2faef6bc2da11d817b3ff2fcaee6507aee931b20 Mon Sep 17 00:00:00 2001 From: Mike Dubman Date: Fri, 29 Nov 2013 14:12:04 +0000 Subject: [PATCH] Define OSHMEM_HAS_IKRIT removed from configuration file. Both yoda and ikrit componets are adding in mca_spml_base_open now. Default component ikrit if found. Refs: 3763 This commit was SVN r29770. --- oshmem/mca/spml/base/spml_base_frame.c | 2 -- oshmem/mca/spml/ikrit/configure.m4 | 7 ++----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/oshmem/mca/spml/base/spml_base_frame.c b/oshmem/mca/spml/base/spml_base_frame.c index 817a66f7e0..d22e219a75 100644 --- a/oshmem/mca/spml/base/spml_base_frame.c +++ b/oshmem/mca/spml/base/spml_base_frame.c @@ -137,9 +137,7 @@ static int mca_spml_base_open(mca_base_open_flag_t flags) if( (NULL == default_spml || NULL == default_spml[0] || 0 == strlen(default_spml[0])) || (default_spml[0][0] == '^') ) { -#if OSHMEM_HAS_IKRIT opal_pointer_array_add(&mca_spml_base_spml, strdup("ikrit")); -#endif opal_pointer_array_add(&mca_spml_base_spml, strdup("yoda")); } else { opal_pointer_array_add(&mca_spml_base_spml, strdup(default_spml[0])); diff --git a/oshmem/mca/spml/ikrit/configure.m4 b/oshmem/mca/spml/ikrit/configure.m4 index 2d877e6f07..d47bcf3781 100644 --- a/oshmem/mca/spml/ikrit/configure.m4 +++ b/oshmem/mca/spml/ikrit/configure.m4 @@ -15,14 +15,11 @@ AC_DEFUN([MCA_oshmem_spml_ikrit_CONFIG],[ AC_CONFIG_FILES([oshmem/mca/spml/ikrit/Makefile]) OMPI_CHECK_MXM([spml_ikrit], - [AC_DEFINE([OSHMEM_HAS_IKRIT], [1], [mxm support is available]) - spml_ikrit_happy="yes"], + [spml_ikrit_happy="yes"], [spml_ikrit_happy="no"]) AS_IF([test "$spml_ikrit_happy" = "yes"], - [spml_ikrit_WRAPPER_EXTRA_LDFLAGS="$spml_ikrit_LDFLAGS" - spml_ikrit_WRAPPER_EXTRA_LIBS="$spml_ikrit_LIBS" - $1], + [$1], [$2])