diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-01-07 13:54:22 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-01-12 12:38:03 +0100 |
| commit | 9d71037f4beb203e3fddfe78ac9d79ef34999796 (patch) | |
| tree | 1c2cdbed3eb2b1296405c71d54b6cef33fe9ce38 /configure | |
| parent | 5cb69566daa8081abb82a13403dcc0fffed02007 (diff) | |
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 'configure')
| -rwxr-xr-x | configure | 14 |
1 files changed, 2 insertions, 12 deletions
@@ -2760,14 +2760,6 @@ EOF fi ########################################## -# X11 probe -if $pkg_config --exists "x11"; then - have_x11=yes - x11_cflags=$($pkg_config --cflags x11) - x11_libs=$($pkg_config --libs x11) -fi - -########################################## # GTK probe if test "$gtk" != "no"; then @@ -5681,10 +5673,8 @@ fi if test "$module_upgrades" = "yes"; then echo "CONFIG_MODULE_UPGRADES=y" >> $config_host_mak fi -if test "$have_x11" = "yes" && test "$need_x11" = "yes"; then - echo "CONFIG_X11=y" >> $config_host_mak - echo "X11_CFLAGS=$x11_cflags" >> $config_host_mak - echo "X11_LIBS=$x11_libs" >> $config_host_mak +if test "$need_x11" = "yes"; then + echo "CONFIG_NEED_X11=y" >> $config_host_mak fi if test "$pipe2" = "yes" ; then echo "CONFIG_PIPE2=y" >> $config_host_mak |