From 94ed2fc7bbe9f673f064d3cc5e6841a3879a4268 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Wed, 22 Aug 2018 19:53:00 +1200 Subject: Use feature options for libcap/logind We now use a combo choice between systemd/elogind as they are mutually exclusive anyway. --- backend/meson.build | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'backend') diff --git a/backend/meson.build b/backend/meson.build index 52abe64d..48a0511a 100644 --- a/backend/meson.build +++ b/backend/meson.build @@ -44,9 +44,9 @@ else backend_files += files('session/direct.c') endif -if conf_data.get('WLR_HAS_SYSTEMD', false) +if logind.found() backend_files += files('session/logind.c') - backend_deps += systemd + backend_deps += logind endif if conf_data.get('WLR_HAS_X11_BACKEND', false) @@ -58,11 +58,6 @@ if conf_data.get('WLR_HAS_X11_BACKEND', false) backend_deps += xcb_xkb endif -if conf_data.get('WLR_HAS_ELOGIND', false) - backend_files += files('session/logind.c') - backend_deps += elogind -endif - lib_wlr_backend = static_library( 'wlr_backend', backend_files, -- cgit v1.2.3