提交 44b8df4c 编写于 作者: J Ján Tomko

build: restore support for libyajl 2.0.1

Commit 10575666 was too eager and did
not consider SLES 12 which still has 2.0.1 that does not ship
a pkg-config file.

Similar to how we check for readline, prefer pkg-config if available
and fall back to the old detection code if not found.

NB: this is not a clean revert because we're not reintroducing support
for YAJL 1.
Signed-off-by: NJán Tomko <jtomko@redhat.com>
Reported-by: NOlaf Hering <olaf@aepfle.de>
Reviewed-by: NAndrea Bolognani <abologna@redhat.com>
上级 c0e31f90
......@@ -24,7 +24,17 @@ AC_DEFUN([LIBVIRT_ARG_YAJL],[
AC_DEFUN([LIBVIRT_CHECK_YAJL],[
dnl YAJL JSON library http://lloyd.github.com/yajl/
PKG_CHECK_EXISTS([readline], [use_pkgconfig=1], [use_pkgconfig=0])
if test $use_pkgconfig = 1; then
dnl 2.0.3 was the version where the pkg-config file was first added
LIBVIRT_CHECK_PKG([YAJL], [yajl], [2.0.3])
else
dnl SLES 12 and openSUSE Leap 42.3 still use 2.0.1
dnl TODO: delete this in July 2020
LIBVIRT_CHECK_LIB([YAJL], [yajl],
[yajl_tree_parse], [yajl/yajl_common.h])
fi
])
AC_DEFUN([LIBVIRT_RESULT_YAJL],[
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册