configure: support vte-2.91

vte >= 0.37 expores API version 2.91, which is where all the active
development is. qemu builds and runs fine with that version, so use it
if it's available.

Signed-off-by: Cole Robinson <crobinso@redhat.com>
Message-id: b4f0375647f7b368d3dbd3834aee58cb0253566a.1462557436.git.crobinso@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Cole Robinson 2016-05-06 14:03:12 -04:00 committed by Gerd Hoffmann
parent d6a6dba359
commit c6feff9e09
1 changed files with 11 additions and 6 deletions

17
configure vendored
View File

@ -2393,20 +2393,25 @@ fi
if test "$vte" != "no"; then if test "$vte" != "no"; then
if test "$gtkabi" = "3.0"; then if test "$gtkabi" = "3.0"; then
vtepackage="vte-2.90" vteminversion="0.32.0"
vteversion="0.32.0" if $pkg_config --exists "vte-2.91"; then
vtepackage="vte-2.91"
else
vtepackage="vte-2.90"
fi
else else
vtepackage="vte" vtepackage="vte"
vteversion="0.24.0" vteminversion="0.24.0"
fi fi
if $pkg_config --exists "$vtepackage >= $vteversion"; then if $pkg_config --exists "$vtepackage >= $vteminversion"; then
vte_cflags=`$pkg_config --cflags $vtepackage` vte_cflags=`$pkg_config --cflags $vtepackage`
vte_libs=`$pkg_config --libs $vtepackage` vte_libs=`$pkg_config --libs $vtepackage`
vteversion=`$pkg_config --modversion $vtepackage`
libs_softmmu="$vte_libs $libs_softmmu" libs_softmmu="$vte_libs $libs_softmmu"
vte="yes" vte="yes"
elif test "$vte" = "yes"; then elif test "$vte" = "yes"; then
if test "$gtkabi" = "3.0"; then if test "$gtkabi" = "3.0"; then
feature_not_found "vte" "Install libvte-2.90 devel" feature_not_found "vte" "Install libvte-2.90/2.91 devel"
else else
feature_not_found "vte" "Install libvte devel" feature_not_found "vte" "Install libvte devel"
fi fi
@ -4789,6 +4794,7 @@ echo "pixman $pixman"
echo "SDL support $sdl `echo_version $sdl $sdlversion`" echo "SDL support $sdl `echo_version $sdl $sdlversion`"
echo "GTK support $gtk `echo_version $gtk $gtk_version`" echo "GTK support $gtk `echo_version $gtk $gtk_version`"
echo "GTK GL support $gtk_gl" echo "GTK GL support $gtk_gl"
echo "VTE support $vte `echo_version $vte $vteversion`"
echo "GNUTLS support $gnutls" echo "GNUTLS support $gnutls"
echo "GNUTLS hash $gnutls_hash" echo "GNUTLS hash $gnutls_hash"
echo "GNUTLS rnd $gnutls_rnd" echo "GNUTLS rnd $gnutls_rnd"
@ -4797,7 +4803,6 @@ echo "libgcrypt kdf $gcrypt_kdf"
echo "nettle $nettle `echo_version $nettle $nettle_version`" echo "nettle $nettle `echo_version $nettle $nettle_version`"
echo "nettle kdf $nettle_kdf" echo "nettle kdf $nettle_kdf"
echo "libtasn1 $tasn1" echo "libtasn1 $tasn1"
echo "VTE support $vte"
echo "curses support $curses" echo "curses support $curses"
echo "virgl support $virglrenderer" echo "virgl support $virglrenderer"
echo "curl support $curl" echo "curl support $curl"