avoid duplicate entries in add_cert_dir()

[oweals/openssl.git] / Configure

diff --git a/Configure b/Configure
index c1a5e95dae3b61b0b265484d27d125831fb59ec9..820be609c96d99aebd2ae33f1da4de4fc993a9f7 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -568,7 +568,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;
@@ -616,7 +616,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_CAMELLIA -DOPENSSL_NO_GMP -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 ";
+my $default_depflags = "-DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_GMP -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 ";
 
 
 my $no_sse2=0;
@@ -885,8 +885,6 @@ foreach (sort (keys %disabled))
                { $symlink = 0; }
        elsif (/^sse2$/)
                { $no_sse2 = 1; }
-       elsif (/^rfc3779$/)
-               { $rfc3779 = 0; }
        else
                {
                my ($ALGO, $algo);
@@ -1124,11 +1122,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 "")