Configure: make no-whirlpool work [from HEAD].

diff --git a/Configure b/Configure
index 7941c93f64ca3911755d32068b93ea072cdf078b..93d708b6a57d1f1a6dd159dd624aa74539c81c3c 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -1015,6 +1015,8 @@ foreach (sort (keys %disabled))
                        else
                                {
                                push @skip, $algo;
+                               # fix-up crypto/directory name(s)
+                               @skip[$#skip]="whrlpool" if $algo eq "whirlpool";
                                print " (skip dir)";
 
                                $depflags .= " -DOPENSSL_NO_$ALGO";
@@ -1415,7 +1417,7 @@ else      {
        $aes_obj=$aes_enc;
        }
 $wp_obj="" if ($wp_obj =~ /mmx/ && $processor eq "386");
-if ($wp_obj =~ /\.o$/)
+if ($wp_obj =~ /\.o$/ && !$disabled{"whirlpool"})
        {
        $cflags.=" -DWHIRLPOOL_ASM";
        }