Use OPENSSL_NO_DTLS instead of OPENSSL_NO_DTLS1

[openssl.git] / Configure

diff --git a/Configure b/Configure
index 9e9f100a71c1d037711ed77236d08011b8fa0205..913773bd1b687d1155d3f8780b3fea477af19ded 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -812,6 +812,7 @@ my @disablables = (
     "camellia",
     "capieng",
     "cast",
+    "chacha",
     "cmac",
     "cms",
     "comp",
@@ -822,7 +823,7 @@ my @disablables = (
     "dh",
     "dsa",
     "dso",
-    "dtls1?",
+    "dtls",
     "dynamic[-_]engine",
     "ec",
     "ec2m",
@@ -845,6 +846,7 @@ my @disablables = (
     "nextprotoneg",
     "ocb",
     "ocsp",
+    "poly1305",
     "posix-io",
     "psk",
     "rc2",
@@ -952,6 +954,7 @@ while($argv_unprocessed)
        $argvstring=join(' ',@argvcopy);
 
 PROCESS_ARGS:
+       {
        my %unsupported_options = ();
        foreach (@argvcopy)
                {
@@ -1148,7 +1151,7 @@ PROCESS_ARGS:
                        join(", ", keys %unsupported_options), "\n";
                }
        }
-
+       }
 
 
 if ($processor eq "386")
@@ -1760,7 +1763,11 @@ if ($strict_warnings)
                        {
                        $cflags .= " $wopt" unless ($cflags =~ /(^|\s)$wopt(\s|$)/)
                        }
-               }
+                if ($target =~ /^BSD-/)
+                       {
+                        $lflags .= " -lexecinfo";
+                        }
+                }
        }
 
 open(IN,"<Makefile.org") || die "unable to read Makefile.org:$!\n";