提交 09aa263a 编写于 作者: R Richard Levitte

Add the configure option 'no-makedepend'

If no makedepend program or equaly capable compiler is present,
'makedepend' gets disabled automatically.
Reviewed-by: NRich Salz <rsalz@openssl.org>
上级 8eb33e4f
...@@ -275,6 +275,7 @@ my @disablables = ( ...@@ -275,6 +275,7 @@ my @disablables = (
"hw(-.+)?", "hw(-.+)?",
"idea", "idea",
"locking", "locking",
"makedepend",
"md2", "md2",
"md4", "md4",
"md5", "md5",
...@@ -796,6 +797,8 @@ foreach (sort (keys %disabled)) ...@@ -796,6 +797,8 @@ foreach (sort (keys %disabled))
{ } { }
elsif (/^dynamic-engine$/) elsif (/^dynamic-engine$/)
{ } { }
elsif (/^makedepend$/)
{ }
elsif (/^zlib-dynamic$/) elsif (/^zlib-dynamic$/)
{ } { }
elsif (/^sse2$/) elsif (/^sse2$/)
...@@ -1094,11 +1097,11 @@ unless ($disabled{asm}) { ...@@ -1094,11 +1097,11 @@ unless ($disabled{asm}) {
} }
my $ecc = $target{cc}; my $ecc = $target{cc};
if ($^O ne "VMS") { if ($^O ne "VMS" && !$disabled{makedepend}) {
# Is the compiler gcc or clang? $ecc is used below to see if # Is the compiler gcc or clang? $ecc is used below to see if
# error-checking can be turned on. # error-checking can be turned on.
my $ccpcc = "$config{cross_compile_prefix}$target{cc}"; my $ccpcc = "$config{cross_compile_prefix}$target{cc}";
$config{makedepprog} = 'makedepend'; $config{makedepprog} = which('makedepend');
open(PIPE, "$ccpcc --version 2>&1 | head -2 |"); open(PIPE, "$ccpcc --version 2>&1 | head -2 |");
while ( <PIPE> ) { while ( <PIPE> ) {
$config{makedepprog} = $ccpcc if /clang|gcc/; $config{makedepprog} = $ccpcc if /clang|gcc/;
...@@ -1106,9 +1109,12 @@ if ($^O ne "VMS") { ...@@ -1106,9 +1109,12 @@ if ($^O ne "VMS") {
$ecc = "gcc" if /gcc/; $ecc = "gcc" if /gcc/;
} }
close(PIPE); close(PIPE);
$disabled{makedepend} = "unavailable" unless $config{makedepprog};
} }
# Deal with bn_ops ################################################### # Deal with bn_ops ###################################################
$config{bn_ll} =0; $config{bn_ll} =0;
...@@ -2335,10 +2341,12 @@ sub which ...@@ -2335,10 +2341,12 @@ sub which
my $path; my $path;
foreach $path (split /:/, $ENV{PATH}) foreach $path (split /:/, $ENV{PATH})
{ {
if (-f "$path/$name$target{exe_extension}" and -x _) my $fullpath = "$path/$name$target{exe_extension}";
if (-f $fullpath and -x $fullpath)
{ {
return "$path/$name$target{exe_extension}" unless ($name eq "perl" and return $fullpath
system("$path/$name$target{exe_extension} -e " . '\'exit($]<5.0);\'')); unless ($name eq "perl" and
system("$fullpath -e " . '\'exit($]<5.0);\''));
} }
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册