From 400e3ea64960f9bcaf5ab83d7e1bea405bb5fc89 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 20 Mar 2015 22:12:43 +0100 Subject: [PATCH] configure.ac: support libsystemd (instead of the older libsystemd-daemon) --- NEWS | 1 + configure.ac | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 08ef096a1..ab3463f70 100644 --- a/NEWS +++ b/NEWS @@ -26,6 +26,7 @@ ver 0.20 (not yet released) * reset song priority on playback * write database and state file atomically * remove dependency on GLib +* support libsystemd (instead of the older libsystemd-daemon) * database - proxy: add TCP keepalive option diff --git a/configure.ac b/configure.ac index e3aa2e7ed..dfd208ae5 100644 --- a/configure.ac +++ b/configure.ac @@ -542,9 +542,16 @@ if AC_MSG_ERROR([No client interfaces configured!]) fi -MPD_ENABLE_AUTO_PKG(systemd_daemon, SYSTEMD_DAEMON, libsystemd-daemon, - [systemd socket activation], [libsystemd-daemon not found], - [$linux_auto]) +MPD_ENABLE_AUTO(systemd_daemon, SYSTEMD_DAEMON, [systemd socket activation], + [libsystemd not found], [$linux_auto], [ + dnl Check for libsystemd and fall back to (the older) + dnl libsystemd-daemon + PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd], + [found_systemd_daemon=yes], + [PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon], + [found_systemd_daemon=yes], + [found_systemd_daemon=no])]) +]) dnl --------------------------------------------------------------------------- dnl LIBC Features