diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2010-05-26 16:08:29 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2010-06-10 00:09:50 +0200 |
| commit | ca35f780ac4654bfa086613c72b011448afff327 (patch) | |
| tree | 35c25085df9a793310743179fe82cb18540eb60f | |
| parent | 683035de789e3a0141b1c3bbfdc6180fbc67aaf1 (diff) | |
| download | qemu-ca35f780ac4654bfa086613c72b011448afff327.tar.gz qemu-ca35f780ac4654bfa086613c72b011448afff327.tar.bz2 qemu-ca35f780ac4654bfa086613c72b011448afff327.zip | |
move computation of tools and roms outside of config-host.mak generation
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
| -rwxr-xr-x | configure | 40 |
1 files changed, 21 insertions, 19 deletions
@@ -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 |