Update from stable branch.

[thirdparty/openssl.git] / Configure

diff --git a/Configure b/Configure
index d86a93bce74bc7bf7778419fd34d472a41208d52..5d8305bbf96fb39aa42f22a0fd3bb6df2f3369d3 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -604,6 +604,7 @@ my $no_threads=0;
 my $threads=0;
 my $no_shared=0; # but "no-shared" is default
 my $zlib=1;      # but "no-zlib" is default
+my $jpake=1;      # but "no-jpake" is default
 my $no_krb5=0;   # but "no-krb5" is implied unless "--with-krb5-..." is used
 my $no_rfc3779=1; # but "no-rfc3779" is default
 my $no_asm=0;
@@ -640,6 +641,7 @@ my $perl;
 
 my %disabled = ( # "what"         => "comment"
                 "gmp"            => "default",
+                 "experimental-jpake"          => "default",
                  "mdc2"           => "default",
                  "rc5"            => "default",
                 "rfc3779"        => "default",
@@ -920,6 +922,8 @@ foreach (sort (keys %disabled))
                { $no_threads = 1; }
        elsif (/^shared$/)
                { $no_shared = 1; }
+       elsif (/^experimental-jpake$/)
+               { $jpake = 0; push @skip, "jpake"}
        elsif (/^zlib$/)
                { $zlib = 0; }
        elsif (/^static-engine$/)
@@ -1161,6 +1165,11 @@ if ($threads)
        $openssl_thread_defines .= $thread_defines;
        }
 
+if ($jpake)
+       {
+       $openssl_other_defines = "#define OPENSSL_EXPERIMENTAL_JPAKE\n";
+       }
+
 if ($zlib)
        {
        $cflags = "-DZLIB $cflags";
@@ -1367,7 +1376,8 @@ while (<IN>)
        if ($sdirs) {
                my $dir;
                foreach $dir (@skip) {
-                       s/([    ])$dir /\1/;
+                       s/(\s)$dir /$1/;
+                       s/\s$dir$//;
                        }
                }
        $sdirs = 0 unless /\\$/;