NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

virt-nss: Introduce more checks before enabling NSS

Browse Source 
The plugin depends on more modules than we currently check for,
i.e. network driver and yajl library.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2016-12-25 13:42:42 +01:00
parent 9a3dd116a6
commit 09da661006
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -294,7 +294,6 @@ LIBVIRT_CHECK_LIBSSH
LIBVIRT_CHECK_LIBXML LIBVIRT_CHECK_LIBXML
LIBVIRT_CHECK_MACVTAP LIBVIRT_CHECK_MACVTAP
LIBVIRT_CHECK_NETCF LIBVIRT_CHECK_NETCF
LIBVIRT_CHECK_NSS
LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NUMACTL
LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_NWFILTER
LIBVIRT_CHECK_OPENWSMAN LIBVIRT_CHECK_OPENWSMAN
@ -479,6 +478,7 @@ LIBVIRT_CHECK_LOGIN_SHELL
LIBVIRT_CHECK_HOST_VALIDATE LIBVIRT_CHECK_HOST_VALIDATE
LIBVIRT_CHECK_TLS_PRIORITY LIBVIRT_CHECK_TLS_PRIORITY
LIBVIRT_CHECK_SYSCTL_CONFIG LIBVIRT_CHECK_SYSCTL_CONFIG
LIBVIRT_CHECK_NSS

18
m4/virt-nss.m4
View File

@ -26,6 +26,23 @@ AC_DEFUN([LIBVIRT_ARG_NSS],[
AC_DEFUN([LIBVIRT_CHECK_NSS],[ AC_DEFUN([LIBVIRT_CHECK_NSS],[
bsd_nss=no bsd_nss=no
fail=0 fail=0
if test "x$with_nss_plugin" != "xno" ; then
if test "x$with_yajl" != "xyes" ; then
if test "x$with_nss_plugin" = "xyes" ; then
AC_MSG_ERROR([Can't build nss plugin without yajl])
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 yajl])
else
with_nss_plugin=no
fi
fi
if test "x$with_nss_plugin" != "xno" ; then if test "x$with_nss_plugin" != "xno" ; then
AC_CHECK_HEADERS([nss.h], [ AC_CHECK_HEADERS([nss.h], [
with_nss_plugin=yes with_nss_plugin=yes
@ -38,6 +55,7 @@ AC_DEFUN([LIBVIRT_CHECK_NSS],[
if test $fail = 1 ; then if test $fail = 1 ; then
AC_MSG_ERROR([Can't build nss plugin without nss.h]) AC_MSG_ERROR([Can't build nss plugin without nss.h])
fi fi
fi
if test "x$with_nss_plugin" = "xyes" ; then if test "x$with_nss_plugin" = "xyes" ; then
AC_DEFINE_UNQUOTED([NSS], 1, [whether nss plugin is enabled]) AC_DEFINE_UNQUOTED([NSS], 1, [whether nss plugin is enabled])