[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
- [Qemu-trivial] [PULL 06/17] qemu-options.hx: Remove confusing spaces in parameter listings, (continued)
- [Qemu-trivial] [PULL 06/17] qemu-options.hx: Remove confusing spaces in parameter listings, Michael Tokarev, 2018/02/10
- [Qemu-trivial] [PULL 15/17] tests/hbitmap: use ARRAY_SIZE macro, Michael Tokarev, 2018/02/10
- [Qemu-trivial] [PULL 17/17] tests/qapi: use ARRAY_SIZE macro, Michael Tokarev, 2018/02/10
- [Qemu-trivial] [PULL 16/17] tests/qapi: use QEMU_IS_ALIGNED macro, Michael Tokarev, 2018/02/10
- [Qemu-trivial] [PULL 10/17] maint: Mention web site maintenance in README, Michael Tokarev, 2018/02/10
- [Qemu-trivial] [PULL 13/17] qga: use ARRAY_SIZE macro, Michael Tokarev, 2018/02/10
- [Qemu-trivial] [PULL 11/17] oslib-posix: check for posix_memalign in configure script, Michael Tokarev, 2018/02/10
- [Qemu-trivial] [PULL 12/17] MAINTAINERS: Add qemu-binfmt-conf.sh script, Michael Tokarev, 2018/02/10
- [Qemu-trivial] [PULL 09/17] build: fix typo in error message, Michael Tokarev, 2018/02/10
- [Qemu-trivial] [PULL 14/17] async: use ARRAY_SIZE macro, Michael Tokarev, 2018/02/10
- [Qemu-trivial] [PULL 08/17] configure: Allow capstone=git only if git update is not disabled,
Michael Tokarev <=
- [Qemu-trivial] [PULL 07/17] scripts/make-release: Don't archive .git files, Michael Tokarev, 2018/02/10
- [Qemu-trivial] [PULL 04/17] Drop unneeded system header includes, Michael Tokarev, 2018/02/10
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/17] Trivial patches for 2018-02-10, Peter Maydell, 2018/02/12