From 5eb025a867b42f8bc7bc73279eac8de58e51a13e Mon Sep 17 00:00:00 2001 From: Frederico Cadete Date: Mon, 28 Sep 2015 00:30:09 +0200 Subject: configure.ac: add support for new versions of systemd Starting from systemd version 209, a single libsystemd.pc is provided. For previous versions, fall back on libsystemd-login.pc. Signed-off-by: Frederico Cadete Reviewed-by: Bryce Harrington Reviewed-by: Derek Foreman Upstream-Status: Backport Backported from Weston git: http://cgit.freedesktop.org/wayland/weston/commit/?id=5eb025 Signed-off-by: Joshua Lock diff --git a/configure.ac b/configure.ac index 045291c..a9cd429 100644 --- a/configure.ac +++ b/configure.ac @@ -380,14 +380,23 @@ AC_ARG_ENABLE(resize-optimization, AS_IF([test "x$enable_resize_optimization" = "xyes"], [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])]) -PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login >= 198], - [have_systemd_login=yes], [have_systemd_login=no]) +PKG_CHECK_MODULES(SYSTEMD_LOGIN, + [libsystemd >= 209], + [have_systemd_login_209=yes;have_systemd_login=yes], + [have_systemd_login_209=no;have_systemd_login=no]) + +# Older versions of systemd package systemd-login separately. Fall back on that +AS_IF([test x$have_systemd_login != xyes],[ + PKG_CHECK_MODULES(SYSTEMD_LOGIN, + [libsystemd-login >= 198], + [have_systemd_login=yes], + [have_systemd_login=no]) + ]) + AS_IF([test "x$have_systemd_login" = "xyes"], [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])]) AM_CONDITIONAL(HAVE_SYSTEMD_LOGIN, test "x$have_systemd_login" = "xyes") -PKG_CHECK_MODULES(SYSTEMD_LOGIN_209, [libsystemd-login >= 209], - [have_systemd_login_209=yes], [have_systemd_login_209=no]) AS_IF([test "x$have_systemd_login_209" = "xyes"], [AC_DEFINE([HAVE_SYSTEMD_LOGIN_209], [1], [Have systemd-login >= 209])]) -- cgit v0.10.2