Ooops, revert committed conflict.

[openssl.git] / Configure

diff --git a/Configure b/Configure
index c86189751889631ea67310615a6cdc990a86ccc7..414f0283ec3b4015b0b79e93327437ea9e426f0f 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -1046,6 +1046,7 @@ $libdir="lib" if $libdir eq "";
 $default_ranlib= &which("ranlib") or $default_ranlib="true";
 $perl=$ENV{'PERL'} or $perl=&which("perl5") or $perl=&which("perl")
   or $perl="perl";
+my $make = $ENV{'MAKE'} || "make";
 
 $cross_compile_prefix=$ENV{'CROSS_COMPILE'} if $cross_compile_prefix eq "";
 
@@ -1089,7 +1090,8 @@ my $shared_target = $fields[$idx_shared_target];
 my $shared_cflag = $fields[$idx_shared_cflag];
 my $shared_ldflag = $fields[$idx_shared_ldflag];
 my $shared_extension = $fields[$idx_shared_extension];
-my $ranlib = $fields[$idx_ranlib];
+my $ranlib = $ENV{'RANLIB'} || $fields[$idx_ranlib];
+my $ar = $ENV{'AR'} || "ar";
 my $arflags = $fields[$idx_arflags];
 my $multilib = $fields[$idx_multilib];
 
@@ -1499,6 +1501,7 @@ while (<IN>)
                }
        else    {
                s/^CC=.*$/CC= $cc/;
+               s/^AR=\s*ar/AR= $ar/;
                s/^RANLIB=.*/RANLIB= $ranlib/;
                s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
                }
@@ -1782,7 +1785,7 @@ if($IsMK1MF) {
 EOF
        close(OUT);
 } else {
-       my $make_command = "make PERL=\'$perl\'";
+       my $make_command = "$make PERL=\'$perl\'";
        my $make_targets = "";
        $make_targets .= " links" if $symlink;
        $make_targets .= " depend" if $depflags ne $default_depflags && $make_depend;