Reuse most of configure-generated config

diff --git a/xen-config-host.mak b/xen-config-host.mak
index 7ddddf69137465feba22091fb85ccd0074269750..fae6d464914ab3814d3becf5743c62b3c236b6ff 100644 (file)
--- a/xen-config-host.mak
+++ b/xen-config-host.mak
@@ -1,36 +1 @@
-# Automatically generated by configure - do not modify
-# Configured with: ./configure --disable-curses
-prefix=/usr/local
-bindir=${prefix}/bin
-mandir=${prefix}/share/man
-datadir=${prefix}/share/qemu
-docdir=${prefix}/share/doc/qemu
-MAKE=make
-INSTALL=install
-CC=gcc-3.4
-HOST_CC=gcc
-AR=ar
-STRIP=strip -s -R .comment -R .note
-OS_CFLAGS=
-OS_LDFLAGS=
-ARCH_CFLAGS=-m32
-ARCH_LDFLAGS=-m32
-CFLAGS= -Wall -O2 -g -fno-strict-aliasing
-LDFLAGS= -g
-EXESUF=
-AIOLIBS=-lrt -lpthread
-ARCH=i386
-CONFIG_GDBSTUB=yes
-CONFIG_SLIRP=yes
-CONFIG_OSS=yes
-CONFIG_VNC_TLS=yes
-CONFIG_VNC_TLS_CFLAGS= 
-CONFIG_VNC_TLS_LIBS=-lgnutls  
-VERSION=0.9.1
-SRC_PATH=/u/iwj/work/qemu-iwj.git
 TARGET_DIRS=i386-dm
-BUILD_DOCS=yes
-CONFIG_SDL=yes
-SDL_LIBS=-L/usr/lib -lSDL
-SDL_CFLAGS=-I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
-TOOLS=qemu-img$(EXESUF) 

diff --git a/xen-config.mak b/xen-config.mak
index aa0101c969b9aaa0df7a7294cc721a937d0c495e..74ae2c0ebbe2838a7c12231ebb53e7f2bb1d72c7 100644 (file)
--- a/xen-config.mak
+++ b/xen-config.mak
@@ -1,3 +1,6 @@
 include ../config-host.mak
 XEN_ROOT ?= ../../xen-unstable.hg
 include $(XEN_ROOT)/tools/Rules.mk
+
+TARGET_ARCH=i386
+CONFIG_SOFTMMU=yes

diff --git a/xen-setup b/xen-setup
index db5b91df841d39fd4343f75590207c2af42f825e..1f52b42df6f4e9514e668f04240e892075cb9461 100755 (executable)
--- a/xen-setup
+++ b/xen-setup
@@ -12,5 +12,5 @@ target=i386-dm
 
 ln -sf ../Makefile.target $target/Makefile
 ln -sf ../xen-config.mak $target/config.mak
-ln -sf xen-config-host.mak config-host.mak
+cat xen-config-host.mak >>config-host.mak
 echo '#include "xen-config-host.h"' >>config-host.h