From: Thomas Huth <thuth@redhat.com>
Date: Mon, 21 Feb 2022 09:06:47 +0000 (+0100)
Subject: configure: Disable capstone and slirp in the --without-default-features mode
X-Git-Tag: v7.0.0-rc0~44^2~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0577e84d374572344bb1cc87c9778357597a3fad;p=users%2Fdwmw2%2Fqemu.git

configure: Disable capstone and slirp in the --without-default-features mode

For the users, it looks a little bit weird that capstone and slirp are
not disabled automatically if they run the configure script with the
"--without-default-features" option, so let's do that now.
Note: fdt is *not* changed accordingly since this affects the targets
that we can build, so disabling fdt automatically here might have
unexpected side-effects for the users.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220221090647.150184-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---

diff --git a/configure b/configure
index 3a29eff5cc..36d10d95bb 100755
--- a/configure
+++ b/configure
@@ -361,9 +361,14 @@ slirp_smbd="$default_feature"
 # are included in the automatically generated help message)
 
 # 1. Track which submodules are needed
-capstone="auto"
+if test "$default_feature" = no ; then
+  capstone="disabled"
+  slirp="disabled"
+else
+  capstone="auto"
+  slirp="auto"
+fi
 fdt="auto"
-slirp="auto"
 
 # 2. Support --with/--without option
 default_devices="true"