aboutsummaryrefslogtreecommitdiffstats
path: root/Config.mk
diff options
context:
space:
mode:
authorIan Jackson <ian.jackson@eu.citrix.com>2012-02-22 01:55:03 +0000
committerIan Jackson <ian.jackson@eu.citrix.com>2012-02-22 01:55:03 +0000
commit85896a7c4dc7b6b1dba2db79dfb0ca61738a92a4 (patch)
tree680508e2d4592ff706364d6c5a000729003f5f04 /Config.mk
parentfa674239ae719f35ee831d2d6fbfee1ccaab8303 (diff)
downloadxen-85896a7c4dc7b6b1dba2db79dfb0ca61738a92a4.tar.gz
xen-85896a7c4dc7b6b1dba2db79dfb0ca61738a92a4.tar.bz2
xen-85896a7c4dc7b6b1dba2db79dfb0ca61738a92a4.zip
build: add autoconf to replace custom checks in tools/check
Added autotools magic to replace custom check scripts. The previous checks have been ported to autoconf, and some additional ones have been added (plus the suggestions from running autoscan). Two files are created as a result from executing configure script, config/Tools.mk and config.h. conf/Tools.mk is included by tools/Rules.mk, and contains most of the options previously defined in .config, that can now be set passing parameters or defining environment variables when executing configure script. config.h is only used by libxl/xl to detect yajl_version.h. [ tools/config.sub and config.guess copied from autotools-dev 20100122.1 from Debian squeeze i386, which is GPLv2. tools/configure generated using the included ./autogen.sh which ran autoconf 2.67-2 from Debian squeeze i386. autoconf is GPLv3+ but has a special exception for the autoconf output; this exception applies to us and exempts us from complying with GPLv3+ for configure, which is good as Xen is GPL2 only. - Ian Jackson ] Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu> Tested-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.mk39
1 files changed, 0 insertions, 39 deletions
diff --git a/Config.mk b/Config.mk
index 087bf57270..107bae208f 100644
--- a/Config.mk
+++ b/Config.mk
@@ -70,9 +70,6 @@ EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBLEAFDIR)
endif
-BISON ?= bison
-FLEX ?= flex
-
PYTHON ?= python
PYTHON_PREFIX_ARG ?= --prefix="$(PREFIX)"
# The above requires that PREFIX contains *no spaces*. This variable is here
@@ -175,32 +172,9 @@ CFLAGS += $(foreach i, $(PREPEND_INCLUDES), -I$(i))
APPEND_LDFLAGS += $(foreach i, $(APPEND_LIB), -L$(i))
APPEND_CFLAGS += $(foreach i, $(APPEND_INCLUDES), -I$(i))
-CHECK_LIB = $(EXTRA_LIB) $(PREPEND_LIB) $(APPEND_LIB)
-CHECK_INCLUDES = $(EXTRA_INCLUDES) $(PREPEND_INCLUDES) $(APPEND_INCLUDES)
-
EMBEDDED_EXTRA_CFLAGS := -nopie -fno-stack-protector -fno-stack-protector-all
EMBEDDED_EXTRA_CFLAGS += -fno-exceptions
-CONFIG_LIBICONV := $(shell export OS="`uname -s`"; \
- export CHECK_LIB="$(CHECK_LIB)"; \
- . $(XEN_ROOT)/tools/check/funcs.sh; \
- has_lib libiconv.so && echo 'y' || echo 'n')
-
-CONFIG_YAJL_VERSION := $(shell export OS="`uname -s`"; \
- export CHECK_INCLUDES="$(CHECK_INCLUDES)"; \
- . $(XEN_ROOT)/tools/check/funcs.sh; \
- has_header yajl/yajl_version.h && echo 'y' || echo 'n')
-
-# Enable XSM security module (by default, Flask).
-XSM_ENABLE ?= n
-FLASK_ENABLE ?= $(XSM_ENABLE)
-
-# Download GIT repositories via HTTP or GIT's own protocol?
-# GIT's protocol is faster and more robust, when it works at all (firewalls
-# may block it). We make it the default, but if your GIT repository downloads
-# fail or hang, please specify GIT_HTTP=y in your environment.
-GIT_HTTP ?= n
-
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
@@ -239,17 +213,4 @@ QEMU_TAG ?= 128de2549c5f24e4a437b86bd2e46f023976d50a
# Short answer -- do not enable this unless you know what you are
# doing and are prepared for some pain.
-# Optional components
-XENSTAT_XENTOP ?= y
-VTPM_TOOLS ?= n
-LIBXENAPI_BINDINGS ?= n
-PYTHON_TOOLS ?= y
-OCAML_TOOLS ?= y
-CONFIG_MINITERM ?= n
-CONFIG_LOMOUNT ?= n
-CONFIG_SYSTEM_LIBAIO ?= y
CONFIG_TESTS ?= y
-
-ifeq ($(OCAML_TOOLS),y)
-OCAML_TOOLS := $(shell ocamlopt -v > /dev/null 2>&1 && echo "y" || echo "n")
-endif