diff options
Diffstat (limited to 'meson.build')
-rw-r--r-- | meson.build | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/meson.build b/meson.build index 1d143110..3c444e07 100644 --- a/meson.build +++ b/meson.build | |||
@@ -57,10 +57,6 @@ foreach name, _ : wlroots_features | |||
57 | wlroots_features += { name: have } | 57 | wlroots_features += { name: have } |
58 | endforeach | 58 | endforeach |
59 | 59 | ||
60 | if get_option('xwayland').enabled() and not wlroots_features['xwayland'] | ||
61 | error('Cannot enable Xwayland in sway: wlroots has been built without Xwayland support') | ||
62 | endif | ||
63 | |||
64 | null_dep = dependency('', required: false) | 60 | null_dep = dependency('', required: false) |
65 | 61 | ||
66 | jsonc = dependency('json-c', version: '>=0.13') | 62 | jsonc = dependency('json-c', version: '>=0.13') |
@@ -77,16 +73,14 @@ gdk_pixbuf = dependency('gdk-pixbuf-2.0', required: get_option('gdk-pixbuf')) | |||
77 | pixman = dependency('pixman-1') | 73 | pixman = dependency('pixman-1') |
78 | libevdev = dependency('libevdev') | 74 | libevdev = dependency('libevdev') |
79 | libinput = wlroots_features['libinput_backend'] ? dependency('libinput', version: '>=1.21.0') : null_dep | 75 | libinput = wlroots_features['libinput_backend'] ? dependency('libinput', version: '>=1.21.0') : null_dep |
80 | xcb = dependency('xcb', required: get_option('xwayland')) | 76 | xcb = wlroots_features['xwayland'] ? dependency('xcb') : null_dep |
81 | drm = dependency('libdrm') | 77 | drm = dependency('libdrm') |
82 | libudev = wlroots_features['libinput_backend'] ? dependency('libudev') : null_dep | 78 | libudev = wlroots_features['libinput_backend'] ? dependency('libudev') : null_dep |
83 | math = cc.find_library('m') | 79 | math = cc.find_library('m') |
84 | rt = cc.find_library('rt') | 80 | rt = cc.find_library('rt') |
85 | xcb_icccm = dependency('xcb-icccm', required: get_option('xwayland')) | 81 | xcb_icccm = wlroots_features['xwayland'] ? dependency('xcb-icccm') : null_dep |
86 | threads = dependency('threads') # for pthread_setschedparam | 82 | threads = dependency('threads') # for pthread_setschedparam |
87 | 83 | ||
88 | have_xwayland = xcb.found() and xcb_icccm.found() and wlroots_features['xwayland'] | ||
89 | |||
90 | if get_option('sd-bus-provider') == 'auto' | 84 | if get_option('sd-bus-provider') == 'auto' |
91 | if not get_option('tray').disabled() | 85 | if not get_option('tray').disabled() |
92 | assert(get_option('auto_features').auto(), 'sd-bus-provider must not be set to auto since auto_features != auto') | 86 | assert(get_option('auto_features').auto(), 'sd-bus-provider must not be set to auto since auto_features != auto') |
@@ -110,7 +104,6 @@ have_tray = (not get_option('tray').disabled()) and tray_deps_found | |||
110 | 104 | ||
111 | conf_data = configuration_data() | 105 | conf_data = configuration_data() |
112 | 106 | ||
113 | conf_data.set10('HAVE_XWAYLAND', have_xwayland) | ||
114 | conf_data.set10('HAVE_GDK_PIXBUF', gdk_pixbuf.found()) | 107 | conf_data.set10('HAVE_GDK_PIXBUF', gdk_pixbuf.found()) |
115 | conf_data.set10('HAVE_LIBSYSTEMD', sdbus.found() and sdbus.name() == 'libsystemd') | 108 | conf_data.set10('HAVE_LIBSYSTEMD', sdbus.found() and sdbus.name() == 'libsystemd') |
116 | conf_data.set10('HAVE_LIBELOGIND', sdbus.found() and sdbus.name() == 'libelogind') | 109 | conf_data.set10('HAVE_LIBELOGIND', sdbus.found() and sdbus.name() == 'libelogind') |
@@ -271,7 +264,6 @@ endif | |||
271 | subdir('completions') | 264 | subdir('completions') |
272 | 265 | ||
273 | summary({ | 266 | summary({ |
274 | 'xwayland': have_xwayland, | ||
275 | 'gdk-pixbuf': gdk_pixbuf.found(), | 267 | 'gdk-pixbuf': gdk_pixbuf.found(), |
276 | 'tray': have_tray, | 268 | 'tray': have_tray, |
277 | 'man-pages': scdoc.found(), | 269 | 'man-pages': scdoc.found(), |