summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorPaolo Bonzini2010-05-26 16:08:17 +0200
committerAurelien Jarno2010-06-10 00:09:48 +0200
commitf55fe2785c017a00b3aef547a68e2dd1a4843a16 (patch)
treeb901b8878e50b724bca59488fbf7df14d8ed6fb9 /configure
parentconfigure: bail out early on invalid -cpu option (diff)
downloadqemu-f55fe2785c017a00b3aef547a68e2dd1a4843a16.tar.gz
qemu-f55fe2785c017a00b3aef547a68e2dd1a4843a16.tar.xz
qemu-f55fe2785c017a00b3aef547a68e2dd1a4843a16.zip
configure: avoid using expr
Just a personal preference against duplicating hieroglyphics. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure11
1 files changed, 9 insertions, 2 deletions
diff --git a/configure b/configure
index 1d4f1e4235..57eb27ffc5 100755
--- a/configure
+++ b/configure
@@ -928,6 +928,13 @@ if test -z "$target_list" ; then
echo "No targets enabled"
exit 1
fi
+# see if system emulation was really requested
+case " $target_list " in
+ *"-softmmu "*) softmmu=yes
+ ;;
+ *) softmmu=no
+ ;;
+esac
feature_not_found() {
feature=$1
@@ -2282,7 +2289,7 @@ bsd)
esac
tools=
-if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
+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"
@@ -2298,7 +2305,7 @@ echo "TOOLS=$tools" >> $config_host_mak
roms=
if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \
"$targetos" != "Darwin" -a "$targetos" != "SunOS" -a \
- `expr "$target_list" : ".*softmmu.*"` != 0 ; then
+ "$softmmu" = yes ; then
roms="optionrom"
fi
echo "ROMS=$roms" >> $config_host_mak