From 175f89f4ffdf65a53c0c55e8c3ef6256ac57b29c Mon Sep 17 00:00:00 2001 From: dudemanguy Date: Fri, 22 Sep 2017 12:02:55 -0500 Subject: Add elogind support Resolves SirCmpwn/wlroots#146 --- backend/meson.build | 6 +++++- backend/session/logind.c | 10 ++++++++-- backend/session/session.c | 2 ++ 3 files changed, 15 insertions(+), 3 deletions(-) (limited to 'backend') diff --git a/backend/meson.build b/backend/meson.build index eb8c5d8b..a3cb7b64 100644 --- a/backend/meson.build +++ b/backend/meson.build @@ -28,9 +28,13 @@ if systemd.found() backend_files += files('session/logind.c') endif +if elogind.found() + backend_files += files('session/logind.c') +endif + lib_wlr_backend = static_library( 'wlr_backend', backend_files, include_directories: wlr_inc, - dependencies: [wayland_server, egl, gbm, libinput, systemd, wlr_protos], + dependencies: [wayland_server, egl, gbm, libinput, systemd, elogind, wlr_protos], ) diff --git a/backend/session/logind.c b/backend/session/logind.c index 3b237360..42b48e94 100644 --- a/backend/session/logind.c +++ b/backend/session/logind.c @@ -5,8 +5,6 @@ #include #include #include -#include -#include #include #include #include @@ -15,6 +13,14 @@ #include #include +#ifdef HAS_SYSTEMD + #include + #include +#elif HAS_ELOGIND + #include + #include +#endif + enum { DRM_MAJOR = 226 }; const struct session_impl session_logind; diff --git a/backend/session/session.c b/backend/session/session.c index c9bc1397..cfa617f6 100644 --- a/backend/session/session.c +++ b/backend/session/session.c @@ -18,6 +18,8 @@ extern const struct session_impl session_direct; static const struct session_impl *impls[] = { #ifdef HAS_SYSTEMD &session_logind, +#elif HAS_ELOGIND + &session_logind, #endif &session_direct, NULL, -- cgit v1.2.3