From patchwork Fri May 6 18:03:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 9035211 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1DE21BF29F for ; Fri, 6 May 2016 18:05:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 883A52035B for ; Fri, 6 May 2016 18:05:24 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id E0BFB20274 for ; Fri, 6 May 2016 18:05:23 +0000 (UTC) Received: from localhost ([::1]:59580 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ayk7r-0007bS-So for patchwork-qemu-devel@patchwork.kernel.org; Fri, 06 May 2016 14:05:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36556) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ayk7P-0007Cj-30 for qemu-devel@nongnu.org; Fri, 06 May 2016 14:04:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ayk74-0001Rf-Ck for qemu-devel@nongnu.org; Fri, 06 May 2016 14:04:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37526) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ayk74-0001O5-7k for qemu-devel@nongnu.org; Fri, 06 May 2016 14:04:30 -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 222DF64380 for ; Fri, 6 May 2016 18:04:19 +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 u46I4E4c019036; Fri, 6 May 2016 14:04:18 -0400 From: Cole Robinson To: qemu-devel@nongnu.org Date: Fri, 6 May 2016 14:03:07 -0400 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 06 May 2016 18:04:19 +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] [PATCH 03/10] configure: build SDL if only SDL2 available 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Right now if SDL2 is installed but not SDL1, default configure will entirely disable SDL. Check upfront for SDL2 using pkg-config, but still prefer SDL1 if both versions are installed. Signed-off-by: Cole Robinson --- configure | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/configure b/configure index c37fc5f..0b53fac 100755 --- a/configure +++ b/configure @@ -207,7 +207,7 @@ fdt="" netmap="no" pixman="" sdl="" -sdlabi="1.2" +sdlabi="" virtfs="" vnc="yes" sparse="no" @@ -2420,6 +2420,16 @@ fi # Look for sdl configuration program (pkg-config or sdl-config). Try # sdl-config even without cross prefix, and favour pkg-config over sdl-config. +if test "$sdlabi" = ""; then + if $pkg_config --exists "sdl"; then + sdlabi=1.2 + elif $pkg_config --exists "sdl2"; then + sdlabi=2.0 + else + sdlabi=1.2 + fi +fi + if test $sdlabi = "2.0"; then sdl_config=$sdl2_config sdlname=sdl2