From: Alexey Kardashevskiy <aik@ozlabs.ru>
Date: Mon, 15 Jan 2018 02:35:01 +0000 (+1100)
Subject: configure: Allow capstone=git only if git update is not disabled
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=123ac0bba97597ae79915c4691b95515b60f00e7;p=qemu.git

configure: Allow capstone=git only if git update is not disabled

Even with --disable-git-update, ./configure tries updating the capstone
submodule instead of marking it "no"; this disables capstone submodule
if git update is disabled.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---

diff --git a/configure b/configure
index 62562f08cf..c1bbf17559 100755
--- a/configure
+++ b/configure
@@ -4568,7 +4568,7 @@ case "$capstone" in
   "" | yes)
     if $pkg_config capstone; then
       capstone=system
-    elif test -e "${source_path}/.git" ; then
+    elif test -e "${source_path}/.git" -a $git_update = 'yes' ; then
       capstone=git
     elif test -e "${source_path}/capstone/Makefile" ; then
       capstone=internal