aboutsummaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2021-01-07 13:54:22 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2021-01-12 12:38:03 +0100
commit9d71037f4beb203e3fddfe78ac9d79ef34999796 (patch)
tree1c2cdbed3eb2b1296405c71d54b6cef33fe9ce38 /ui
parent5cb69566daa8081abb82a13403dcc0fffed02007 (diff)
downloadqemu-9d71037f4beb203e3fddfe78ac9d79ef34999796.zip
qemu-9d71037f4beb203e3fddfe78ac9d79ef34999796.tar.gz
qemu-9d71037f4beb203e3fddfe78ac9d79ef34999796.tar.bz2
configure: move X11 detection to Meson
For now move the logic verbatim. GTK+ actually has a hard requirement on X11 if gtk+x11 is present, but we will sort that out later. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'ui')
-rw-r--r--ui/meson.build4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/meson.build b/ui/meson.build
index bd2b920..cc764e1 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -62,7 +62,7 @@ if config_host.has_key('CONFIG_GTK')
gtk_ss = ss.source_set()
gtk_ss.add(gtk, vte, pixman, files('gtk.c'))
- gtk_ss.add(when: [x11, 'CONFIG_X11'], if_true: files('x_keymap.c'))
+ gtk_ss.add(when: x11, if_true: files('x_keymap.c'))
gtk_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('gtk-egl.c', 'gtk-gl-area.c'))
ui_modules += {'gtk' : gtk_ss}
endif
@@ -77,7 +77,7 @@ if sdl.found()
'sdl2.c',
))
sdl_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('sdl2-gl.c'))
- sdl_ss.add(when: [x11, 'CONFIG_X11'], if_true: files('x_keymap.c'))
+ sdl_ss.add(when: x11, if_true: files('x_keymap.c'))
ui_modules += {'sdl' : sdl_ss}
endif