From: Jonathan McDowell Date: Wed, 1 Oct 2014 08:37:56 +0000 (+0100) Subject: Check for sd_listen_fds in libsystemd as well as libsystemd-daemon X-Git-Tag: onak-0.4.5~1 X-Git-Url: http://the.earth.li/gitweb/?p=onak.git;a=commitdiff_plain;h=c9b58d63ec501f3535a2328f57170871d4ec24ff 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 d43749a..bdfeb8a 100644 --- 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 8eefef3..614dc1c 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Jonathan McDowell Uploaders: Ross Burton -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