Disable MDC2 by default.

[openssl.git] / Configure

diff --git a/Configure b/Configure
index 38637fbce908a60bdd15bc57d9a3526cbef44fe9..7eb1769f7b7a45153b4ae63ff2eb7c70f8fd3654 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -290,7 +290,7 @@ if (defined $ENV{$local_config_envname}) {
 }
 
 
-print "Configuring OpenSSL version $config{version} (0x$config{version_num})\n";
+print "Configuring OpenSSL version $config{version} ($config{version_num})\n";
 
 $config{prefix}="";
 $config{openssldir}="";
@@ -433,6 +433,7 @@ our %disabled = ( # "what"         => "comment"
                  "fuzz-afl"            => "default",
                  "heartbeats"          => "default",
                  "md2"                 => "default",
+                 "mdc2"                => "default",
                   "msan"                => "default",
                  "rc5"                 => "default",
                  "sctp"                => "default",
@@ -962,6 +963,7 @@ $config{perl} =    ($^O ne "VMS" ? $^X : "perl");
 $config{hashbangperl} =
     $ENV{'HASHBANGPERL'}           || $ENV{'PERL'}     || "/usr/bin/env perl";
 $target{cc} =      $ENV{'CC'}      || $target{cc}      || "cc";
+$target{cxx} =     $ENV{'CXX'}     || $target{cxx}     || "c++";
 $target{ranlib} =  $ENV{'RANLIB'}  || $target{ranlib}  ||
                    (which("$config{cross_compile_prefix}ranlib") ?
                           "\$(CROSS_COMPILE)ranlib" : "true");