Re: [PATCH v3] disas: recognize either <capstone.h> or <capstone/capstone.h>

[Daniel P . Berrangé]

On Tue, Nov 22, 2022 at 10:45:59AM +0300, Michael Tokarev wrote:
> Historically, capstone varies in requiring either <capstone.h>
> or <capstone/capstone.h> include depending on version and the
> way how it has been installed.  This has already been an issue
> before, and will likely become an issue again with capstone
> 5.0 which seem to have changed this aspect once again.
> 
> Recognize both ways in the meson check, but prefer <capstone.h>
> so it's easy to override which capstone to use by
> pkgconfig's --cflags (or --extra-cflags).
> 
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> v2: use cc.has_header, not cc.compile (pm215)
> v3: fix the forgotten arg for config_host_data.set
>  (comitted locally but not included in previous format-patch)
> 
>  include/disas/capstone.h |  5 +++++
>  meson.build              | 21 +++++++++++----------
>  2 files changed, 16 insertions(+), 10 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|