diff options
author | jkim <jkim@FreeBSD.org> | 2015-01-09 00:58:20 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2015-01-09 00:58:20 +0000 |
commit | 27e2f26e1531b869ff531fab5ac3ef06aae4d4f4 (patch) | |
tree | 11138272980644b3ccdbfe7c0ebead1536be5efb /crypto/openssl/util/mk1mf.pl | |
parent | 3e6f1de34088867465b6a1a87fb10c25fc811e50 (diff) | |
download | FreeBSD-src-27e2f26e1531b869ff531fab5ac3ef06aae4d4f4.zip FreeBSD-src-27e2f26e1531b869ff531fab5ac3ef06aae4d4f4.tar.gz |
MFC: r276861, r276863
Merge OpenSSL 1.0.1k.
Diffstat (limited to 'crypto/openssl/util/mk1mf.pl')
-rwxr-xr-x | crypto/openssl/util/mk1mf.pl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crypto/openssl/util/mk1mf.pl b/crypto/openssl/util/mk1mf.pl index f0c2df0..d3f5424 100755 --- a/crypto/openssl/util/mk1mf.pl +++ b/crypto/openssl/util/mk1mf.pl @@ -671,12 +671,6 @@ foreach (values %lib_nam) $lib_obj=$lib_obj{$_}; local($slib)=$shlib; - if (($_ eq "SSL") && $no_ssl2 && $no_ssl3) - { - $rules.="\$(O_SSL):\n\n"; - next; - } - $defs.=&do_defs(${_}."OBJ",$lib_obj,"\$(OBJ_D)",$obj); $lib=($slib)?" \$(SHLIB_CFLAGS)".$shlib_ex_cflags{$_}:" \$(LIB_CFLAGS)"; $rules.=&do_compile_rule("\$(OBJ_D)",$lib_obj{$_},$lib); @@ -1077,12 +1071,17 @@ sub do_copy_rule return($ret); } +# Options picked up from the OPTIONS line in the top level Makefile +# generated by Configure. + sub read_options { # Many options are handled in a similar way. In particular # no-xxx sets zero or more scalars to 1. - # Process these using a hash containing the option name and - # reference to the scalars to set. + # Process these using the %valid_options hash containing the option + # name and reference to the scalars to set. In some cases the option + # needs no special handling and can be ignored: this is done by + # setting the value to 0. my %valid_options = ( "no-rc2" => \$no_rc2, @@ -1116,6 +1115,7 @@ sub read_options "gaswin" => \$gaswin, "no-ssl2" => \$no_ssl2, "no-ssl3" => \$no_ssl3, + "no-ssl3-method" => 0, "no-tlsext" => \$no_tlsext, "no-srp" => \$no_srp, "no-cms" => \$no_cms, |