From 2499d1a095088b49e481e26e50b15c0a5573cbd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Wed, 7 Mar 2018 10:17:57 +0100 Subject: [PATCH] Do not check for pkcheck MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All we need is D-Bus. Signed-off-by: Ján Tomko --- m4/virt-polkit.m4 | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/m4/virt-polkit.m4 b/m4/virt-polkit.m4 index 5c2a3c1e3a..fd729dc98b 100644 --- a/m4/virt-polkit.m4 +++ b/m4/virt-polkit.m4 @@ -25,27 +25,18 @@ AC_DEFUN([LIBVIRT_ARG_POLKIT], [ AC_DEFUN([LIBVIRT_CHECK_POLKIT], [ AC_REQUIRE([LIBVIRT_CHECK_DBUS]) - PKCHECK_PATH= - if test "x$with_polkit" = "xyes" || test "x$with_polkit" = "xcheck"; then - dnl Check for new polkit first. We directly talk over DBus - dnl but we use existence of pkcheck binary as a sign that - dnl we should prefer polkit-1 over polkit-0, so we check - dnl for it even though we don't ultimately use it - AC_PATH_PROG([PKCHECK_PATH], [pkcheck], [], [$LIBVIRT_SBIN_PATH]) - if test "x$PKCHECK_PATH" != "x" ; then - dnl Found pkcheck, so ensure dbus-devel is present - if test "x$with_dbus" = "xyes" ; then - AC_DEFINE_UNQUOTED([WITH_POLKIT], 1, - [use PolicyKit for UNIX socket access checks]) - with_polkit="yes" + dnl All we need to talk to polkit is D-Bus. + if test "x$with_dbus" = "xyes" ; then + AC_DEFINE_UNQUOTED([WITH_POLKIT], 1, + [use PolicyKit for UNIX socket access checks]) + with_polkit="yes" + else + if test "x$with_polkit" = "xcheck" ; then + with_polkit=no else - if test "x$with_polkit" = "xcheck" ; then - with_polkit=no - else - AC_MSG_ERROR( - [You must install dbus to compile libvirt with polkit-1]) - fi + AC_MSG_ERROR( + [You must install dbus to compile libvirt with polkit-1]) fi fi fi @@ -54,6 +45,5 @@ AC_DEFUN([LIBVIRT_CHECK_POLKIT], [ ]) AC_DEFUN([LIBVIRT_RESULT_POLKIT], [ - msg="$PKCHECK_PATH (version 1)" - LIBVIRT_RESULT([polkit], [$with_polkit], [$msg]) + LIBVIRT_RESULT([polkit], [$with_polkit]) ])