configure.ac: support libsystemd (instead of the older libsystemd-daemon)

This commit is contained in:
Max Kellermann 2015-03-20 22:12:43 +01:00
parent 622d871587
commit 400e3ea649
2 changed files with 11 additions and 3 deletions

1
NEWS
View File

@ -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

View File

@ -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