diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2022-09-12 13:37:42 -0400 |
|---|---|---|
| committer | Federico Mena Quintero <federico@gnome.org> | 2022-09-27 20:23:43 -0500 |
| commit | f659aab5b5db859d389f82b3d4a1a4a7b13ed849 (patch) | |
| tree | 2f421536df28d21ae89eac12c4cfcbe0f0748074 /meson.build | |
| parent | f1c77c6444f20fd507370f848fa14f118fd91204 (diff) | |
| download | at-spi2-core-f659aab5b5db859d389f82b3d4a1a4a7b13ed849.tar.gz | |
meson: Change x11 option to feature
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/meson.build b/meson.build index 6dd6e8cb..3131538c 100644 --- a/meson.build +++ b/meson.build @@ -141,25 +141,17 @@ gmodule_dep = dependency('gmodule-2.0', version: gmodule_req_version) libxml_dep = dependency('libxml-2.0', version: libxml_req_version) x11_deps = [] -x11_option = get_option('x11') -# ensure x11_dep is defined for use elsewhere, such as bus/meson.build -x11_dep = dependency('', required: false) -if x11_option != 'no' - x11_dep = dependency('x11', required: false) - - if x11_dep.found() - x11_deps += x11_dep - at_spi_conf.set('HAVE_X11', 1) - xtest_dep = dependency('xtst') - x11_deps += xtest_dep - - if cc.has_function('XkbGetMap', dependencies: x11_deps) - at_spi_conf.set('HAVE_XKB', 1) - endif - - xinput_dep = dependency('xi') - x11_deps += xinput_dep +x11_dep = dependency('x11', required: get_option('x11')) +if x11_dep.found() + x11_deps += x11_dep + at_spi_conf.set('HAVE_X11', 1) + xtest_dep = dependency('xtst') + x11_deps += xtest_dep + if cc.has_function('XkbGetMap', dependencies: x11_deps) + at_spi_conf.set('HAVE_XKB', 1) endif + xinput_dep = dependency('xi') + x11_deps += xinput_dep endif # Alignments |