]> xenbits.xensource.com Git - libvirt.git/commitdiff
Do not check for pkcheck
authorJán Tomko <jtomko@redhat.com>
Wed, 7 Mar 2018 09:17:57 +0000 (10:17 +0100)
committerJán Tomko <jtomko@redhat.com>
Wed, 14 Mar 2018 11:46:26 +0000 (12:46 +0100)
All we need is D-Bus.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
m4/virt-polkit.m4

index 5c2a3c1e3a0fb4cbb0fc281089ec8b0a73a74f65..fd729dc98b4b989b63926ce37056eb894c5eca39 100644 (file)
@@ -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])
 ])