From patchwork Thu Jul 7 14:27:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 9219021 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6A09860574 for ; Thu, 7 Jul 2016 14:30:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A80027BF4 for ; Thu, 7 Jul 2016 14:30:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4D4F127BF8; Thu, 7 Jul 2016 14:30:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1AA3227BF4 for ; Thu, 7 Jul 2016 14:30:54 +0000 (UTC) Received: from localhost ([::1]:40305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLAKL-0000HF-9S for patchwork-qemu-devel@patchwork.kernel.org; Thu, 07 Jul 2016 10:30:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLAHP-00062Z-J8 for qemu-devel@nongnu.org; Thu, 07 Jul 2016 10:27:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bLAHJ-0002N8-Ka for qemu-devel@nongnu.org; Thu, 07 Jul 2016 10:27:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41629) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLAHJ-0002N2-Eq for qemu-devel@nongnu.org; Thu, 07 Jul 2016 10:27:45 -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 13C4FC05FBDE; Thu, 7 Jul 2016 14:27:45 +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 u67ERiwi021599; Thu, 7 Jul 2016 10:27:44 -0400 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 9CA7580EB2; Thu, 7 Jul 2016 16:27:43 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 7 Jul 2016 16:27:40 +0200 Message-Id: <1467901660-9054-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.32]); Thu, 07 Jul 2016 14:27:45 +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: switch to gtk3 by default, depricate gtk2. 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: Peter Maydell , Gerd Hoffmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch drops gtk version detection. gtk3 is used unless you explicitly ask for gtk2. Additionally configure prints an error message in case it finds gtk2 but not gtk3. Old behavior: only gtk3 installed -- use gtk3 both gtk2+3 installed -- use gtk2 only gtk2 installed -- use gtk2 no gtk installed at all -- build without gtk ui New behavior: only gtk3 installed -- use gtk3 both gtk2+3 installed -- use gtk3 only gtk2 installed -- error out no gtk installed at all -- build without gtk ui It is still possible to build with gtk2, but you have to explicitly ask for it using --with-gtkabi=2.0. Signed-off-by: Gerd Hoffmann Reviewed-by: Daniel P. Berrange --- configure | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/configure b/configure index e9090a0..af49eed 100755 --- a/configure +++ b/configure @@ -2154,14 +2154,20 @@ 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 - gtkabi=3.0 - else - gtkabi=2.0 + gtkabi=3.0 + if !$pkg_config --exists "gtk+-3.0 >= 3.0.0" && + $pkg_config --exists "gtk+-2.0 >= 2.18.0"; then + echo "" + echo "ERROR: gtk3 not found, gtk2 is present though." + echo "" + echo "We strongly recomment to install the gtk3 devel packages and" + echo "build qemu with gtk3. gtk2 support is depricated and will be" + echo "dropped (removal scheduled for 2018)." + echo "" + echo "If it is really your intention to build qemu with gtk2 re-run" + echo "configure with --with-gtkabi=2.0." + echo "" + exit 1 fi fi