[PATCH v1] meson: fix yajl detection

Olaf Hering olaf at aepfle.de
Thu Nov 12 23:01:39 UTC 2020


yajl_tree_parse is declared in yajl/yajl_tree.h
autoconf is more forgiving, the error did not trigger because
yajl_tree_parse is not actually used.

Fixes commit 44b8df4cb4b3f0c143e0330f543812e6bcd5c9f0
Fixes commit 88ab32a4e555f67dae3204fbc3bcf63d3da8ad2b

Signed-off-by: Olaf Hering <olaf at aepfle.de>
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 9ee8dffa60..2b2ce6dfb1 100644
--- a/meson.build
+++ b/meson.build
@@ -1471,7 +1471,7 @@ if not get_option('yajl').disabled()
   if not yajl_dep.found()
     yajl_dep = cc.find_library('yajl', required: get_option('yajl'))
     if yajl_dep.found()
-      has_func = cc.has_function('yajl_tree_parse', dependencies: yajl_dep, prefix: '#include <yajl/yajl_common.h>')
+      has_func = cc.has_function('yajl_tree_parse', dependencies: yajl_dep, prefix: '#include <yajl/yajl_tree.h>')
       if not has_func and get_option('yajl').enabled()
         error('yajl >= @0@ was not found'.format(yajl_version))
       elif not has_func




More information about the libvir-list mailing list