From 804b77502765292a6dea6591f02038c89945e5f4 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Perennou Date: Tue, 18 Aug 2015 13:22:05 +0200 Subject: [PATCH] systemd: check for libsystemd instead of libsystemd-daemon Everything was merged into libsystemd a while ago Signed-off-by: Marc-Antoine Perennou --- configure.ac | 6 +++--- include/dix-config.h.in | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 98d0821..ab84f1d 100644 --- a/configure.ac +++ b/configure.ac @@ -821,7 +821,7 @@ AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon], [support systemd socket activation (default: auto)]), [WITH_SYSTEMD_DAEMON=$withval], [WITH_SYSTEMD_DAEMON=auto]) -PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon], +PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd], [HAVE_SYSTEMD_DAEMON=yes], [HAVE_SYSTEMD_DAEMON=no]) if test "x$WITH_SYSTEMD_DAEMON" = xauto; then WITH_SYSTEMD_DAEMON="$HAVE_SYSTEMD_DAEMON" @@ -830,8 +830,8 @@ if test "x$WITH_SYSTEMD_DAEMON" = xyes; then if test "x$HAVE_SYSTEMD_DAEMON" = xno; then AC_MSG_ERROR([systemd support requested but no library has been found]) fi - AC_DEFINE(HAVE_SYSTEMD_DAEMON, 1, [Define to 1 if libsystemd-daemon is available]) - REQUIRED_LIBS="$REQUIRED_LIBS libsystemd-daemon" + AC_DEFINE(HAVE_SYSTEMD_DAEMON, 1, [Define to 1 if libsystemd is available]) + REQUIRED_LIBS="$REQUIRED_LIBS libsystemd" fi AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x$HAVE_SYSTEMD_DAEMON" = "xyes"]) diff --git a/include/dix-config.h.in b/include/dix-config.h.in index c2ba434..7de1f59 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -206,7 +206,7 @@ /* Define to 1 if you have the `strndup' function. */ #undef HAVE_STRNDUP -/* Define to 1 if libsystemd-daemon is available */ +/* Define to 1 if libsystemd is available */ #undef HAVE_SYSTEMD_DAEMON /* Define to 1 if SYSV IPC is available */ -- 2.5.0