qemu-trivial
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-trivial] [PULL 08/17] configure: Allow capstone=git only if git up


From: Michael Tokarev
Subject: [Qemu-trivial] [PULL 08/17] configure: Allow capstone=git only if git update is not disabled
Date: Sat, 10 Feb 2018 10:55:03 +0300

From: Alexey Kardashevskiy <address@hidden>

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 <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
2.11.0




reply via email to

[Prev in Thread] Current Thread [Next in Thread]