From 43774fe3f123f6bcf67da9e979a035e3d43a4461 Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Tue, 3 Apr 2012 18:02:46 +0100 Subject: autoconf: change AX_ARG_{DISABLE/ENABLE}_AND_EXPORT to make more sense Change disable/enable feature macros to have a more significative name of what they actually do, to avoid confusions. New macros have the following names: AX_ARG_DEFAULT_ENABLE: feature is enabled by default, provides the --disable-{feature} option to disable it. AX_ARG_DEFAULT_DISABLE: feature is disabled by default, provides the --enable-{feature] option to enable it. Signed-off-by: Roger Pau Monne Acked-by: Ian Campbell Acked-by: Olaf Hering Committed-by: Ian Jackson --- tools/configure.ac | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'tools/configure.ac') diff --git a/tools/configure.ac b/tools/configure.ac index 3d53a9536d..4d96db0bfc 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -23,8 +23,7 @@ AC_USE_SYSTEM_EXTENSIONS AC_CANONICAL_HOST # M4 Macro includes -m4_include([m4/enable_feature.m4]) -m4_include([m4/disable_feature.m4]) +m4_include([m4/features.m4]) m4_include([m4/path_or_fail.m4]) m4_include([m4/python_version.m4]) m4_include([m4/python_devel.m4]) @@ -36,16 +35,15 @@ m4_include([m4/pkg.m4]) m4_include([m4/curses.m4]) # Enable/disable options -AX_ARG_ENABLE_AND_EXPORT([githttp], [Download GIT repositories via HTTP]) -AX_ARG_DISABLE_AND_EXPORT([monitors], - [Disable xenstat and xentop monitoring tools]) -AX_ARG_ENABLE_AND_EXPORT([vtpm], [Enable Virtual Trusted Platform Module]) -AX_ARG_ENABLE_AND_EXPORT([xapi], [Enable Xen API Bindings]) -AX_ARG_DISABLE_AND_EXPORT([pythontools], [Disable Python tools]) -AX_ARG_DISABLE_AND_EXPORT([ocamltools], [Disable Ocaml tools]) -AX_ARG_ENABLE_AND_EXPORT([miniterm], [Enable miniterm]) -AX_ARG_ENABLE_AND_EXPORT([lomount], [Enable lomount]) -AX_ARG_DISABLE_AND_EXPORT([debug], [Disable debug build of tools]) +AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP]) +AX_ARG_DEFAULT_ENABLE([monitors], [Disable xenstat and xentop monitoring tools]) +AX_ARG_DEFAULT_DISABLE([vtpm], [Enable Virtual Trusted Platform Module]) +AX_ARG_DEFAULT_DISABLE([xenapi], [Enable Xen API Bindings]) +AX_ARG_DEFAULT_ENABLE([pythontools], [Disable Python tools]) +AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools]) +AX_ARG_DEFAULT_DISABLE([miniterm], [Enable miniterm]) +AX_ARG_DEFAULT_DISABLE([lomount], [Enable lomount]) +AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools]) AC_ARG_VAR([PREPEND_INCLUDES], [List of include folders to prepend to CFLAGS (without -I)]) -- cgit v1.2.3