[Xen-changelog] [xen-unstable] Revert 24897:f25e5785327e "Export configure variables to hypervisor build"

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1330528291 0
# Node ID fa3f08ce6b75f8ff1c41bb254ea479de75583c9b
# Parent  39283113682e31f633a919f164cf5d16868ac352
Revert 24897:f25e5785327e "Export configure variables to hypervisor build"

Signed-off-by: Keir Fraser <keir@xxxxxxx>
---


diff -r 39283113682e -r fa3f08ce6b75 .gitignore
--- a/.gitignore        Wed Feb 29 14:38:28 2012 +0000
+++ b/.gitignore        Wed Feb 29 15:11:31 2012 +0000
@@ -111,7 +111,6 @@
 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 -r 39283113682e -r fa3f08ce6b75 .hgignore
--- a/.hgignore Wed Feb 29 14:38:28 2012 +0000
+++ b/.hgignore Wed Feb 29 15:11:31 2012 +0000
@@ -309,7 +309,6 @@
 ^tools/config\.status$
 ^tools/config\.cache$
 ^config/Tools\.mk$
-^config/Xen\.mk$
 ^xen/\.banner.*$
 ^xen/BLOG$
 ^xen/System.map$
diff -r 39283113682e -r fa3f08ce6b75 config/Tools.mk.in
--- a/config/Tools.mk.in        Wed Feb 29 14:38:28 2012 +0000
+++ b/config/Tools.mk.in        Wed Feb 29 15:11:31 2012 +0000
@@ -24,6 +24,10 @@
 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 -r 39283113682e -r fa3f08ce6b75 config/Xen.mk.in
--- a/config/Xen.mk.in  Wed Feb 29 14:38:28 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 39283113682e -r fa3f08ce6b75 tools/configure
--- a/tools/configure   Wed Feb 29 14:38:28 2012 +0000
+++ b/tools/configure   Wed Feb 29 15:11:31 2012 +0000
@@ -2446,8 +2446,6 @@
 
 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 @@
 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 -r 39283113682e -r fa3f08ce6b75 tools/configure.ac
--- a/tools/configure.ac        Wed Feb 29 14:38:28 2012 +0000
+++ b/tools/configure.ac        Wed Feb 29 15:11:31 2012 +0000
@@ -6,7 +6,6 @@
     [xen-devel@xxxxxxxxxxxxxxxxxxx])
 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 -r 39283113682e -r fa3f08ce6b75 xen/Rules.mk
--- a/xen/Rules.mk      Wed Feb 29 14:38:28 2012 +0000
+++ b/xen/Rules.mk      Wed Feb 29 15:11:31 2012 +0000
@@ -12,7 +12,6 @@
 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.

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog