External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: restore support for libyajl 2.0.1

Browse Source 
Commit 105756660f944e7db02de3b55b98bb7c11cd03bf 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: Ján Tomko <jtomko@redhat.com>
Reported-by: Olaf Hering <olaf@aepfle.de>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Ján Tomko 2019-05-09 13:11:44 +02:00
parent c0e31f906c
commit 44b8df4cb4
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
m4/virt-yajl.m4
View File

@ -24,7 +24,17 @@ AC_DEFUN([LIBVIRT_ARG_YAJL],[
AC_DEFUN([LIBVIRT_CHECK_YAJL],[
dnl YAJL JSON library http://lloyd.github.com/yajl/
LIBVIRT_CHECK_PKG([YAJL], [yajl], [2.0.3])
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],[