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