[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/3] capstone: Adjust include of capstone.h
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 1/3] capstone: Adjust include of capstone.h |
Date: |
Wed, 22 May 2019 22:42:27 -0400 |
Since v4.0, capstone.h has moved to <capstone/capstone.h>.
Signed-off-by: Richard Henderson <address@hidden>
---
include/disas/capstone.h | 4 ++++
configure | 6 ++++++
2 files changed, 10 insertions(+)
diff --git a/include/disas/capstone.h b/include/disas/capstone.h
index e29068dd97..90631d84a9 100644
--- a/include/disas/capstone.h
+++ b/include/disas/capstone.h
@@ -3,7 +3,11 @@
#ifdef CONFIG_CAPSTONE
+#ifdef CONFIG_CAPSTONE_CAPSTONE_H
+#include <capstone/capstone.h>
+#else
#include <capstone.h>
+#endif
#else
diff --git a/configure b/configure
index d2fc346302..eec7f061c3 100755
--- a/configure
+++ b/configure
@@ -5021,6 +5021,9 @@ case "$capstone" in
system)
QEMU_CFLAGS="$QEMU_CFLAGS $($pkg_config --cflags capstone)"
LIBS="$($pkg_config --libs capstone) $LIBS"
+ if check_include capstone/capstone.h; then
+ capstone_capstone_h=yes
+ fi
;;
no)
@@ -7197,6 +7200,9 @@ if test "$ivshmem" = "yes" ; then
fi
if test "$capstone" != "no" ; then
echo "CONFIG_CAPSTONE=y" >> $config_host_mak
+ if test "$capstone_capstone_h" != "no" ; then
+ echo "CONFIG_CAPSTONE_CAPSTONE_H=y" >> $config_host_mak
+ fi
fi
if test "$debug_mutex" = "yes" ; then
echo "CONFIG_DEBUG_MUTEX=y" >> $config_host_mak
--
2.17.1
- [Qemu-devel] [PATCH 0/3] Update capstone module, Richard Henderson, 2019/05/22
- [Qemu-devel] [PATCH 3/3] capstone: Enable disassembly for s390x, Richard Henderson, 2019/05/22
- [Qemu-devel] [PATCH 2/3] capstone: Update to master, Richard Henderson, 2019/05/22
- [Qemu-devel] [PATCH 1/3] capstone: Adjust include of capstone.h,
Richard Henderson <=
- Re: [Qemu-devel] [PATCH 1/3] capstone: Adjust include of capstone.h, Alex Bennée, 2019/05/23
- Re: [Qemu-devel] [PATCH 1/3] capstone: Adjust include of capstone.h, David Hildenbrand, 2019/05/23
- Re: [Qemu-devel] [PATCH 1/3] capstone: Adjust include of capstone.h, Philippe Mathieu-Daudé, 2019/05/23
- Re: [Qemu-devel] [PATCH 1/3] capstone: Adjust include of capstone.h, Daniel P . Berrangé, 2019/05/23
- Re: [Qemu-devel] [PATCH 1/3] capstone: Adjust include of capstone.h, Alex Bennée, 2019/05/23
- Re: [Qemu-devel] [PATCH 1/3] capstone: Adjust include of capstone.h, Richard Henderson, 2019/05/23
- Re: [Qemu-devel] [PATCH 1/3] capstone: Adjust include of capstone.h, Richard Henderson, 2019/05/23