From ebdabc203072c855f9e28a679630c8decc6911ff Mon Sep 17 00:00:00 2001 From: Cedric Sodhi Date: Fri, 9 Mar 2018 15:17:15 +0100 Subject: Make X11 fully optional Make X11 Backend (in addition to XWayland) optional and small bug fix on XWayland includes. --- backend/backend.c | 2 ++ backend/meson.build | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'backend') diff --git a/backend/backend.c b/backend/backend.c index c67be617..58ac756e 100644 --- a/backend/backend.c +++ b/backend/backend.c @@ -94,6 +94,7 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) { } } +#ifdef WLR_HAS_X11_BACKEND const char *x11_display = getenv("DISPLAY"); if (x11_display) { struct wlr_backend *x11_backend = @@ -101,6 +102,7 @@ struct wlr_backend *wlr_backend_autocreate(struct wl_display *display) { wlr_multi_backend_add(backend, x11_backend); return backend; } +#endif // Attempt DRM+libinput struct wlr_session *session = wlr_session_create(display); diff --git a/backend/meson.build b/backend/meson.build index c0ed76f1..a74ea024 100644 --- a/backend/meson.build +++ b/backend/meson.build @@ -24,7 +24,6 @@ backend_files = files( 'wayland/output.c', 'wayland/registry.c', 'wayland/wl_seat.c', - 'x11/backend.c', ) backend_deps = [ @@ -50,6 +49,10 @@ if conf_data.get('WLR_HAS_SYSTEMD', false) backend_deps += systemd endif +if conf_data.get('WLR_HAS_X11_BACKEND', false) + backend_files += files('x11/backend.c') +endif + if conf_data.get('WLR_HAS_ELOGIND', false) backend_files += files('session/logind.c') backend_deps += elogind -- cgit v1.2.3