Misc afalg build fixes

[openssl.git] / Configure

diff --git a/Configure b/Configure
index e57ff602f9a272e1598c8ec275d366e2c47ccdc0..174fe150c83d3a5e2015fe32be01e6dc72563a79 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -340,6 +340,8 @@ our %disabled = ( # "what"         => "comment"
                  "sctp"                => "default",
                  "shared"              => "default",
                  "ssl-trace"           => "default",
+                 "ssl3"                => "default",
+                 "ssl3-method"         => "default",
                  "static-engine"       => "default",
                  "unit-test"           => "default",
                  "weak-ssl-ciphers"    => "default",
@@ -1173,6 +1175,26 @@ else               { $no_user_defines=1;    }
 
 # ALL MODIFICATIONS TO %config and %target MUST BE DONE FROM HERE ON
 
+$config{afalg}="";
+if ($target =~ m/^linux/) {
+    my $minver = 4*10000 + 1*100 + 0;
+    if ($config{cross_compile_prefix} eq "") {
+        my $verstr = `uname -r`;
+        my ($ma, $mi1, $mi2) = split("\\.", $verstr);
+        ($mi2) = $mi2 =~ /(\d+)/;
+        my $ver = $ma*10000 + $mi1*100 + $mi2;
+        if ($ver < $minver) {
+            $disabled{afalg} = "too-old-kernel";
+        } else {
+            push @{$config{engdirs}}, "afalg";
+        }
+    }
+} else {
+    $disabled{afalg}  = "not-linux";
+}
+
+push @{$config{openssl_other_defines}}, "OPENSSL_NO_AFALGENG" if ($disabled{afalg});
+
 # If we use the unified build, collect information from build.info files
 my %unified_info = ();
 
@@ -1455,9 +1477,9 @@ EOF
                 my %known_ordinals =
                     (
                      crypto =>
-                     cleanfile($sourced, catfile("util", "libeay.num"), $blddir),
+                     cleanfile($sourced, catfile("util", "libcrypto.num"), $blddir),
                      ssl =>
-                     cleanfile($sourced, catfile("util", "ssleay.num"), $blddir)
+                     cleanfile($sourced, catfile("util", "libssl.num"), $blddir)
                     );
                 my $o = $known_ordinals{$_};
                 die "Ordinals for $ddest defined more than once\n"
@@ -1813,11 +1835,11 @@ BEGIN
            VALUE "FileDescription", "OpenSSL Shared Library\\0"
            VALUE "FileVersion", "$config{version}\\0"
 #if defined(CRYPTO)
-           VALUE "InternalName", "libeay32\\0"
-           VALUE "OriginalFilename", "libeay32.dll\\0"
+           VALUE "InternalName", "libcrypto32\\0"
+           VALUE "OriginalFilename", "libcrypto32.dll\\0"
 #elif defined(SSL)
-           VALUE "InternalName", "ssleay32\\0"
-           VALUE "OriginalFilename", "ssleay32.dll\\0"
+           VALUE "InternalName", "libssl32\\0"
+           VALUE "OriginalFilename", "libssl32.dll\\0"
 #endif
            VALUE "ProductName", "The OpenSSL Toolkit\\0"
            VALUE "ProductVersion", "$config{version}\\0"