| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 39be8b277c666db21965d54d5b72418ce57a450b Mon Sep 17 00:00:00 2001 |
| 2 | From: Michael Biebl <biebl@debian.org> |
| 3 | Date: Tue, 19 May 2015 23:38:11 +0200 |
| 4 | Subject: [PATCH] Add support for libsystemd |
| 5 | |
| 6 | In systemd v209 the various libsystemd-* libraries were merged into a |
| 7 | single libsystemd library. So first check for this library and fall back |
| 8 | to libsystemd-login if not found. |
| 9 | |
| 10 | Bug: https://bugzilla.gnome.org/show_bug.cgi?id=749603 |
| 11 | Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779766 |
| 12 | |
| 13 | Upstream-Status: Applied |
| 14 | --- |
| 15 | configure.ac | 10 ++++++---- |
| 16 | 1 file changed, 6 insertions(+), 4 deletions(-) |
| 17 | |
| 18 | diff --git a/configure.ac b/configure.ac |
| 19 | index ee3475d..bd5c043 100644 |
| 20 | --- a/configure.ac |
| 21 | +++ b/configure.ac |
| 22 | @@ -264,18 +264,20 @@ dnl ********************************** |
| 23 | dnl *** Check for libsystemd-login *** |
| 24 | dnl ********************************** |
| 25 | |
| 26 | -AC_ARG_ENABLE(libsystemd_login, AS_HELP_STRING([--disable-libsystemd-login],[build without liblibsystemd-login])) |
| 27 | +AC_ARG_ENABLE(libsystemd_login, AS_HELP_STRING([--disable-libsystemd-login],[build without libsystemd-login])) |
| 28 | msg_libsystemd_login=no |
| 29 | LIBSYSTEMD_LOGIN_LIBS= |
| 30 | LIBSYSTEMD_LOGIN_CFLAGS= |
| 31 | LIBSYSTEMD_LOGIN_REQUIRED=44 |
| 32 | |
| 33 | if test "x$enable_libsystemd_login" != "xno"; then |
| 34 | - PKG_CHECK_EXISTS([libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED], msg_libsystemd_login=yes) |
| 35 | + PKG_CHECK_EXISTS([libsystemd], [msg_libsystemd_login=yes], |
| 36 | + [PKG_CHECK_EXISTS([libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED], msg_libsystemd_login=yes)]) |
| 37 | |
| 38 | if test "x$msg_libsystemd_login" = "xyes"; then |
| 39 | - PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN],[libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED]) |
| 40 | - AC_DEFINE(HAVE_LIBSYSTEMD_LOGIN, 1, [Define to 1 if liblibsystemd_login is available]) |
| 41 | + PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN],[libsystemd],, |
| 42 | + [PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN],[libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED])]) |
| 43 | + AC_DEFINE(HAVE_LIBSYSTEMD_LOGIN, 1, [Define to 1 if libsystemd_login is available]) |
| 44 | fi |
| 45 | fi |
| 46 | |
| 47 | -- |
| 48 | 2.5.0 |
| 49 | |