Win32 fixes from stable branch.

1 files changed, 2 insertions, 9 deletions

diff --git a/Configure b/Configure
index 6eb7f96e6c..b5f9de05a7 100755
--- a/Configure
+++ b/Configure
@@ -579,7 +579,7 @@ my $threads=0;
 my $no_shared=0; # but "no-shared" is default
 my $zlib=1;      # but "no-zlib" is default
 my $no_krb5=0;   # but "no-krb5" is implied unless "--with-krb5-..." is used
-my $rfc3779=1;	 # but "no-rfc3779" is default
+my $no_rfc3779=1; # but "no-rfc3779" is default
 my $no_asm=0;
 my $no_dso=0;
 my $no_gmp=0;
@@ -626,7 +626,7 @@ my %disabled = ( # "what"         => "comment"
 # For symmetry, "disable-..." is a synonym for "no-...".
 
 # This is what $depflags will look like with the above default:
-my $default_depflags = "-DOPENSSL_NO_GMP -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 ";
+my $default_depflags = "-DOPENSSL_NO_GMP -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779";
 
 
 my $no_sse2=0;
@@ -903,8 +903,6 @@ foreach (sort (keys %disabled))
 		{ $symlink = 0; }
 	elsif (/^sse2$/)
 		{ $no_sse2 = 1; }
-	elsif (/^rfc3779$/)
-		{ $rfc3779 = 0; }
 	else
 		{
 		my ($ALGO, $algo);
@@ -1141,11 +1139,6 @@ if ($zlib)
 		}
 	}
 
-if ($rfc3779)
-	{
-	$openssl_other_defines.="#define OPENSSL_RFC3779\n";
-	}
-
 # You will find shlib_mark1 and shlib_mark2 explained in Makefile.org
 my $shared_mark = "";
 if ($shared_target eq "")