From patchwork Sun Nov 14 11:48:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 71107 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 8FC1EB7119 for ; Sun, 14 Nov 2010 23:05:24 +1100 (EST) Received: from localhost ([127.0.0.1]:42328 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PHbKj-0005PO-Qd for incoming@patchwork.ozlabs.org; Sun, 14 Nov 2010 07:05:21 -0500 Received: from [140.186.70.92] (port=43574 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PHb5Y-00031Q-C2 for qemu-devel@nongnu.org; Sun, 14 Nov 2010 06:49:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PHb5W-0004I3-Rl for qemu-devel@nongnu.org; Sun, 14 Nov 2010 06:49:39 -0500 Received: from mail-px0-f173.google.com ([209.85.212.173]:41728) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PHb5W-0004H1-IL for qemu-devel@nongnu.org; Sun, 14 Nov 2010 06:49:38 -0500 Received: by mail-px0-f173.google.com with SMTP id 16so974811pxi.4 for ; Sun, 14 Nov 2010 03:49:38 -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=SEmnZ8qeZMhn50aU/eE8jcOm48lIJ3G0DTAgs4RZjAs=; b=PUGFDq1IxZ3FERwybK5TR3QWYrkh9ahLfBO192edAzQlLpo0HM22MPk6uAFGbELhit xNBN94EzsSTeSAvlXcPQUPF4CFbkIF7IhtN/k2a32TSgwPXbdgy8peudmpq1b+oNBJ1S NEWVTs4B3IxuYMfonqh225ESPjnbs72MeDLYY= 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=bnh/svTpVu9OhVF7gDddUI5GkbpVVT/Nei0VOEFIDvyDG8crFNyzwEduxKle413QhA ZSJ7sc14EJG1ypCeD1eyK+joi4kWlzQaRbQyf69LteaYwI2nlMVtWKlmdfQ0JWjTyqws 9ynJWHcmx+THYNsLNUT8EmnpE4MI1geuXC9is= Received: by 10.142.172.10 with SMTP id u10mr3657821wfe.232.1289735378148; Sun, 14 Nov 2010 03:49:38 -0800 (PST) Received: from localhost.localdomain (s209p8.home.99maxprogres.cz [85.93.118.17]) by mx.google.com with ESMTPS id x35sm7086810wfd.13.2010.11.14.03.49.36 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 14 Nov 2010 03:49:37 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sun, 14 Nov 2010 12:48:58 +0100 Message-Id: <1289735342-8660-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1289735342-8660-1-git-send-email-pbonzini@redhat.com> References: <1289735342-8660-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 10/14] 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 4556a1d..2d2d306 100755 --- a/configure +++ b/configure @@ -208,6 +208,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" @@ -1176,21 +1177,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 @@ -1198,6 +1195,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