[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/14] move computation of tools and roms outside of
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 14/14] move computation of tools and roms outside of config-host.mak generation |
Date: |
Wed, 26 May 2010 16:08:29 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
configure | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/configure b/configure
index 488ef07..d9983b0 100755
--- a/configure
+++ b/configure
@@ -1991,6 +1991,27 @@ fi
confdir=$sysconfdir$confsuffix
+tools=
+if test "$softmmu" = yes ; then
+ tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
+ if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
+ tools="qemu-nbd\$(EXESUF) $tools"
+ if [ "$check_utests" = "yes" ]; then
+ tools="check-qint check-qstring check-qdict check-qlist $tools"
+ tools="check-qfloat check-qjson $tools"
+ fi
+ fi
+fi
+
+# Mac OS X ships with a broken assembler
+roms=
+if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \
+ "$targetos" != "Darwin" -a "$targetos" != "SunOS" -a \
+ "$softmmu" = yes ; then
+ roms="optionrom"
+fi
+
+
echo "Install prefix $prefix"
echo "BIOS directory `eval echo $datadir`"
echo "binary directory `eval echo $bindir`"
@@ -2293,26 +2314,7 @@ bsd)
;;
esac
-tools=
-if test "$softmmu" = yes ; then
- tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
- if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
- tools="qemu-nbd\$(EXESUF) $tools"
- if [ "$check_utests" = "yes" ]; then
- tools="check-qint check-qstring check-qdict check-qlist $tools"
- tools="check-qfloat check-qjson $tools"
- fi
- fi
-fi
echo "TOOLS=$tools" >> $config_host_mak
-
-# Mac OS X ships with a broken assembler
-roms=
-if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \
- "$targetos" != "Darwin" -a "$targetos" != "SunOS" -a \
- "$softmmu" = yes ; then
- roms="optionrom"
-fi
echo "ROMS=$roms" >> $config_host_mak
echo "MAKE=$make" >> $config_host_mak
echo "INSTALL=$install" >> $config_host_mak
--
1.6.6.1
- [Qemu-devel] [PATCH 12/14] ignore unknown --xyzdir options, (continued)
- [Qemu-devel] [PATCH 12/14] ignore unknown --xyzdir options, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 05/14] introduce sysconfsuffix, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 06/14] introduce confdir and confsuffix, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 10/14] expand ${prefix} in create_config, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 08/14] unify handling of xyzdir variables, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 02/14] avoid using expr in configure, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 09/14] move all directory entries in config-host.mak close, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 01/14] bail out early on invalid -cpu option, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 03/14] dyngen is long time gone, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 04/14] delete duplicate create_config case stanza, Paolo Bonzini, 2010/05/26
- [Qemu-devel] [PATCH 14/14] move computation of tools and roms outside of config-host.mak generation,
Paolo Bonzini <=
- Re: [Qemu-devel] [PATCH 00/14] configure --xyzdir options cleanup, Richard Henderson, 2010/05/26