Check for sd_listen_fds in libsystemd as well as libsystemd-daemon

Upstream systemd has moved the sd_listen_fds function from
libsystemd-daemon into a combined libsystemd. For Debian this change
happens in the 214-1 package. Make the autoconf script look in both
and change the Debian build-deps to look for either suitably
recent libsystemd-dev or fall back to libsystemd-daemon-dev (to aid
backports).

diff --git a/configure.ac b/configure.ac
index d43749adc679bba3cc7b2a057fdcdf280c17568d..bdfeb8aa9f62c5800396430cd5b67dabd2a39b65 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,9 +13,14 @@ m4_include([m4/ax_lib_nettle.m4])
 AX_LIB_NETTLE(auto)
 AC_CHECK_HEADER([systemd/sd-daemon.h], [
        AC_CHECK_LIB([systemd-daemon], [sd_listen_fds],
-               [AC_DEFINE([HAVE_SYSTEMD], [1], [systemd-daemon is available])
+               [AC_DEFINE([HAVE_SYSTEMD], [1], [sd_listen_fds is available])
                AC_SUBST([SYSTEMD_LIBS], [-lsystemd-daemon])
+       ],
+       AC_CHECK_LIB([systemd], [sd_listen_fds],
+               [AC_DEFINE([HAVE_SYSTEMD], [1], [sd_listen_fds is available])
+               AC_SUBST([SYSTEMD_LIBS], [-lsystemd])
        ])
+       )
 ])
 
 dnl We should always have these backends available.

diff --git a/debian/control b/debian/control
index 8eefef32433d3ee22f2728a1f92404d2898fdb66..614dc1cd7aa2ef4339312560d4c67b7b67812807 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Jonathan McDowell <noodles@earth.li>
 Uploaders: Ross Burton <ross@debian.org>
-Build-Depends: debhelper (>= 9), dh-autoreconf, dh-systemd, libdb-dev, nettle-dev, libcurl4-gnutls-dev | libcurl-dev, libsystemd-daemon-dev
+Build-Depends: debhelper (>= 9), dh-autoreconf, dh-systemd, libdb-dev, nettle-dev, libcurl4-gnutls-dev | libcurl-dev, libsystemd-dev (>= 214) | libsystemd-daemon-dev
 Standards-Version: 3.9.6.0
 Homepage: http://www.earth.li/projectpurple/progs/onak.html
 Vcs-Browser: http://the.earth.li/gitweb/?p=onak.git;a=summary