Skip to content

Commit 27e112a

Browse files
committed
configury: prefer external hwloc
Signed-off-by: Gilles Gouaillardet <[email protected]>
1 parent 8d9de51 commit 27e112a

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

opal/mca/hwloc/external/configure.m4

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- shell-script -*-
22
#
33
# Copyright (c) 2009-2017 Cisco Systems, Inc. All rights reserved
4-
# Copyright (c) 2014-2017 Research Organization for Information Science
4+
# Copyright (c) 2014-2018 Research Organization for Information Science
55
# and Technology (RIST). All rights reserved.
66
#
77
# Copyright (c) 2018 Intel, Inc. All rights reserved.
@@ -102,12 +102,9 @@ AC_DEFUN([MCA_opal_hwloc_external_CONFIG],[
102102
# but hopefully slightly more clear...)
103103
opal_hwloc_external_want=no
104104
AS_IF([test "$with_hwloc_libdir" != ""], [opal_hwloc_external_want=yes])
105-
AS_IF([test "$with_hwloc" = "external"], [opal_hwloc_external_want=yes])
106-
AS_IF([test "$with_hwloc" != "" && \
107-
test "$with_hwloc" != "no" && \
108-
test "$with_hwloc" != "internal" && \
109-
test "$with_hwloc" != "future"], [opal_hwloc_external_want=yes])
110-
AS_IF([test "$with_hwloc" = "no"], [opal_hwloc_external_want=no])
105+
AS_IF([test "$with_hwloc" = "internal"],
106+
[opal_hwloc_external_want=no],
107+
[opal_hwloc_external_want=yes])
111108

112109
# If we still want external support, try it
113110
AS_IF([test "$opal_hwloc_external_want" = "yes"],

opal/mca/hwloc/hwloc201/configure.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Copyright (c) 2009-2017 Cisco Systems, Inc. All rights reserved
44
# Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
5-
# Copyright (c) 2015-2017 Research Organization for Information Science
5+
# Copyright (c) 2015-2018 Research Organization for Information Science
66
# and Technology (RIST). All rights reserved.
77
# Copyright (c) 2016 Los Alamos National Security, LLC. All rights
88
# reserved.
@@ -17,7 +17,7 @@
1717
#
1818
# Priority
1919
#
20-
AC_DEFUN([MCA_opal_hwloc_hwloc201_PRIORITY], [90])
20+
AC_DEFUN([MCA_opal_hwloc_hwloc201_PRIORITY], [80])
2121

2222
#
2323
# Force this component to compile in static-only mode

0 commit comments

Comments
 (0)