configury: prefer external hwloc

Signed-off-by: Gilles Gouaillardet <[email protected]>

Author: ggouaillardet

opal/mca/hwloc/external/configure.m4

@@ -1,7 +1,7 @@
 # -*- shell-script -*-
 #
 # Copyright (c) 2009-2017 Cisco Systems, Inc.  All rights reserved
-# Copyright (c) 2014-2017 Research Organization for Information Science
+# Copyright (c) 2014-2018 Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 #
 # $COPYRIGHT$
@@ -100,12 +100,9 @@ AC_DEFUN([MCA_opal_hwloc_external_CONFIG],[
     # but hopefully slightly more clear...)
     opal_hwloc_external_want=no
     AS_IF([test "$with_hwloc_libdir" != ""], [opal_hwloc_external_want=yes])
-    AS_IF([test "$with_hwloc" = "external"], [opal_hwloc_external_want=yes])
-    AS_IF([test "$with_hwloc" != "" && \
-           test "$with_hwloc" != "no" && \
-           test "$with_hwloc" != "internal" && \
-           test "$with_hwloc" != "future"], [opal_hwloc_external_want=yes])
-    AS_IF([test "$with_hwloc" = "no"], [opal_hwloc_external_want=no])
+    AS_IF([test "$with_hwloc" = "internal"],
+          [opal_hwloc_external_want=no],
+          [opal_hwloc_external_want=yes])
 
     # If we still want external support, try it
     AS_IF([test "$opal_hwloc_external_want" = "yes"],

opal/mca/hwloc/hwloc2a/configure.m4

@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2009-2017 Cisco Systems, Inc.  All rights reserved
 # Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
-# Copyright (c) 2015-2017 Research Organization for Information Science
+# Copyright (c) 2015-2018 Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # Copyright (c) 2016      Los Alamos National Security, LLC. All rights
 #                         reserved.
@@ -17,7 +17,7 @@
 #
 # Priority
 #
-AC_DEFUN([MCA_opal_hwloc_hwloc2a_PRIORITY], [90])
+AC_DEFUN([MCA_opal_hwloc_hwloc2a_PRIORITY], [80])
 
 #
 # Force this component to compile in static-only mode