Skip to content
Snippets Groups Projects
Commit 21aec313 authored by Danny Auble's avatar Danny Auble
Browse files

Merge remote-tracking branch 'origin/slurm-16.05'

parents 73093606 b4cd45c4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
auxdir/x_ac_pmix.m4
+ 1
− 1
View file @ 21aec313
......@@ -108,7 +108,7 @@ AC_DEFUN([X_AC_PMIX],
AC_SUBST(PMIX_V2_LDFLAGS)
fi
AM_CONDITIONAL(HAVE_PMIX, [test $_x_ac_pmix_v1_found = "1"] &&
AM_CONDITIONAL(HAVE_PMIX, [test $_x_ac_pmix_v1_found = "1"] ||
[test $_x_ac_pmix_v2_found = "1"])
AM_CONDITIONAL(HAVE_PMIX_V1, [test $_x_ac_pmix_v1_found = "1"])
AM_CONDITIONAL(HAVE_PMIX_V2, [test $_x_ac_pmix_v2_found = "1"])
......
configure
+ 1
− 1
View file @ 21aec313
......@@ -21577,7 +21577,7 @@ $as_echo "#define HAVE_PMIX 1" >>confdefs.h
 
fi
 
if test $_x_ac_pmix_v1_found = "1" &&
if test $_x_ac_pmix_v1_found = "1" ||
test $_x_ac_pmix_v2_found = "1"; then
HAVE_PMIX_TRUE=
HAVE_PMIX_FALSE='#'
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
Nutzungsbedingungen | Datenschutzerklärung | Barrierefreiheitserklärung