Build against libsystemd-dev

4 files changed, 52 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 79da20e1..607865b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ network-manager (0.9.10.0-3) UNRELEASED; urgency=medium
   * Install typelib files into multiarch paths now that gobject-introspection
     supports multiarch.
   * Mark gir and dev packages as Multi-Arch: same.
+  * Build against libsystemd-dev.
 
  -- Michael Biebl <biebl@debian.org>  Tue, 30 Sep 2014 05:08:49 +0200
 
diff --git a/debian/control b/debian/control
index 292e1086..7f11a1f2 100644
--- a/debian/control
+++ b/debian/control
@@ -21,8 +21,7 @@ Build-Depends: debhelper (>= 9),
                libgcrypt11-dev,
                uuid-dev,
                systemd (>= 185),
-               libsystemd-login-dev (>= 185),
-               libsystemd-daemon-dev,
+               libsystemd-dev (>= 209),
                libudev-dev (>= 165),
                libgudev-1.0-dev (>= 165),
                libgirepository1.0-dev (>= 0.10.7-1~),
diff --git a/debian/patches/0009-Support-building-against-libsystemd-library.patch b/debian/patches/0009-Support-building-against-libsystemd-library.patch
new file mode 100644
index 00000000..5160fc17
--- /dev/null
+++ b/debian/patches/0009-Support-building-against-libsystemd-library.patch
@@ -0,0 +1,49 @@
+From: Michael Biebl <biebl@debian.org>
+Date: Tue, 30 Sep 2014 05:38:25 +0200
+Subject: Support building against libsystemd library
+
+In systemd v209, the various libraries were merged into a single
+libsystemd library [1].
+Add support for building against this new library and fall back to the
+old library names if not found.
+
+[1] http://lists.freedesktop.org/archives/systemd-devel/2014-February/017146.html
+---
+ configure.ac | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3c216a2..b6eb201 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -329,7 +329,9 @@ AS_IF([! (echo "$with_session_tracking" | grep -q -E "^(systemd|consolekit|no)$"
+ AM_CONDITIONAL(SESSION_TRACKING_CK, test "$with_session_tracking" = "consolekit")
+ AM_CONDITIONAL(SESSION_TRACKING_SYSTEMD, test "$with_session_tracking" = "systemd")
+ if test "$with_session_tracking" = "systemd"; then
+-	PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login])
++	PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd],,
++	                  [PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login])])
++
+ 	AC_SUBST(SYSTEMD_LOGIN_CFLAGS)
+ 	AC_SUBST(SYSTEMD_LOGIN_LIBS)
+ fi
+@@ -340,7 +342,8 @@ AC_MSG_RESULT($with_session_tracking)
+ 
+ AC_ARG_WITH(suspend-resume, AS_HELP_STRING([--with-suspend-resume=upower|systemd], [Build NetworkManager with specific suspend/resume support]))
+ if test "z$with_suspend_resume" = "z"; then
+-    PKG_CHECK_EXISTS([libsystemd-login >= 183], [have_systemd_inhibit=yes], [have_systemd_inhibit=no])
++    PKG_CHECK_EXISTS([libsystemd >= 209], [have_systemd_inhibit=yes],
++                     [PKG_CHECK_EXISTS([libsystemd-login >= 183], [have_systemd_inhibit=yes], [have_systemd_inhibit=no])])
+     if test "z${have_systemd_inhibit}" = "zyes"; then
+ 	# Use systemd if it's new enough
+ 	with_suspend_resume="systemd"
+@@ -354,7 +357,8 @@ case $with_suspend_resume in
+     upower) ;;
+     systemd)
+ 	# Link against libsystemd-daemon for sd_booted()
+-	PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd-login >= 183 libsystemd-daemon])
++	PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd >= 209],,
++	                  [PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd-login >= 183 libsystemd-daemon])])
+         ;;
+     *)
+ 	AC_MSG_ERROR(--with-suspend-resume must be one of [upower, systemd])
diff --git a/debian/patches/series b/debian/patches/series
index 2b7cbfb8..93f50bb6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 0006-tui-fix-Wi-Fi-section-of-nmtui-connect-list-in-non-U.patch
 0007-core-fix-checks-for-default-routes-by-comparing-the-.patch
 0008-Use-the-correct-path-when-calling-dnssec-trigger-scr.patch
+0009-Support-building-against-libsystemd-library.patch