[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  6646f69f31734e8c918713b1f57de392bb820fc6 (commit)
      from  c3ad47f501303f86a7ae9bf957f5d05615ec84ff (commit)


- Log -----------------------------------------------------------------
commit 6646f69f31734e8c918713b1f57de392bb820fc6
Author: Andy Polyakov <appro at openssl.org>
Date:   Mon May 9 17:12:13 2016 +0200

    Configure: replace which() with IPC::Cmd::can_run.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/Configure b/Configure
index 62f5c3d..060ba24 100755
--- a/Configure
+++ b/Configure
@@ -14,6 +14,7 @@ use strict;
 use File::Basename;
 use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs/;
 use File::Path qw/mkpath/;
+use IPC::Cmd qw/can_run/;
 
 # see INSTALL for instructions.
 
@@ -910,7 +911,7 @@ $config{cross_compile_prefix} = $ENV{'CROSS_COMPILE'}
 $config{perl} =    $ENV{'PERL'}    || ($^O ne "VMS" ? $^X : "perl");
 $target{cc} =      $ENV{'CC'}      || $target{cc}      || "cc";
 $target{ranlib} =  $ENV{'RANLIB'}  || $target{ranlib}  ||
-                   (which("$config{cross_compile_prefix}ranlib") ?
+                   (scalar can_run("$config{cross_compile_prefix}ranlib") ?
                           "\$(CROSS_COMPILE)ranlib" : "true");
 $target{ar} =      $ENV{'AR'}      || $target{ar}      || "ar";
 $target{nm} =      $ENV{'NM'}      || $target{nm}      || "nm";
@@ -1153,7 +1154,7 @@ if ($^O ne "VMS" && !$disabled{makedepend}) {
     }
     close(PIPE);
 
-    $config{makedepprog} = which('makedepend') unless $config{makedepprog};
+    $config{makedepprog} = scalar can_run('makedepend') unless $config{makedepprog};
     $disabled{makedepend} = "unavailable" unless $config{makedepprog};
 }
 
@@ -2462,22 +2463,6 @@ sub absolutedir {
     return realpath($dir);
 }
 
-sub which
-	{
-	my($name)=@_;
-	my $path;
-	foreach $path (split /:/, $ENV{PATH})
-		{
-		my $fullpath = "$path/$name$target{exe_extension}";
-		if (-f $fullpath and -x $fullpath)
-			{
-			return $fullpath
-			    unless ($name eq "perl" and
-				    system("$fullpath -e " . '\'exit($]<5.0);\''));
-			}
-		}
-	}
-
 sub quotify {
     my %processors = (
 	perl    => sub { my $x = shift;