mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-29 03:51:17 +00:00
9cf38263d0
Yajl has not seen much activity upstream recently. Switch to using Jansson >= 2.5. All the platforms we target on https://libvirt.org/platforms.html have a version >= 2.7 listed on the sites below: https://repology.org/metapackage/jansson/versions https://build.opensuse.org/package/show/devel:libraries:c_c++/libjansson Additionally, Ubuntu 14.04 on Travis-CI has 2.5. Set the requirement to 2.5 since we don't use anything from newer versions. Implement virJSONValue{From,To}String using Jansson, delete the yajl code (and the related virJSONParser structure) and report an error if someone explicitly specifies --with-yajl. Also adjust the test data to account for Jansson's different whitespace usage for empty arrays and tune up the specfile to keep 'make rpm' working when bisecting. Signed-off-by: Ján Tomko <jtomko@redhat.com>
87 lines
2.6 KiB
Plaintext
87 lines
2.6 KiB
Plaintext
dnl The libvirt nsswitch plugin
|
|
dnl
|
|
dnl Copyright (C) 2016 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_NSS],[
|
|
LIBVIRT_ARG_WITH([NSS_PLUGIN],
|
|
[enable Name Service Switch plugin for resolving guest
|
|
IP addresses], [check])
|
|
])
|
|
|
|
AC_DEFUN([LIBVIRT_CHECK_NSS],[
|
|
bsd_nss=no
|
|
fail=0
|
|
if test "x$with_nss_plugin" != "xno" ; then
|
|
if test "x$with_jansson" != "xyes" ; then
|
|
if test "x$with_nss_plugin" = "xyes" ; then
|
|
AC_MSG_ERROR([Can't build nss plugin without JSON support])
|
|
else
|
|
with_nss_plugin=no
|
|
fi
|
|
fi
|
|
|
|
if test "x$with_network" != "xyes" ; then
|
|
if test "x$with_nss_plugin" = "xyes" ; then
|
|
AC_MSG_ERROR([Can't build nss plugin without network])
|
|
else
|
|
with_nss_plugin=no
|
|
fi
|
|
fi
|
|
|
|
if test "x$with_nss_plugin" != "xno" ; then
|
|
AC_CHECK_HEADERS([nss.h], [
|
|
with_nss_plugin=yes
|
|
],[
|
|
if test "x$with_nss_plugin" = "xyes" ; then
|
|
fail = 1
|
|
fi
|
|
])
|
|
|
|
if test $fail = 1 ; then
|
|
AC_MSG_ERROR([Can't build nss plugin without nss.h])
|
|
fi
|
|
fi
|
|
|
|
if test "x$with_nss_plugin" = "xyes" ; then
|
|
AC_DEFINE_UNQUOTED([NSS], 1, [whether nss plugin is enabled])
|
|
|
|
AC_CHECK_TYPE([struct gaih_addrtuple],
|
|
[AC_DEFINE([HAVE_STRUCT_GAIH_ADDRTUPLE], [1],
|
|
[Defined if struct gaih_addrtuple exists in nss.h])],
|
|
[], [[#include <nss.h>
|
|
]])
|
|
|
|
AC_CHECK_TYPES([ns_mtab, nss_module_unregister_fn],
|
|
[AC_DEFINE([HAVE_BSD_NSS],
|
|
[1],
|
|
[whether using BSD style NSS])
|
|
bsd_nss=yes
|
|
],
|
|
[],
|
|
[#include <nsswitch.h>])
|
|
fi
|
|
fi
|
|
|
|
AM_CONDITIONAL(WITH_NSS, [test "x$with_nss_plugin" = "xyes"])
|
|
AM_CONDITIONAL(WITH_BSD_NSS, [test "x$bsd_nss" = "xyes"])
|
|
])
|
|
|
|
AC_DEFUN([LIBVIRT_RESULT_NSS],[
|
|
LIBVIRT_RESULT([nss], [$with_nss_plugin])
|
|
])
|