Revert 24897:f25e5785327e "Export configure variables to hypervisor build"

Signed-off-by: Keir Fraser <keir@xen.org>

7 files changed, 4 insertions, 26 deletions

diff --git a/.gitignore b/.gitignore
index 865505fb1e..8810b35b54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -111,7 +111,6 @@ tools/config.log
 tools/config.status
 tools/config.cache
 config/Tools.mk
-config/Xen.mk
 tools/blktap2/daemon/blktapctrl
 tools/blktap2/drivers/img2qcow
 tools/blktap2/drivers/lock-util
diff --git a/.hgignore b/.hgignore
index 7d5ccc17f8..46655adff6 100644
--- a/.hgignore
+++ b/.hgignore
@@ -309,7 +309,6 @@
 ^tools/config\.status$
 ^tools/config\.cache$
 ^config/Tools\.mk$
-^config/Xen\.mk$
 ^xen/\.banner.*$
 ^xen/BLOG$
 ^xen/System.map$
diff --git a/config/Tools.mk.in b/config/Tools.mk.in
index 315ced4945..06d5e8974b 100644
--- a/config/Tools.mk.in
+++ b/config/Tools.mk.in
@@ -24,6 +24,10 @@ PREPEND_LIB         := @PREPEND_LIB@
 APPEND_INCLUDES     := @APPEND_INCLUDES@
 APPEND_LIB          := @APPEND_LIB@
 
+# Enable XSM security module (by default, Flask).
+XSM_ENABLE          := @xsm@
+FLASK_ENABLE        := @xsm@
+
 # 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
diff --git a/config/Xen.mk.in b/config/Xen.mk.in
deleted file mode 100644
index e152f398aa..0000000000
--- a/config/Xen.mk.in
+++ /dev/null
@@ -1,19 +0,0 @@
-# Prefix and install folder
-PREFIX              := @prefix@
-LIBLEAFDIR_x86_64   := @LIB_PATH@
-
-# A debug build of xen?
-debug               := @debug@
-
-# Tools path
-PYTHON              := @PYTHON@
-
-# Extra folder for libs/includes
-PREPEND_INCLUDES    := @PREPEND_INCLUDES@
-PREPEND_LIB         := @PREPEND_LIB@
-APPEND_INCLUDES     := @APPEND_INCLUDES@
-APPEND_LIB          := @APPEND_LIB@
-
-# Enable XSM security module (by default, Flask).
-XSM_ENABLE          := @xsm@
-FLASK_ENABLE        := @xsm@
diff --git a/tools/configure b/tools/configure
index 5fe72cf8e2..5c0a314ec9 100755
--- a/tools/configure
+++ b/tools/configure
@@ -2446,8 +2446,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_config_files="$ac_config_files ../config/Tools.mk"
 
-ac_config_files="$ac_config_files ../config/Xen.mk"
-
 ac_config_headers="$ac_config_headers config.h"
 
 
@@ -9657,7 +9655,6 @@ for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
     "../config/Tools.mk") CONFIG_FILES="$CONFIG_FILES ../config/Tools.mk" ;;
-    "../config/Xen.mk") CONFIG_FILES="$CONFIG_FILES ../config/Xen.mk" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
diff --git a/tools/configure.ac b/tools/configure.ac
index 5b2815d16c..c5dec9c59f 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -6,7 +6,6 @@ AC_INIT([Xen Hypervisor], m4_esyscmd([../version.sh ../xen/Makefile]),
     [xen-devel@lists.xensource.com])
 AC_CONFIG_SRCDIR([libxl/libxl.c])
 AC_CONFIG_FILES([../config/Tools.mk])
-AC_CONFIG_FILES([../config/Xen.mk])
 AC_CONFIG_HEADERS([config.h])
 AC_PREFIX_DEFAULT([/usr])
 AC_CONFIG_AUX_DIR([.])
diff --git a/xen/Rules.mk b/xen/Rules.mk
index 6c17a3fad4..6123835ec1 100644
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -12,7 +12,6 @@ frame_pointer ?= n
 lto           ?= n
 
 include $(XEN_ROOT)/Config.mk
-include $(XEN_ROOT)/config/Xen.mk
 
 # Hardcoded configuration implications and dependencies.
 # Do this is a neater way if it becomes unwieldy.