PolicyKit: Branch 'master'

[Colin Walters]

 configure.ac |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

New commits:
commit 80a10b589fa606930b0dab2e2613e77b734d9a6b
Author: Giovanni Campagna <gcampagna at src.gnome.org>
Date:   Tue Feb 19 17:31:45 2013 +0100

    build: try harder to avoid systemd/consolekit misconfiguration
    
    Check if the system is booting systemd, and fail if the automatic
    configuration picks the wrong value. Emit a warning if the user explicitly
    chose one way or the other, to account for cross-building.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=61127

diff --git a/configure.ac b/configure.ac
index 7d2dfcd..b1e478b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,6 +175,26 @@ if test "$enable_libsystemd_login" != "no"; then
   fi
 fi
 
+AS_IF([test "x$cross_compiling" != "xyes" ], [
+  AS_IF([test "$have_libsystemd_login" = "yes"], [
+    AS_IF([test ! -d /sys/fs/cgroup/systemd/ ], [
+      AS_IF([test "$enable_libsystemd_login" = "yes"], [
+        AC_MSG_WARN([libsystemd-login requested but system does not appear to be using systemd])
+      ], [
+        AC_MSG_ERROR([libsystemd-login autoconfigured, but system does not appear to use systemd])
+      ])
+    ])
+  ], [
+    AS_IF([test -d /sys/fs/cgroup/systemd/ ], [
+      AS_IF([test "$enable_libsystemd_login" = "no" ], [
+        AC_MSG_WARN([ConsoleKit requested but system appears to use systemd])
+      ], [
+        AC_MSG_ERROR([ConsoleKit autoconfigured, but systemd is in use (missing libsystemd-login pkg-config?)])
+      ])
+    ])
+  ])
+])
+
 AC_SUBST(LIBSYSTEMD_LOGIN_CFLAGS)
 AC_SUBST(LIBSYSTEMD_LOGIN_LIBS)
 AM_CONDITIONAL(HAVE_LIBSYSTEMD_LOGIN, [test "$have_libsystemd_login" = "yes"], [Using libsystemd-login])