| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From 8e1efcd40b3bad81c83744e2e120d70c2b567ef2 Mon Sep 17 00:00:00 2001 |
| 2 | From: Frederico Cadete <frederico@cadete.eu> |
| 3 | Date: Mon, 28 Sep 2015 00:30:10 +0200 |
| 4 | Subject: configure.ac: add explicit enable/disable for systemd-login support |
| 5 | |
| 6 | Otherwise, auto-enable depending on whether the system has the necessary |
| 7 | libraries. |
| 8 | |
| 9 | [Updated help text as per pq suggestion -- bwh] |
| 10 | |
| 11 | Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> |
| 12 | Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> |
| 13 | Tested-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> |
| 14 | |
| 15 | Upstream-Status: Backport |
| 16 | Backported from Weston git: |
| 17 | http://cgit.freedesktop.org/wayland/weston/commit/?id=8e1efc |
| 18 | |
| 19 | Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> |
| 20 | |
| 21 | diff --git a/configure.ac b/configure.ac |
| 22 | index a9cd429..67e80d0 100644 |
| 23 | --- a/configure.ac |
| 24 | +++ b/configure.ac |
| 25 | @@ -380,18 +380,30 @@ AC_ARG_ENABLE(resize-optimization, |
| 26 | AS_IF([test "x$enable_resize_optimization" = "xyes"], |
| 27 | [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])]) |
| 28 | |
| 29 | -PKG_CHECK_MODULES(SYSTEMD_LOGIN, |
| 30 | - [libsystemd >= 209], |
| 31 | - [have_systemd_login_209=yes;have_systemd_login=yes], |
| 32 | - [have_systemd_login_209=no;have_systemd_login=no]) |
| 33 | - |
| 34 | -# Older versions of systemd package systemd-login separately. Fall back on that |
| 35 | -AS_IF([test x$have_systemd_login != xyes],[ |
| 36 | - PKG_CHECK_MODULES(SYSTEMD_LOGIN, |
| 37 | - [libsystemd-login >= 198], |
| 38 | - [have_systemd_login=yes], |
| 39 | - [have_systemd_login=no]) |
| 40 | - ]) |
| 41 | +AC_ARG_ENABLE(systemd-login, |
| 42 | + AS_HELP_STRING([--enable-systemd-login], |
| 43 | + [Enable logind support]),, |
| 44 | + enable_systemd_login=auto) |
| 45 | +if test x$enable_systemd_login != xno; then |
| 46 | + PKG_CHECK_MODULES(SYSTEMD_LOGIN, |
| 47 | + [libsystemd >= 209], |
| 48 | + [have_systemd_login_209=yes;have_systemd_login=yes], |
| 49 | + [have_systemd_login_209=no;have_systemd_login=no]) |
| 50 | + |
| 51 | + # Older versions of systemd package systemd-login separately. Fall back on that |
| 52 | + AS_IF([test x$have_systemd_login != xyes],[ |
| 53 | + PKG_CHECK_MODULES(SYSTEMD_LOGIN, |
| 54 | + [libsystemd-login >= 198], |
| 55 | + [have_systemd_login=yes], |
| 56 | + [have_systemd_login=no]) |
| 57 | + ]) |
| 58 | +else |
| 59 | + have_systemd_login=no |
| 60 | +fi |
| 61 | + |
| 62 | +if test "x$have_systemd_login" = "xno" -a "x$enable_systemd_login" = "xyes"; then |
| 63 | + AC_MSG_ERROR([systemd-login support explicitly enabled, but can't find libsystemd>=209 or libsystemd-login]) |
| 64 | +fi |
| 65 | |
| 66 | AS_IF([test "x$have_systemd_login" = "xyes"], |
| 67 | [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])]) |
| 68 | -- |
| 69 | cgit v0.10.2 |
| 70 | |