From patchwork Thu Dec 23 10:43:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 76504 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8FC9AB7093 for ; Thu, 23 Dec 2010 22:19:18 +1100 (EST) Received: from localhost ([127.0.0.1]:58562 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PVin6-0001Zl-ER for incoming@patchwork.ozlabs.org; Thu, 23 Dec 2010 05:53:00 -0500 Received: from [140.186.70.92] (port=48512 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PViea-0007An-Ia for qemu-devel@nongnu.org; Thu, 23 Dec 2010 05:44:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PVieZ-0003p3-Di for qemu-devel@nongnu.org; Thu, 23 Dec 2010 05:44:12 -0500 Received: from mail-ww0-f53.google.com ([74.125.82.53]:57423) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PVieZ-0003dM-7m for qemu-devel@nongnu.org; Thu, 23 Dec 2010 05:44:11 -0500 Received: by mail-ww0-f53.google.com with SMTP id 18so5886717wwi.10 for ; Thu, 23 Dec 2010 02:44:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:subject:date :message-id:x-mailer:in-reply-to:references; bh=p32TxpoIMFc4L81gK7kty439JiR05WARD/JW6i2hDtc=; b=jbPZp0f2vLzP9Lr+yzSLW7BIBOlghZkwpJnpDftiU1oykmqNEdY1gRNk60TJQ4v0GM FsO94mYhtCUOW6bD87+ORacOlND2kwQagB5AsA+pBy45MpSINRXKpkf/VNw/786315ro 4AzqrY3NZIwX0XAZRYcQiPLcmd97WpH9+29pQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=n1L7sqUrE4lHUMvYat7LwUhOTWS0ClPnTaFzrBfy+WVwLiBv1K8W67vHnBvQ2Jf3Sn 7lfDZ8CD7ZNpX/HzHiEjZYZGYENE9qknEKUujJFyCj9Mf+DR0SRg4EcYp6vMEqCSnjUH +ic5yqC02mvpLkUBhtLLZalii/Z8870rS6ees= Received: by 10.227.16.100 with SMTP id n36mr4858017wba.160.1293101050798; Thu, 23 Dec 2010 02:44:10 -0800 (PST) Received: from localhost.localdomain (93-34-160-115.ip50.fastwebnet.it [93.34.160.115]) by mx.google.com with ESMTPS id m10sm5189008wbc.22.2010.12.23.02.44.09 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 23 Dec 2010 02:44:10 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 23 Dec 2010 11:43:57 +0100 Message-Id: <1293101042-13121-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1293101042-13121-1-git-send-email-pbonzini@redhat.com> References: <1293101042-13121-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH v3 10/15] reorganize sdl-config tests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This also allows overriding it with SDL_CONFIG, and warning in suspicious cross-compilation scenarios. Signed-off-by: Paolo Bonzini --- configure | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/configure b/configure index a9423b9..959bc97 100755 --- a/configure +++ b/configure @@ -210,6 +210,7 @@ ld="${cross_prefix}${LD-ld}" strip="${cross_prefix}${STRIP-strip}" windres="${cross_prefix}${WINDRES-windres}" pkg_config="${cross_prefix}${PKG_CONFIG-pkg-config}" +sdl_config="${cross_prefix}${SDL_CONFIG-sdl-config}" # default flags for all hosts QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS" @@ -1183,21 +1184,17 @@ fi ########################################## # SDL probe -# Look for sdl configuration program (pkg-config or sdl-config). -# Prefer variant with cross prefix if cross compiling, -# and favour pkg-config with sdl over sdl-config. -if test -n "$cross_prefix" -a $pkg_config != pkg-config && \ - $pkg_config sdl --modversion >/dev/null 2>&1; then - sdlconfig="$pkg_config sdl" - _sdlversion=`$sdlconfig --modversion 2>/dev/null | sed 's/[^0-9]//g'` -elif test -n "$cross_prefix" && has ${cross_prefix}sdl-config; then - sdlconfig="${cross_prefix}sdl-config" - _sdlversion=`$sdlconfig --version | sed 's/[^0-9]//g'` -elif $pkg_config sdl --modversion >/dev/null 2>&1; then +# 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 "`basename $sdl_config`" != sdl-config && ! has ${sdl_config}; then + sdl_config=sdl-config +fi + +if $pkg_config sdl --modversion >/dev/null 2>&1; then sdlconfig="$pkg_config sdl" _sdlversion=`$sdlconfig --modversion 2>/dev/null | sed 's/[^0-9]//g'` -elif has sdl-config; then - sdlconfig='sdl-config' +elif has ${sdl_config}; then + sdlconfig="$sdl_config" _sdlversion=`$sdlconfig --version | sed 's/[^0-9]//g'` else if test "$sdl" = "yes" ; then @@ -1205,6 +1202,9 @@ else fi sdl=no fi +if test -n "$cross_prefix" && test "`basename $sdlconfig`" = sdl-config; then + echo warning: using "\"$sdlconfig\"" to detect cross-compiled sdl >&2 +fi sdl_too_old=no if test "$sdl" != "no" ; then