diff options
| author | Christopher James Halse Rogers <raof@ubuntu.com> | 2015-06-15 12:53:58 +1000 |
|---|---|---|
| committer | Christopher James Halse Rogers <raof@ubuntu.com> | 2015-06-15 12:53:58 +1000 |
| commit | 326801df70a832232022c76e95dfd9e2cfa15fd3 (patch) | |
| tree | 31339231eae22d2b02533677a9e8e182390543f4 | |
| parent | 7c7e1a856a7df1be1dc8905c8373fabea58db1d6 (diff) | |
| download | colord-326801df70a832232022c76e95dfd9e2cfa15fd3.tar.gz | |
Check for, and prefer, libsystemd over libsystemd-login.
Systemd 209 merged all the sundry libsystemd-* libraries into a single libsystemd
library. Update the systemd-login check to first test for libsystemd, then
libsystemd-login if the first check fails.
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index d153033..c6beae0 100644 --- a/configure.ac +++ b/configure.ac @@ -264,15 +264,19 @@ fi AM_CONDITIONAL(BUILD_LIBCOLORDCOMPAT, test x$build_libcolordcompat = xyes) dnl --------------------------------------------------------------------------- -dnl - Use libsystemd-login to track the process seat +dnl - Use systemd-login to track the process seat dnl --------------------------------------------------------------------------- -AC_ARG_ENABLE(systemd-login, AS_HELP_STRING([--enable-systemd-login],[Build systemd-login support]), +AC_ARG_ENABLE(systemd-login, AS_HELP_STRING([--enable-systemd-login],[Build systemd seat-tracking support]), enable_systemd_login=$enableval, enable_systemd_login=yes) AM_CONDITIONAL(HAVE_LIBSYSTEMD_LOGIN, test x$enable_systemd_login = xyes) if test x$enable_systemd_login != xno; then - PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, - [libsystemd-login >= 44]) - AC_DEFINE([HAVE_LIBSYSTEMD_LOGIN], 1, [Define to 1 if libsystemd-login is available]) + PKG_CHECK_MODULES(LIBSYSTEMD, + [libsystemd], + [LIBSYSTEMD_LOGIN_CFLAGS=$LIBSYSTEMD_CFLAGS; + LIBSYSTEMD_LOGIN_LIBS=$LIBSYSTEMD_LIBS], + [PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, + [libsystemd-login >= 44])]) + AC_DEFINE([HAVE_LIBSYSTEMD_LOGIN], 1, [Define to 1 if systemd login is available]) fi AC_SUBST(HAVE_LIBSYSTEMD_LOGIN) AC_SUBST(LIBSYSTEMD_LOGIN_CFLAGS) @@ -501,7 +505,7 @@ echo " Vala API generator: ${has_vapigen} Daemon user: ${daemon_user} udev rules.d dir: ${with_udevrulesdir} - using libsystemd-login: ${enable_systemd_login} + systemd-login support: ${enable_systemd_login} systemd service dir: ${with_systemdsystemunitdir} Unix support: ${enable_unix} " |