From patchwork Wed Jan 20 12:49:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 43279 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 8D6C4B7CB8 for ; Wed, 20 Jan 2010 23:50:55 +1100 (EST) Received: from localhost ([127.0.0.1]:40967 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXa1M-0005cs-51 for incoming@patchwork.ozlabs.org; Wed, 20 Jan 2010 07:50:52 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NXa0i-0005ce-NS for qemu-devel@nongnu.org; Wed, 20 Jan 2010 07:50:12 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NXa0e-0005ag-12 for qemu-devel@nongnu.org; Wed, 20 Jan 2010 07:50:12 -0500 Received: from [199.232.76.173] (port=54664 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXa0d-0005ad-SG for qemu-devel@nongnu.org; Wed, 20 Jan 2010 07:50:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58744) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NXa0d-0003Rx-CB for qemu-devel@nongnu.org; Wed, 20 Jan 2010 07:50:07 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0KCo3BH001931 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 20 Jan 2010 07:50:03 -0500 Received: from localhost (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0KCo0Jv026195; Wed, 20 Jan 2010 07:50:01 -0500 From: Juan Quintela To: =?utf-8?Q?Lo=C3=AFc?= Minier In-Reply-To: <20100120113741.GA31679@pig.zood.org> (=?utf-8?Q?=22Lo=C3=AFc?= Minier"'s message of "Wed, 20 Jan 2010 12:37:41 +0100") References: <20100117124528.GA24106@bee.dooz.org> <4B531406.2070904@mail.berlios.de> <20100119101119.GA11358@bee.dooz.org> <20100119114750.GB11613@bee.dooz.org> <20100120113741.GA31679@pig.zood.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) Date: Wed, 20 Jan 2010 13:49:54 +0100 Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] Re: Stop using "which" in ./configure 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 Loïc Minier wrote: > On Tue, Jan 19, 2010, Måns Rullgård wrote: > [...] >> Why the extra variable? Using $1 directly seems just as obvious to me. > [...] > > I'm attaching an updated patch which doesn't use this variable. Should > be applied after the sdl-config patch. > >> Is the full path of these tools really important? Doesn't look like >> it to me. > > I'm attaching a new patch which changes the tests a bit; I would prefer > if someone with access to a Solaris build environment would do this > though. Hi could you test this patch? I did it concurrently with yours. my prog_exist() is equal to your has(), and path_of() is only needed in a single place, that I think it is better handled with a single grep in that place. What do you think? From 4580f69b022e7861bf3be1c694222c0ee82889b7 Mon Sep 17 00:00:00 2001 Message-Id: <4580f69b022e7861bf3be1c694222c0ee82889b7.1263991676.git.quintela@redhat.com> In-Reply-To: References: From: Juan Quintela Date: Wed, 20 Jan 2010 13:24:59 +0100 Subject: [PATCH 1/3] substitute all uses of which by type Except in one case, we are only interested in knowing if a command exist, not is path. Just create prog_exists() function that does this check. Signed-off-by: Juan Quintela --- configure | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 5631bbb..c1c9bb4 100755 --- a/configure +++ b/configure @@ -27,6 +27,11 @@ compile_prog() { $cc $QEMU_CFLAGS $local_cflags -o $TMPE $TMPC $LDFLAGS $local_ldflags > /dev/null 2> /dev/null } +prog_exist() { + prog="$1" + type $1 > /dev/null 2> /dev/null +} + # default parameters cpu="" prefix="" @@ -763,21 +768,19 @@ fi # Solaris specific configure tool chain decisions # if test "$solaris" = "yes" ; then - solinst=`which $install 2> /dev/null | /usr/bin/grep -v "no $install in"` - if test -z "$solinst" ; then + if ! prog_exist "$install" ; then echo "Solaris install program not found. Use --install=/usr/ucb/install or" echo "install fileutils from www.blastwave.org using pkg-get -i fileutils" echo "to get ginstall which is used by default (which lives in /opt/csw/bin)" exit 1 fi - if test "$solinst" = "/usr/sbin/install" ; then + if type install2 2> /dev/null | grep /usr/bin/install >/dev/null ; then echo "Error: Solaris /usr/sbin/install is not an appropriate install program." echo "try ginstall from the GNU fileutils available from www.blastwave.org" echo "using pkg-get -i fileutils, or use --install=/usr/ucb/install" exit 1 fi - sol_ar=`which ar 2> /dev/null | /usr/bin/grep -v "no ar in"` - if test -z "$sol_ar" ; then + if ! prog_exist "ar" ; then echo "Error: No path includes ar" if test -f /usr/ccs/bin/ar ; then echo "Add /usr/ccs/bin to your path and rerun configure" @@ -969,7 +972,7 @@ fi # pkgconfig probe pkgconfig="${cross_prefix}pkg-config" -if ! test -x "$(which $pkgconfig 2>/dev/null)"; then +if ! prog_exist "$pkgconfig" ; then # likely not cross compiling, or hope for the best pkgconfig=pkg-config fi @@ -977,7 +980,7 @@ fi ########################################## # Sparse probe if test "$sparse" != "no" ; then - if test -x "$(which cgcc 2>/dev/null)"; then + if prog_exist "cgcc" ; then sparse=yes else if test "$sparse" = "yes" ; then @@ -1419,8 +1422,8 @@ EOF fi else if test "$kvm" = "yes" ; then - if [ -x "`which awk 2>/dev/null`" ] && \ - [ -x "`which grep 2>/dev/null`" ]; then + if prog_exist "awk" -a \ + prog_exist "grep"; then kvmerr=`LANG=C $cc $QEMU_CFLAGS -o $TMPE $kvm_cflags $TMPC 2>&1 \ | grep "error: " \ | awk -F "error: " '{if (NR>1) printf(", "); printf("%s",$2);}'` @@ -1689,8 +1692,8 @@ fi # Check if tools are available to build documentation. if test "$docs" != "no" ; then - if test -x "`which texi2html 2>/dev/null`" -a \ - -x "`which pod2man 2>/dev/null`" ; then + if prog_exist "texi2html" -a \ + prog_exist "pod2man" ; then docs=yes else if test "$docs" = "yes" ; then