configure: Allow capstone=git only if git update is not disabled
authorAlexey Kardashevskiy <aik@ozlabs.ru>
Mon, 15 Jan 2018 02:35:01 +0000 (13:35 +1100)
committerMichael Tokarev <mjt@tls.msk.ru>
Sat, 10 Feb 2018 07:12:33 +0000 (10:12 +0300)
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>
configure

index 62562f08cfc5607ad47eb8ebdf205717b10069f1..c1bbf17559d506ffba560e4ec24efedc6e4b29d5 100755 (executable)
--- 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