mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-11-03 20:01:16 +00:00
44b8df4cb4
Commit 105756660f 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>
43 lines
1.4 KiB
Plaintext
43 lines
1.4 KiB
Plaintext
dnl The libyajl.so library
|
|
dnl
|
|
dnl Copyright (C) 2012-2013 Red Hat, Inc.
|
|
dnl
|
|
dnl This library is free software; you can redistribute it and/or
|
|
dnl modify it under the terms of the GNU Lesser General Public
|
|
dnl License as published by the Free Software Foundation; either
|
|
dnl version 2.1 of the License, or (at your option) any later version.
|
|
dnl
|
|
dnl This library is distributed in the hope that it will be useful,
|
|
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
dnl Lesser General Public License for more details.
|
|
dnl
|
|
dnl You should have received a copy of the GNU Lesser General Public
|
|
dnl License along with this library. If not, see
|
|
dnl <http://www.gnu.org/licenses/>.
|
|
dnl
|
|
|
|
AC_DEFUN([LIBVIRT_ARG_YAJL],[
|
|
LIBVIRT_ARG_WITH_FEATURE([YAJL], [yajl], [check])
|
|
])
|
|
|
|
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],[
|
|
LIBVIRT_RESULT_LIB([YAJL])
|
|
])
|