From ab185b6038537fdab73a586289b0f02d74a5145d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bodo=20M=C3=B6ller?= Date: Sun, 13 Mar 2005 19:46:58 +0000 Subject: [PATCH] It seems that Configure revision 1.404 broke "make depend" by hiding from it which algorithms were disabled. With these new changes, "make depend" will properly take into account algorithms that are skipped. --- Configure | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Configure b/Configure index 65cf4006fa..0bf4e29ef1 100755 --- a/Configure +++ b/Configure @@ -611,6 +611,10 @@ my %disabled = ( # "what" => "comment" # To remove something from %disabled, use e.g. "enable-rc5". # For symmetry, "disable-..." is a synonym for "no-...". +# This is what $depflags will look like with the above default: +my $default_depflags = "-DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 "; + + my $no_sse2=0; &usage if ($#ARGV < 0); @@ -891,6 +895,8 @@ foreach (sort (keys %disabled)) { push @skip, $algo; print " (skip dir)"; + + $depflags .="-DOPENSSL_NO_$ALGO "; } } } @@ -1531,7 +1537,7 @@ EOF my $make_command = "make -f Makefile.ssl PERL=\'$perl\'"; my $make_targets = ""; $make_targets .= " links" if $symlink; - $make_targets .= " depend" if $depflags ne "" && $make_depend; + $make_targets .= " depend" if $depflags ne $default_depflags && $make_depend; $make_targets .= " gentests" if $symlink; (system $make_command.$make_targets) == 0 or exit $? if $make_targets ne ""; @@ -1543,11 +1549,11 @@ EOF &dofile("tools/c_rehash",'/usr/local/bin/perl','^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";'); &dofile("apps/CA.pl",'/usr/local/bin/perl','^#!/', '#!%s'); } - if ($depflags ne "" && !$make_depend) { + if ($depflags ne $default_depflags && !$make_depend) { print <