aboutsummaryrefslogtreecommitdiffstats
path: root/Config.mk
diff options
context:
space:
mode:
authorDaniel De Graaf <dgdegra@tycho.nsa.gov>2012-03-01 15:22:09 +0000
committerDaniel De Graaf <dgdegra@tycho.nsa.gov>2012-03-01 15:22:09 +0000
commit1b21c0b45981cfe56777075e51268eed0371bbf2 (patch)
treefa32885548e4e2e27588c164aae9eb8c3439b9f4 /Config.mk
parenta55f818f8b43da55c139b9f97f85e4dd8ea320b2 (diff)
downloadxen-1b21c0b45981cfe56777075e51268eed0371bbf2.tar.gz
xen-1b21c0b45981cfe56777075e51268eed0371bbf2.tar.bz2
xen-1b21c0b45981cfe56777075e51268eed0371bbf2.zip
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 <dgdegra@tycho.nsa.gov> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'Config.mk')
-rw-r--r--Config.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/Config.mk b/Config.mk
index bc6be65e51..97bc9bef49 100644
--- a/Config.mk
+++ b/Config.mk
@@ -175,6 +175,10 @@ APPEND_CFLAGS += $(foreach i, $(APPEND_INCLUDES), -I$(i))
EMBEDDED_EXTRA_CFLAGS := -nopie -fno-stack-protector -fno-stack-protector-all
EMBEDDED_EXTRA_CFLAGS += -fno-exceptions
+# Enable XSM security module (by default, Flask).
+XSM_ENABLE ?= n
+FLASK_ENABLE ?= $(XSM_ENABLE)
+
XEN_EXTFILES_URL=http://xenbits.xensource.com/xen-extfiles
# All the files at that location were downloaded from elsewhere on
# the internet. The original download URL is preserved as a comment