From patchwork Thu Jul 7 07:34:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 645780 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rlV3m14hpz9sDC for ; Thu, 7 Jul 2016 17:43:31 +1000 (AEST) Received: from localhost ([::1]:38023 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bL3y2-0000mF-A9 for incoming@patchwork.ozlabs.org; Thu, 07 Jul 2016 03:43:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44477) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bL3xQ-0000Vh-2r for qemu-devel@nongnu.org; Thu, 07 Jul 2016 03:42:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bL3xK-0007WA-5E for qemu-devel@nongnu.org; Thu, 07 Jul 2016 03:42:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37781) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bL3xK-0007Vy-0a for qemu-devel@nongnu.org; Thu, 07 Jul 2016 03:42:42 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (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 3E2F164080 for ; Thu, 7 Jul 2016 07:42:41 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-150.phx2.redhat.com [10.3.116.150]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u677geSf032084; Thu, 7 Jul 2016 03:42:40 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id CADF980EB2; Thu, 7 Jul 2016 09:34:53 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 7 Jul 2016 09:34:47 +0200 Message-Id: <1467876887-2259-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 07 Jul 2016 07:42:41 +0000 (UTC) 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] [RfC PATCH] gtk: prefer version 3.x 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 Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This patch flips the default from gtk2 to gtk3. Sounds like a bigger change than it actually is as configure already uses gtk3 in case it doesn't find gtk2. So this changes behavior only in case both gtk2 and gtk3 devel packages are installed. Signed-off-by: Gerd Hoffmann Reviewed-by: Daniel P. Berrange --- configure | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/configure b/configure index e9090a0..e029eee 100755 --- a/configure +++ b/configure @@ -2154,11 +2154,9 @@ fi # GTK probe if test "$gtkabi" = ""; then - # The GTK ABI was not specified explicitly, so try whether 2.0 is available. - # Use 3.0 as a fallback if that is available. - if $pkg_config --exists "gtk+-2.0 >= 2.18.0"; then - gtkabi=2.0 - elif $pkg_config --exists "gtk+-3.0 >= 3.0.0"; then + # The GTK ABI was not specified explicitly, so try whether 3.0 is available. + # Use 2.0 as a fallback. + if $pkg_config --exists "gtk+-3.0 >= 3.0.0"; then gtkabi=3.0 else gtkabi=2.0