Skip to content

Commit ec0f472

Browse files
authored
Merge pull request #13370 from hppritcha/knem_config_option_to_disable
configury: allow knem to be disabled
2 parents 5f5cd62 + cf02616 commit ec0f472

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

config/opal_check_knem.m4

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,15 @@ AC_DEFUN([OPAL_CHECK_KNEM],[
3131

3232
opal_check_knem_CPPFLAGS_save="${CPPFLAGS}"
3333

34-
AS_IF([test -n "${with_knem}" -a "${with_knem}" != "yes" -a "${with_knem}" != "no"],
35-
[$1_CPPFLAGS="-I${with_knem}/include"
36-
CPPFLAGS="$CPPFLAGS ${$1_CPPFLAGS}"])
34+
AS_IF([test -n "${with_knem}" -a "${with_knem}" = "no"],
35+
[opal_check_knem_happy="no"],
36+
[opal_check_knem_happy="yes"])
3737

38-
AC_CHECK_HEADER([knem_io.h], [opal_check_knem_happy="yes"], [opal_check_knem_happy="no"])
38+
AS_IF([test "${opal_check_knem_happy}" = "yes"],
39+
[AS_IF([test -a "${with_knem}" != "yes"],
40+
[$1_CPPFLAGS="-I${with_knem}/include"
41+
CPPFLAGS="$CPPFLAGS ${$1_CPPFLAGS}"])
42+
AC_CHECK_HEADER([knem_io.h], [opal_check_knem_happy="yes"], [opal_check_knem_happy="no"])])
3943

4044
# need at least version 0x0000000b
4145
AS_IF([test "$opal_check_knem_happy" = "yes"],

0 commit comments

Comments
 (0)