From 7b115a9e0bcb6bfbbd93eb978738a8b252e668d4 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Mon, 30 May 2016 14:30:10 -0700 Subject: [PATCH] Patch from Gilles - modify detection of PMIx version for external libraries --- config/opal_check_pmi.m4 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/config/opal_check_pmi.m4 b/config/opal_check_pmi.m4 index 57850a1e26..92407af895 100644 --- a/config/opal_check_pmi.m4 +++ b/config/opal_check_pmi.m4 @@ -280,10 +280,12 @@ AC_DEFUN([OPAL_CHECK_PMIX],[ CPPFLAGS=$opal_pmix_ext_CPPFLAGS LDFLAGS=$opal_pmix_ext_LDFLAGS LIBS=$opal_pmix_ext_LIBS - LD_LIBRARY_PATH=$pmix_ext_install_dir/lib + LD_LIBRARY_PATH=$pmix_ext_install_dir/lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH AC_MSG_CHECKING([PMIx library version]) - AC_TRY_RUN([ + AC_RUN_IFELSE([ + AC_LANG_SOURCE([ #include #include #include @@ -302,15 +304,17 @@ int main(int argc, char **argv) return 0; } - ], [ + ])], [ eval opal_external_pmix_version=`cat conftestval` AC_MSG_RESULT([$opal_external_pmix_version]) ], [ LD_LIBRARY_PATH=$opal_pmix_LD_LIBRARY_PATH_save + export LD_LIBRARY_PATH opal_external_pmix_happy="no" AC_MSG_ERROR([External PMIx support requested but could not build/run a test program. Aborting]) ], [ LD_LIBRARY_PATH=$opal_pmix_LD_LIBRARY_PATH_save + export LD_LIBRARY_PATH opal_external_pmix_happy="no" AC_MSG_ERROR([External PMIx disabled for cross compile. Aborting]) ])