From 1b21c0b45981cfe56777075e51268eed0371bbf2 Mon Sep 17 00:00:00 2001 From: Daniel De Graaf Date: Thu, 1 Mar 2012 15:22:09 +0000 Subject: build: remove hypervisor-only configuration from tools/configure When adding autoconf support, the configuration options for XSM and FLASK_ENABLE were incorrectly removed from Config.mk and added to the tools configuration. Since these are hypervisor configuration options, they should not depend on running tools configuration. Signed-off-by: Daniel De Graaf Acked-by: Ian Jackson Committed-by: Ian Jackson --- tools/configure.ac | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tools/configure.ac') diff --git a/tools/configure.ac b/tools/configure.ac index 4dc2b695f7..e1b72f06a9 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -36,8 +36,6 @@ m4_include([m4/uuid.m4]) m4_include([m4/pkg.m4]) # Enable/disable options -AX_ARG_ENABLE_AND_EXPORT([xsm], - [Enable XSM security module (by default, Flask)]) AX_ARG_ENABLE_AND_EXPORT([githttp], [Download GIT repositories via HTTP]) AX_ARG_DISABLE_AND_EXPORT([monitors], [Disable xenstat and xentop monitoring tools]) @@ -47,7 +45,7 @@ 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 Xen and tools]) +AX_ARG_DISABLE_AND_EXPORT([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