summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-03-22 03:52:03 +0000
committerJavier Jardón <jjardon@gnome.org>2015-10-11 21:20:24 +0100
commitb3d5c01bc52f55ba7674f8ecee0b459fa41366dd (patch)
treea21aa618b33e3cbadc011252112edefa2f7638d6
parent061ff2621ccc8560d15fb804eff68a3e15c1b5d1 (diff)
downloadxserver-baserock/xorg-server-1.17.2-20-gb3d5c01+libsystemd_fix.tar.gz
configure.ac: Add support for new versions of systemdbaserock/xorg-server-1.17.2-20-gb3d5c01+libsystemd_fix
... that only provide a unique libsystemd.pc file Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Javier Jardón <jjardon@gnome.org>
-rw-r--r--configure.ac4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index d8f0e74f6..7651da0a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -832,7 +832,9 @@ AC_ARG_WITH([systemd-daemon],
[support systemd socket activation (default: auto)]),
[WITH_SYSTEMD_DAEMON=$withval], [WITH_SYSTEMD_DAEMON=auto])
PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
- [HAVE_SYSTEMD_DAEMON=yes], [HAVE_SYSTEMD_DAEMON=no])
+ [HAVE_SYSTEMD_DAEMON=yes],
+ [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"
fi