All of lore.kernel.org
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: alex.bennee@linaro.org, david@redhat.com
Subject: [Qemu-devel] [PATCH 1/3] capstone: Adjust include of capstone.h
Date: Wed, 22 May 2019 22:42:27 -0400	[thread overview]
Message-ID: <20190523024229.1158-2-richard.henderson@linaro.org> (raw)
In-Reply-To: <20190523024229.1158-1-richard.henderson@linaro.org>

Since v4.0, capstone.h has moved to <capstone/capstone.h>.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 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



  reply	other threads:[~2019-05-23  2:54 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-23  2:42 [Qemu-devel] [PATCH 0/3] Update capstone module Richard Henderson
2019-05-23  2:42 ` Richard Henderson [this message]
2019-05-23  6:23   ` [Qemu-devel] [PATCH 1/3] capstone: Adjust include of capstone.h Alex Bennée
2019-05-23  8:28   ` David Hildenbrand
2019-05-23 11:04   ` Philippe Mathieu-Daudé
2019-05-23 11:07   ` Daniel P. Berrangé
2019-05-23 11:17     ` Philippe Mathieu-Daudé
2019-05-23 11:23       ` Daniel P. Berrangé
2019-05-23 11:32     ` Alex Bennée
2019-05-23 13:05     ` Richard Henderson
2019-05-23 19:24     ` Richard Henderson
2019-05-23  2:42 ` [Qemu-devel] [PATCH 2/3] capstone: Update to master Richard Henderson
2019-05-23  8:28   ` David Hildenbrand
2019-05-23 11:14   ` Philippe Mathieu-Daudé
2019-05-23  2:42 ` [Qemu-devel] [PATCH 3/3] capstone: Enable disassembly for s390x Richard Henderson
2019-05-23  8:27   ` David Hildenbrand
2019-05-23 12:34     ` Richard Henderson
2019-05-23 19:26   ` Richard Henderson
2019-05-23 19:27     ` Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190523024229.1158-2-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=alex.bennee@linaro.org \
    --cc=david@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.