diff options
| author | Cedric Sodhi <manday@openmail.cc> | 2018-03-23 10:28:36 +0100 |
|---|---|---|
| committer | Cedric Sodhi <manday@openmail.cc> | 2018-03-23 10:28:36 +0100 |
| commit | 51141dd11e9adfb1d26e22166adc2a4c9c10bcfe (patch) | |
| tree | f8c61ead61cb4b280b7322837ab19f3fdbfa2a0c | |
| parent | ebdabc203072c855f9e28a679630c8decc6911ff (diff) | |
Minor corrections
| -rw-r--r-- | backend/backend.c | 4 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | meson_options.txt | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/backend/backend.c b/backend/backend.c index 58ac756e..96e155dc 100644 --- a/backend/backend.c +++ b/backend/backend.c @@ -11,7 +11,9 @@ #include <wlr/backend/multi.h> #include <wlr/backend/session.h> #include <wlr/backend/wayland.h> -#include <wlr/backend/x11.h> +#ifdef WLR_HAS_X11_BACKEND +# include <wlr/backend/x11.h> +#endif #include <wlr/util/log.h> void wlr_backend_init(struct wlr_backend *backend, diff --git a/meson.build b/meson.build index e7fa9890..e3c9a315 100644 --- a/meson.build +++ b/meson.build @@ -185,7 +185,7 @@ summary = [ ' systemd: @0@'.format(conf_data.get('WLR_HAS_SYSTEMD', false)), ' elogind: @0@'.format(conf_data.get('WLR_HAS_ELOGIND', false)), ' xwayland: @0@'.format(conf_data.get('WLR_HAS_XWAYLAND', false)), - ' x11_backend: @0@'.format(conf_data.get('WLR_HAS_X11BACKEND', false)), + ' x11_backend: @0@'.format(conf_data.get('WLR_HAS_X11_BACKEND', false)), ' xcb-icccm: @0@'.format(conf_data.get('WLR_HAS_XCB_ICCCM', false)), ' xcb-errors: @0@'.format(conf_data.get('WLR_HAS_XCB_ERRORS', false)), '----------------', diff --git a/meson_options.txt b/meson_options.txt index dae22b55..9e8567d0 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -3,4 +3,4 @@ option('enable_systemd', type: 'combo', choices: ['auto', 'true', 'false'], valu option('enable_elogind', type: 'combo', choices: ['auto', 'true', 'false'], value: 'auto', description: 'Enable support for logind') option('enable_xcb_errors', type: 'combo', choices: ['auto', 'true', 'false'], value: 'auto', description: 'Use xcb-errors util library') option('enable_xwayland', type: 'boolean', value: true, description: 'Enable support X11 applications') -option('enable_x11_backend', type: 'boolean', value: false, description: 'Enable X11 backend') +option('enable_x11_backend', type: 'boolean', value: true, description: 'Enable X11 backend') |