From ac8e9d103cd56a940495fae5b32c766d6217628f Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Mon, 8 Dec 2014 11:51:26 -0800 Subject: [PATCH] libfabric: need to make AM_CONDITIONALs always be run Ensure that the usnic-specific AM_CONDITIONAL for the embedded libfabric is always run. --- opal/mca/common/libfabric/configure.m4 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/opal/mca/common/libfabric/configure.m4 b/opal/mca/common/libfabric/configure.m4 index 21dfdb21cb..26b39e1c03 100644 --- a/opal/mca/common/libfabric/configure.m4 +++ b/opal/mca/common/libfabric/configure.m4 @@ -155,6 +155,8 @@ AC_DEFUN([_OPAL_COMMON_LIBFABRIC_CONFIGURE],[ AC_DEFUN([_OPAL_COMMON_LIBFABRIC_SETUP_LIBFABRIC_EMBEDDED_CONDITIONALS],[ AM_CONDITIONAL([HAVE_LD_VERSION_SCRIPT], [false]) AM_CONDITIONAL([HAVE_DIRECT], [false]) + + _OPAL_COMMON_LIBFABRIC_EMBEDDED_PROVIDER_USNIC_CONDITIONALS ]) AC_DEFUN([_OPAL_COMMON_LIBFABRIC_SETUP_LIBFABRIC_EMBEDDED],[ @@ -276,7 +278,13 @@ AC_DEFUN([_OPAL_COMMON_LIBFABRIC_EMBEDDED_PROVIDER_USNIC],[ opal_common_libfabric_LIBADD="\$(OPAL_TOP_BUILDDIR)/opal/mca/common/libfabric/lib${OPAL_LIB_PREFIX}mca_common_libfabric.la" opal_common_libfabric_embedded_LIBADD="-lnl" +]) +# -------------------------------------------------------- +# Internal helper macro for usnic AM conditionals (that must be run +# unconditionally) +# -------------------------------------------------------- +AC_DEFUN([_OPAL_COMMON_LIBFABRIC_EMBEDDED_PROVIDER_USNIC_CONDITIONALS],[ AM_CONDITIONAL([OPAL_COMMON_LIBFABRIC_HAVE_PROVIDER_USNIC], [test $opal_common_libfabric_usnic_happy -eq 1]) ])