From ae268a2b1aaa14e16ffc47b3cd5ad74a26e39838 Mon Sep 17 00:00:00 2001 From: Umut Tezduyar Lindskog Date: Tue, 2 Sep 2014 09:02:31 +0200 Subject: [PATCH 1/2] enable build support without systemd compatibility libraries systemd 209 merged all the libraries to libsystemd. Old libraries can still be enabled with --enable-compat-libs switch in systemd but this increases the binary size. Implement a fallback library check in case compat libraries dont exist. [Fixed underquoting; switched priority so we try libsystemd first -smcv] Signed-off-by: Simon McVittie --- configure.ac | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 5412db2e..b7b91bec 100644 --- a/configure.ac +++ b/configure.ac @@ -1143,10 +1143,13 @@ dnl systemd detection if test x$enable_systemd = xno ; then have_systemd=no; else - PKG_CHECK_MODULES(SYSTEMD, - [libsystemd-login >= 32, libsystemd-daemon >= 32, libsystemd-journal >= 32], - have_systemd=yes, - have_systemd=no) + PKG_CHECK_MODULES([SYSTEMD], + [libsystemd >= 209], + [have_systemd=yes], + [PKG_CHECK_MODULES([SYSTEMD], + [libsystemd-login >= 32, libsystemd-daemon >= 32, libsystemd-journal >= 32], + [have_systemd=yes], + [have_systemd=no])]) fi if test x$have_systemd = xyes; then From 467f7a6d426a37ddc0f9401f592facad3d003dfa Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 12 Sep 2014 12:35:31 +0100 Subject: [PATCH 2/2] NEWS for 1.8.x --- NEWS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/NEWS b/NEWS index 139345fc..2cff8cc8 100644 --- a/NEWS +++ b/NEWS @@ -3,9 +3,16 @@ D-Bus 1.8.8 (UNRELEASED) Fixes: +• Check for libsystemd from systemd >= 209, falling back to + the older separate libraries if not found (Umut Tezduyar Lindskog, + Simon McVittie) + • Fix compilation with --enable-stats (fd.o #81043, Gentoo #507232; Alban Crequy) +• Improve documentation for running tests on Windows (fd.o #41252, + Ralf Habacker) + D-Bus 1.8.6 (2014-06-02) ==