Starting with version 4 of capstone, the header files live in the
`$prefix/include/capstone` directory.
This modifies the configure script to check for <capstone/capstone.h> if
<capstone.h> cannot be found.
Signed-off-by: Stephen Checkoway <stephen.checko...@oberlin.edu>
---
configure | 9 +++++++++
include/disas/capstone.h | 4 ++++
2 files changed, 13 insertions(+)
diff --git a/configure b/configure
index 1c563a7027..da87c18f14 100755
--- a/configure
+++ b/configure
@@ -5039,6 +5039,12 @@ case "$capstone" in
;;
esac
+if test "$capstone" != no; then
+ if ! check_include "capstone.h" && check_include "capstone/capstone.h"; then
+ have_capstone_capstone_h=yes
+ fi
+fi
+
##########################################
# check if we have fdatasync
@@ -7199,6 +7205,9 @@ if test "$ivshmem" = "yes" ; then
fi
if test "$capstone" != "no" ; then
echo "CONFIG_CAPSTONE=y" >> $config_host_mak
+ if test "$have_capstone_capstone_h" = "yes" ; then
+ echo "HAVE_CAPSTONE_CAPSTONE_H=y" >> $config_host_mak
+ fi
fi
if test "$debug_mutex" = "yes" ; then
echo "CONFIG_DEBUG_MUTEX=y" >> $config_host_mak
diff --git a/include/disas/capstone.h b/include/disas/capstone.h
index 84e214956d..e1477bf6a2 100644
--- a/include/disas/capstone.h
+++ b/include/disas/capstone.h
@@ -3,7 +3,11 @@
#ifdef CONFIG_CAPSTONE
+#ifdef HAVE_CAPSTONE_CAPSTONE_H
+#include <capstone/capstone.h>
+#else
#include <capstone.h>
+#endif
#else
--
2.20.1 (Apple Git-117)
