diff options
| author | Alexey Kardashevskiy <aik@ozlabs.ru> | 2018-01-15 13:35:01 +1100 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2018-02-10 10:12:33 +0300 |
| commit | 123ac0bba97597ae79915c4691b95515b60f00e7 (patch) | |
| tree | b7096431098ab9d8ea7765e324e32ecf9cfc6385 | |
| parent | d0081e8f260d012d050405d1e549b445948d1451 (diff) | |
| download | focaccia-qemu-123ac0bba97597ae79915c4691b95515b60f00e7.tar.gz focaccia-qemu-123ac0bba97597ae79915c4691b95515b60f00e7.zip | |
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>
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
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 |