From 2082c24712dec620d3fac34f1728c4a72efa378d Mon Sep 17 00:00:00 2001 From: Brice Goglin Date: Mon, 18 Dec 2017 11:37:23 +0100 Subject: [PATCH] configure: disable netloc by default in 2.0 Still too experimental Signed-off-by: Brice Goglin --- NEWS | 4 ++-- configure.ac | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 42f94bd671..0ab5809aa0 100644 --- a/NEWS +++ b/NEWS @@ -90,8 +90,8 @@ Version 2.0.0 * New APIs and Features + Add hwloc/shmem.h for sharing topologies between processes running on the same machine (for reducing the memory footprint). - + Add the experimental netloc subproject. It is enabled by default when - supported and can be disabled with --disable-netloc. + + Add the experimental netloc subproject. It is disabled by default + and can be enabled with --enable-netloc. It currently brings command-line tools to gather and visualize the topology of InfiniBand fabrics, and an API to convert such topologies into Scotch architectures for process mapping. diff --git a/configure.ac b/configure.ac index 64f4a654cb..9bb4efda86 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- shell-script -*- # # Copyright © 2009 CNRS -# Copyright © 2009-2016 Inria. All rights reserved. +# Copyright © 2009-2017 Inria. All rights reserved. # Copyright © 2009, 2011-2012 Université Bordeaux # Copyright © 2009-2014 Cisco Systems, Inc. All rights reserved. # @@ -143,10 +143,10 @@ AC_SUBST([libnetloc_so_version]) AC_ARG_ENABLE([netloc], [AC_HELP_STRING([--enable-netloc], - [The Netloc functionality is enabled by default, but will be silently skipped it if cannot be built (e.g., not supported on your platform). Using --enable-netloc will cause configure to abort if Netloc cannot be build. Using --disable-netloc will cause configure to skip attempting to build netloc at all.]) + [The Netloc functionality is disabled by default. Using --enable-netloc will cause configure to abort if Netloc cannot be build (e.g., not supported on your platform).]) ]) -AS_IF([test "$enable_netloc" != "no"], +AS_IF([test "$enable_netloc" = "yes"], [NETLOC_SETUP_CORE([], [], [AS_IF([test "$enable_netloc" = "yes"], [AC_MSG_ERROR([Cannot build netloc core])])