f5e1a672cc
Update the OPAL_CHECK_OFI configury macro:
- Make it safe to call the macro multiple times:
- The checks only execute the first time it is invoked
- Subsequent invocations, it just emits a friendly "checking..."
message so that configure output is sensible/logical
- With the goal of ultimately removing opal/mca/common/ofi, rename the
output variables from OPAL_CHECK_OFI to be
opal_ofi_{happy|CPPFLAGS|LDFLAGS|LIBS}.
- Update btl/ofi, btl/usnic, and mtl/ofi for these new conventions.
- Also, don't use AC_REQUIRE to invoke OPAL_CHECK_OFI because that
causes the macro to be invoked at a fairly random time, which makes
configure stdout confusing / hard to grok.
- Remove a little left-over kruft in OPAL_CHECK_OFI, too (which
resulted in an indenting change, making the change to
opal_check_ofi.m4 look larger than it really is).
Thanks Alastair McKinstry for the report and initial fix.
Thanks Rashika Kheria for the reminder.
Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
35 строки
941 B
Bash
35 строки
941 B
Bash
# -*- shell-script -*-
|
|
#
|
|
# Copyright (c) 2013-2014 Intel, Inc. All rights reserved
|
|
#
|
|
# Copyright (c) 2014-2019 Cisco Systems, Inc. All rights reserved
|
|
# Copyright (c) 2017 Los Alamos National Security, LLC. All rights
|
|
# reserved.
|
|
# $COPYRIGHT$
|
|
#
|
|
# Additional copyrights may follow
|
|
#
|
|
# $HEADER$
|
|
#
|
|
|
|
# MCA_ompi_mtl_ofi_POST_CONFIG(will_build)
|
|
# ----------------------------------------
|
|
# Only require the tag if we're actually going to be built
|
|
AC_DEFUN([MCA_ompi_mtl_ofi_POST_CONFIG], [
|
|
AS_IF([test "$1" = "1"], [OMPI_REQUIRE_ENDPOINT_TAG([MTL])])
|
|
])dnl
|
|
|
|
# MCA_mtl_ofi_CONFIG([action-if-can-compile],
|
|
# [action-if-cant-compile])
|
|
# ------------------------------------------------
|
|
AC_DEFUN([MCA_ompi_mtl_ofi_CONFIG],[
|
|
AC_CONFIG_FILES([ompi/mca/mtl/ofi/Makefile])
|
|
|
|
# Check for OFI
|
|
OPAL_CHECK_OFI
|
|
|
|
AS_IF([test "$opal_ofi_happy" = "yes"],
|
|
[$1],
|
|
[$2])
|
|
])dnl
|