From patchwork Thu Dec 23 10:43:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 76493 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 4FB7FB7082 for ; Thu, 23 Dec 2010 21:55:19 +1100 (EST) Received: from localhost ([127.0.0.1]:59644 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PVipH-00029p-6n for incoming@patchwork.ozlabs.org; Thu, 23 Dec 2010 05:55:15 -0500 Received: from [140.186.70.92] (port=48470 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PVieX-0007A4-NK for qemu-devel@nongnu.org; Thu, 23 Dec 2010 05:44:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PVieW-0003oB-N4 for qemu-devel@nongnu.org; Thu, 23 Dec 2010 05:44:09 -0500 Received: from mail-wy0-f173.google.com ([74.125.82.173]:36916) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PVieW-0003e9-EZ for qemu-devel@nongnu.org; Thu, 23 Dec 2010 05:44:08 -0500 Received: by mail-wy0-f173.google.com with SMTP id 36so6457648wyg.4 for ; Thu, 23 Dec 2010 02:44:08 -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=rm2x94e8G4UAyXlR890GPPd2DFDf77uQnSLojWuzJJ8=; b=DtNEU5kO8aCtxwD7Q4pSWLJ3hD0Tv6vi5TM1n4VGEpSPjhKZpj0vjBMHQnzZtbG755 O5wGpcQDTogy8u4rml9MlTwE41LUHYeEtL+Ikq+TR1LLTyZ/21d4bLw6ljMtUgQwdb+s biIzAbP8uihKmXpj7bUTj9TdO4aJ34VRNeZuM= 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=ZpoEOev6EIh/qJAU/mboS4/Lz/vQJiJQSRRiqZ8gdx+VyyfzRHu83biemUU+udbBCM 441hpulsoLWM5XS/Dapekq1uXQN1F0TsQbyNsCkZ7gcRjOMkBORNvMqvBXFuOpYYwbsv h8fwKFXbWj3KVCv5gGvXgq4IJ1dEVayuqnQro= Received: by 10.227.179.141 with SMTP id bq13mr4982992wbb.149.1293101048068; Thu, 23 Dec 2010 02:44:08 -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.06 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 23 Dec 2010 02:44:07 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 23 Dec 2010 11:43:55 +0100 Message-Id: <1293101042-13121-9-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 08/15] 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 a3ff503..aeda349 100755 --- a/configure +++ b/configure @@ -209,6 +209,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" @@ -1159,12 +1160,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 ########################################## @@ -1186,15 +1186,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' @@ -1274,8 +1274,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" @@ -1589,8 +1589,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 @@ -1622,7 +1622,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" @@ -1641,8 +1641,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" @@ -1686,7 +1686,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