Ooops, revert committed conflict.

[openssl.git] / Configure

diff --git a/Configure b/Configure
index 261c54c7a2965a306f12d4d88fdfd0e35d22f7f1..414f0283ec3b4015b0b79e93327437ea9e426f0f 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -1090,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];
 
@@ -1500,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";
                }