From patchwork Fri May 6 18:03:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 67306 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp450603qge; Fri, 6 May 2016 11:11:25 -0700 (PDT) X-Received: by 10.194.85.161 with SMTP id i1mr23151121wjz.95.1462558285320; Fri, 06 May 2016 11:11:25 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id dc5si19849901wjb.14.2016.05.06.11.11.25 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 06 May 2016 11:11:25 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:59635 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aykDU-0001d4-1n for patch@linaro.org; Fri, 06 May 2016 14:11:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36578) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ayk7S-0007Iq-Pb for qemu-devel@nongnu.org; Fri, 06 May 2016 14:05:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ayk77-0001T8-QN for qemu-devel@nongnu.org; Fri, 06 May 2016 14:04:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50227) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ayk77-0001P2-Ko for qemu-devel@nongnu.org; Fri, 06 May 2016 14:04:33 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 86E70C0006FE for ; Fri, 6 May 2016 18:04:22 +0000 (UTC) Received: from colepc.redhat.com (ovpn-113-44.phx2.redhat.com [10.3.113.44]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u46I4E4h019036; Fri, 6 May 2016 14:04:21 -0400 From: Cole Robinson To: qemu-devel@nongnu.org Date: Fri, 6 May 2016 14:03:12 -0400 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 08/10] configure: support vte-2.91 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann , Cole Robinson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- configure | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) -- 2.7.4 diff --git a/configure b/configure index 22cf55c..bbf9005 100755 --- a/configure +++ b/configure @@ -2393,20 +2393,25 @@ fi if test "$vte" != "no"; then if test "$gtkabi" = "3.0"; then - vtepackage="vte-2.90" - vteversion="0.32.0" + vteminversion="0.32.0" + if $pkg_config --exists "vte-2.91"; then + vtepackage="vte-2.91" + else + vtepackage="vte-2.90" + fi else vtepackage="vte" - vteversion="0.24.0" + vteminversion="0.24.0" fi - if $pkg_config --exists "$vtepackage >= $vteversion"; then + if $pkg_config --exists "$vtepackage >= $vteminversion"; then vte_cflags=`$pkg_config --cflags $vtepackage` vte_libs=`$pkg_config --libs $vtepackage` + vteversion=`$pkg_config --modversion $vtepackage` libs_softmmu="$vte_libs $libs_softmmu" vte="yes" elif test "$vte" = "yes"; 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 feature_not_found "vte" "Install libvte devel" fi @@ -4789,6 +4794,7 @@ echo "pixman $pixman" echo "SDL support $sdl `echo_version $sdl $sdlversion`" echo "GTK support $gtk `echo_version $gtk $gtk_version`" echo "GTK GL support $gtk_gl" +echo "VTE support $vte `echo_version $vte $vteversion`" echo "GNUTLS support $gnutls" echo "GNUTLS hash $gnutls_hash" echo "GNUTLS rnd $gnutls_rnd" @@ -4797,7 +4803,6 @@ echo "libgcrypt kdf $gcrypt_kdf" echo "nettle $nettle `echo_version $nettle $nettle_version`" echo "nettle kdf $nettle_kdf" echo "libtasn1 $tasn1" -echo "VTE support $vte" echo "curses support $curses" echo "virgl support $virglrenderer" echo "curl support $curl"