Commit a784ed60 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

findtool: file name as a full path requires a slash 

Kalle Vahlman's patch applied a while ago broke how the findtool
function searches for tools, as it would always check if "$file"
was present first, which thus made the bad assumption that a file
in the current directory would be a match.

I noticed when it found 'libtool' in the current directory but
libtoolize is not there, which confused the script.
parent d2621445

buildconf

+10 −4
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#

# Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.

#

# This software is licensed as described in the file COPYING, which

# you should have received as part of this distribution. The terms
@@ -33,10 +33,16 @@ die(){ 
findtool(){

  file="$1"



  if { echo $file | grep "/" >/dev/null 2>&1; } then

    # we only check for the explicit file name if the file is given

    # including a slash. Use ./ for current dir. Previously this would

    # otherwise always cause findtool to search the local dir first, which

    # is wrong.

    if test -f "$file"; then

      echo "$file"

      return

    fi

  fi



  old_IFS=$IFS; IFS=':'

  for path in $PATH