[libvirt] [PATCH 3/3] Do not check for pkcheck

[Ján Tomko]

All we need is DBus.

Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 m4/virt-polkit.m4 | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/m4/virt-polkit.m4 b/m4/virt-polkit.m4
index 5c2a3c1e3..1016df4b3 100644
--- a/m4/virt-polkit.m4
+++ b/m4/virt-polkit.m4
@@ -25,27 +25,19 @@ 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 DBus, no need to check
+    dnl for anything else.
+    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
-- 
2.16.1