Use logind for session tracking on linux, consolekit on other systems

3 files changed, 14 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index cff74df4..d3896b8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,7 +23,10 @@ network-manager (0.9.8.8-1) UNRELEASED; urgency=low
   * debian/libnm-glib4.symbols: Add the new symbols exported for connectivity
     checking support
 
- -- Sjoerd Simons <sjoerd@debian.org>  Fri, 25 Oct 2013 21:25:59 +0200
+  [ Sjoerd Simons ]
+  * Use logind for session tracking on linux, consolekit on other systems
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Fri, 01 Nov 2013 21:53:37 +0100
 
 network-manager (0.9.8.0-5) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 3c691751..90dd9d36 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
  libgnutls-dev,
  uuid-dev,
  systemd (>= 185),
- libsystemd-login-dev (>= 185),
+ libsystemd-login-dev (>= 185) [linux-any],
  libudev-dev (>= 165),
  libgudev-1.0-dev (>= 165),
  libgirepository1.0-dev (>= 0.10.7-1~),
@@ -53,7 +53,7 @@ Recommends:
  iptables,
  modemmanager,
  crda,
- systemd
+ systemd [linux-any]
 Suggests: avahi-autoipd
 Breaks:
  network-manager-gnome (<< 0.9),
diff --git a/debian/rules b/debian/rules
index 7a1ac6a3..fa7497d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,13 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+  SESSION_TRACKING = systemd
+else
+  SESSION_TRACKING = consolekit
+endif
+
+
 %:
 	dh $@ --with gir
 
@@ -14,8 +21,7 @@ override_dh_auto_configure:
 		--with-iptables=/sbin/iptables \
 		--with-systemdsystemunitdir=/lib/systemd/system \
 		--with-crypto=gnutls \
-		--with-session-tracking=systemd \
-		--with-suspend-resume=systemd \
+		--with-session-tracking=$(SESSION_TRACKING) \
 		--disable-more-warnings \
 		--disable-modify-system \
 		--enable-polkit \