configure, meson: convert vte detection to meson
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini
parent
f08b65b651
commit
c23d7b4e57
29
configure
vendored
29
configure
vendored
|
|
@ -408,7 +408,7 @@ gnutls="auto"
|
|||
nettle="auto"
|
||||
gcrypt="auto"
|
||||
auth_pam="auto"
|
||||
vte="$default_feature"
|
||||
vte="auto"
|
||||
virglrenderer="$default_feature"
|
||||
tpm="$default_feature"
|
||||
libssh="$default_feature"
|
||||
|
|
@ -1395,9 +1395,9 @@ for opt do
|
|||
;;
|
||||
--disable-pvrdma) pvrdma="no"
|
||||
;;
|
||||
--disable-vte) vte="no"
|
||||
--disable-vte) vte="disabled"
|
||||
;;
|
||||
--enable-vte) vte="yes"
|
||||
--enable-vte) vte="enabled"
|
||||
;;
|
||||
--disable-virglrenderer) virglrenderer="no"
|
||||
;;
|
||||
|
|
@ -2799,22 +2799,6 @@ EOF
|
|||
fi
|
||||
fi
|
||||
|
||||
##########################################
|
||||
# VTE probe
|
||||
|
||||
if test "$vte" != "no"; then
|
||||
if $pkg_config --exists "vte-2.91"; then
|
||||
vte_cflags=$($pkg_config --cflags vte-2.91)
|
||||
vte_libs=$($pkg_config --libs vte-2.91)
|
||||
vteversion=$($pkg_config --modversion vte-2.91)
|
||||
vte="yes"
|
||||
elif test "$vte" = "yes"; then
|
||||
feature_not_found "vte" "Install libvte-2.91 devel"
|
||||
else
|
||||
vte="no"
|
||||
fi
|
||||
fi
|
||||
|
||||
##########################################
|
||||
# RDMA needs OpenFabrics libraries
|
||||
if test "$rdma" != "no" ; then
|
||||
|
|
@ -5482,11 +5466,6 @@ fi
|
|||
if test "$have_copy_file_range" = "yes" ; then
|
||||
echo "HAVE_COPY_FILE_RANGE=y" >> $config_host_mak
|
||||
fi
|
||||
if test "$vte" = "yes" ; then
|
||||
echo "CONFIG_VTE=y" >> $config_host_mak
|
||||
echo "VTE_CFLAGS=$vte_cflags" >> $config_host_mak
|
||||
echo "VTE_LIBS=$vte_libs" >> $config_host_mak
|
||||
fi
|
||||
if test "$virglrenderer" = "yes" ; then
|
||||
echo "CONFIG_VIRGL=y" >> $config_host_mak
|
||||
echo "VIRGL_CFLAGS=$virgl_cflags" >> $config_host_mak
|
||||
|
|
@ -6149,7 +6128,7 @@ if test "$skip_meson" = no; then
|
|||
-Dkvm=$kvm -Dhax=$hax -Dwhpx=$whpx -Dhvf=$hvf -Dnvmm=$nvmm \
|
||||
-Dxen=$xen -Dxen_pci_passthrough=$xen_pci_passthrough -Dtcg=$tcg \
|
||||
-Dcocoa=$cocoa -Dgtk=$gtk -Dmpath=$mpath -Dsdl=$sdl -Dsdl_image=$sdl_image \
|
||||
-Dlibusb=$libusb -Dsmartcard=$smartcard -Dusb_redir=$usb_redir \
|
||||
-Dlibusb=$libusb -Dsmartcard=$smartcard -Dusb_redir=$usb_redir -Dvte=$vte \
|
||||
-Dvnc=$vnc -Dvnc_sasl=$vnc_sasl -Dvnc_jpeg=$vnc_jpeg -Dvnc_png=$vnc_png \
|
||||
-Dgettext=$gettext -Dxkbcommon=$xkbcommon -Du2f=$u2f -Dvirtiofsd=$virtiofsd \
|
||||
-Dcapstone=$capstone -Dslirp=$slirp -Dfdt=$fdt -Dbrlapi=$brlapi \
|
||||
|
|
|
|||
16
meson.build
16
meson.build
|
|
@ -860,6 +860,7 @@ endif
|
|||
|
||||
gtk = not_found
|
||||
gtkx11 = not_found
|
||||
vte = not_found
|
||||
if not get_option('gtk').auto() or (have_system and not cocoa.found())
|
||||
gtk = dependency('gtk+-3.0', version: '>=3.22.0',
|
||||
method: 'pkg-config',
|
||||
|
|
@ -871,14 +872,16 @@ if not get_option('gtk').auto() or (have_system and not cocoa.found())
|
|||
required: false,
|
||||
kwargs: static_kwargs)
|
||||
gtk = declare_dependency(dependencies: [gtk, gtkx11])
|
||||
|
||||
if not get_option('vte').auto() or have_system
|
||||
vte = dependency('vte-2.91',
|
||||
method: 'pkg-config',
|
||||
required: get_option('vte'),
|
||||
kwargs: static_kwargs)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
vte = not_found
|
||||
if 'CONFIG_VTE' in config_host
|
||||
vte = declare_dependency(compile_args: config_host['VTE_CFLAGS'].split(),
|
||||
link_args: config_host['VTE_LIBS'].split())
|
||||
endif
|
||||
x11 = not_found
|
||||
if gtkx11.found()
|
||||
x11 = dependency('x11', method: 'pkg-config', required: gtkx11.found(),
|
||||
|
|
@ -1208,6 +1211,7 @@ if glusterfs.found()
|
|||
config_host_data.set('CONFIG_GLUSTERFS_IOCB_HAS_STAT', glusterfs_iocb_has_stat)
|
||||
endif
|
||||
config_host_data.set('CONFIG_GTK', gtk.found())
|
||||
config_host_data.set('CONFIG_VTE', vte.found())
|
||||
config_host_data.set('CONFIG_LIBATTR', have_old_libattr)
|
||||
config_host_data.set('CONFIG_LIBCAP_NG', libcap_ng.found())
|
||||
config_host_data.set('CONFIG_EBPF', libbpf.found())
|
||||
|
|
@ -2756,7 +2760,7 @@ summary_info += {'SDL image support': sdl_image.found()}
|
|||
summary_info += {'GTK support': gtk.found()}
|
||||
summary_info += {'pixman': pixman.found()}
|
||||
# TODO: add back version
|
||||
summary_info += {'VTE support': config_host.has_key('CONFIG_VTE')}
|
||||
summary_info += {'VTE support': vte.found()}
|
||||
# TODO: add back version
|
||||
summary_info += {'slirp support': slirp_opt == 'disabled' ? false : slirp_opt}
|
||||
summary_info += {'libtasn1': tasn1.found()}
|
||||
|
|
|
|||
|
|
@ -118,6 +118,8 @@ option('vnc_png', type : 'feature', value : 'auto',
|
|||
description: 'PNG compression for VNC server')
|
||||
option('vnc_sasl', type : 'feature', value : 'auto',
|
||||
description: 'SASL authentication for VNC server')
|
||||
option('vte', type : 'feature', value : 'auto',
|
||||
description: 'vte support for the gtk UI')
|
||||
option('xkbcommon', type : 'feature', value : 'auto',
|
||||
description: 'xkbcommon support')
|
||||
option('zstd', type : 'feature', value : 'auto',
|
||||
|
|
|
|||
Loading…
Reference in a new issue