backend/x11: make xcb-xkb optional, remove global state

1 files changed, 5 insertions, 1 deletions

diff --git a/meson.build b/meson.build
index a48984c1..04c93817 100644
--- a/meson.build
+++ b/meson.build
@@ -85,18 +85,22 @@ if get_option('enable_x11_backend') or get_option('enable_xwayland')
 	xcb            = dependency('xcb')
 	xcb_composite  = dependency('xcb-composite')
 	xcb_xfixes     = dependency('xcb-xfixes')
-	xcb_xkb        = dependency('xcb-xkb') # TODO: make this optional
 	xcb_image      = dependency('xcb-image')
 	xcb_render     = dependency('xcb-render')
 	x11_xcb        = dependency('x11-xcb')
 
 	xcb_icccm      = dependency('xcb-icccm', required: false)
+	xcb_xkb        = dependency('xcb-xkb', required: false)
 	xcb_errors     = dependency('xcb-errors', required: get_option('enable_xcb_errors') == 'true')
 
 	if xcb_icccm.found()
 		conf_data.set('WLR_HAS_XCB_ICCCM', true)
 	endif
 
+	if xcb_xkb.found()
+		conf_data.set('WLR_HAS_XCB_XKB', true)
+	endif
+
 	if xcb_errors.found() and get_option('enable_xcb_errors') != 'false'
 		conf_data.set('WLR_HAS_XCB_ERRORS', true)
 	endif