From patchwork Sun Nov 14 11:48:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 71103 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 8761AB7103 for ; Sun, 14 Nov 2010 22:59:10 +1100 (EST) Received: from localhost ([127.0.0.1]:36783 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PHbEh-0007lX-Pt for incoming@patchwork.ozlabs.org; Sun, 14 Nov 2010 06:59:07 -0500 Received: from [140.186.70.92] (port=43544 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PHb5U-0002xo-Af for qemu-devel@nongnu.org; Sun, 14 Nov 2010 06:49:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PHb5T-0004HQ-1I for qemu-devel@nongnu.org; Sun, 14 Nov 2010 06:49:36 -0500 Received: from mail-pw0-f45.google.com ([209.85.160.45]:61102) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PHb5S-0004GE-KR for qemu-devel@nongnu.org; Sun, 14 Nov 2010 06:49:34 -0500 Received: by mail-pw0-f45.google.com with SMTP id 6so977706pwj.4 for ; Sun, 14 Nov 2010 03:49:34 -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=p9+eejaKcQzc9B7rCf5Zpid9xXGlbr5WIurO0QalCTg=; b=UNZIlC7stz8GKYim8AZJc45TEKlcgmO3K1Xn7WZ2JU8tjyLHG7/61BhkYhSnxEQHuy eDhMX8ZR2t5M2lfWn4XITtWQwqKVPgdzJ+//YOWmhydk4t7uNJ8bPBj43uNxNrUTJZaQ HmymKlAONzqD2suKqpfPMZuN8WSMPC/IJAJV8= 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=Pg0SVNPkBlMglrOUF/3pG+h8n14+F9YhCHXbb0u3ttloQ+DECL8YvszoTyDjFCktC6 9imoEVWTghpNvigebF8lbC+ehX9hRtPJt8FgjM8eMCcPeOKdDQ05EeBs4198xlfoEZWH JEFfgEKR9mhm3kG68xqk1AJTUHDWnCrFMUQ0U= Received: by 10.143.6.15 with SMTP id j15mr3981907wfi.39.1289735374152; Sun, 14 Nov 2010 03:49:34 -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.32 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 14 Nov 2010 03:49:33 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sun, 14 Nov 2010 12:48:56 +0100 Message-Id: <1289735342-8660-9-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 08/14] fix spelling of $pkg_config, move default together with other cross tools 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 Signed-off-by: Paolo Bonzini --- configure | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/configure b/configure index 1bc9b85..5ec1069 100755 --- a/configure +++ b/configure @@ -207,6 +207,7 @@ objcopy="${cross_prefix}${OBJCOPY-objcopy}" ld="${cross_prefix}${LD-ld}" strip="${cross_prefix}${STRIP-strip}" windres="${cross_prefix}${WINDRES-windres}" +pkg_config="${cross_prefix}${PKG_CONFIG-pkg-config}" # default flags for all hosts QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS" @@ -1152,12 +1153,11 @@ EOF fi ########################################## -# pkgconfig probe +# pkg-config probe -pkgconfig="${cross_prefix}pkg-config" -if ! has $pkgconfig; then +if ! has $pkg_config; then # likely not cross compiling, or hope for the best - pkgconfig=pkg-config + pkg_config=pkg-config fi ########################################## @@ -1179,15 +1179,15 @@ fi # 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 $pkgconfig != pkg-config && \ - $pkgconfig sdl --modversion >/dev/null 2>&1; then - sdlconfig="$pkgconfig sdl" +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 $pkgconfig sdl --modversion >/dev/null 2>&1; then - sdlconfig="$pkgconfig sdl" +elif $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' @@ -1267,8 +1267,8 @@ if test "$vnc_tls" != "no" ; then #include int main(void) { gnutls_session_t s; gnutls_init(&s, GNUTLS_SERVER); return 0; } EOF - vnc_tls_cflags=`$pkgconfig --cflags gnutls 2> /dev/null` - vnc_tls_libs=`$pkgconfig --libs gnutls 2> /dev/null` + vnc_tls_cflags=`$pkg_config --cflags gnutls 2> /dev/null` + vnc_tls_libs=`$pkg_config --libs gnutls 2> /dev/null` if compile_prog "$vnc_tls_cflags" "$vnc_tls_libs" ; then vnc_tls=yes libs_softmmu="$vnc_tls_libs $libs_softmmu" @@ -1561,8 +1561,8 @@ fi ########################################## # curl probe -if $pkgconfig libcurl --modversion >/dev/null 2>&1; then - curlconfig="$pkgconfig libcurl" +if $pkg_config libcurl --modversion >/dev/null 2>&1; then + curlconfig="$pkg_config libcurl" else curlconfig=curl-config fi @@ -1594,7 +1594,7 @@ if test "$check_utests" != "no" ; then #include int main(void) { suite_create("qemu test"); return 0; } EOF - check_libs=`$pkgconfig --libs check` + check_libs=`$pkg_config --libs check` if compile_prog "" $check_libs ; then check_utests=yes libs_tools="$check_libs $libs_tools" @@ -1613,8 +1613,8 @@ if test "$bluez" != "no" ; then #include int main(void) { return bt_error(0); } EOF - bluez_cflags=`$pkgconfig --cflags bluez 2> /dev/null` - bluez_libs=`$pkgconfig --libs bluez 2> /dev/null` + bluez_cflags=`$pkg_config --cflags bluez 2> /dev/null` + bluez_libs=`$pkg_config --libs bluez 2> /dev/null` if compile_prog "$bluez_cflags" "$bluez_libs" ; then bluez=yes libs_softmmu="$bluez_libs $libs_softmmu" @@ -1658,7 +1658,7 @@ EOF kvm_cflags="$kvm_cflags -I$kerneldir/arch/$cpu/include" fi else - kvm_cflags=`$pkgconfig --cflags kvm-kmod 2>/dev/null` + kvm_cflags=`$pkg_config --cflags kvm-kmod 2>/dev/null` fi if compile_prog "$kvm_cflags" "" ; then kvm=yes