diff options
Diffstat (limited to 'util/mk1mf.pl')
| -rwxr-xr-x | util/mk1mf.pl | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 18ef2f5708..cc65f25d4f 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -64,7 +64,6 @@ and [options] can be one of no-asm - No x86 asm no-krb5 - No KRB5 no-ec - No EC - no-ecdsa - No ECDSA nasm - Use NASM for x86 asm gaswin - Use GNU as with Mingw32 no-socks - No socket code @@ -233,7 +232,6 @@ $cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3; $cflags.=" -DOPENSSL_NO_ERR" if $no_err; $cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5; $cflags.=" -DOPENSSL_NO_EC" if $no_ec; -$cflags.=" -DOPENSSL_NO_ECDSA" if $no_ecdsa; #$cflags.=" -DRSAref" if $rsaref ne ""; ## if ($unix) @@ -293,7 +291,6 @@ SRC_D=$src_dir LINK=$link LFLAGS=$lflags -RSC=$rsc BN_ASM_OBJ=$bn_asm_obj BN_ASM_SRC=$bn_asm_src @@ -606,18 +603,6 @@ foreach (values %lib_nam) $rules.=&do_compile_rule("\$(OBJ_D)",$lib_obj{$_},$lib); } -# hack to add version info on MSVC -if (($platform eq "VC-WIN32") || ($platform eq "VC-NT")) { - $rules.= <<"EOF"; -\$(OBJ_D)\\\$(CRYPTO).res: ms\\version32.rc - \$(RSC) /fo"\$(OBJ_D)\\\$(CRYPTO).res" /d CRYPTO ms\\version32.rc - -\$(OBJ_D)\\\$(SSL).res: ms\\version32.rc - \$(RSC) /fo"\$(OBJ_D)\\\$(SSL).res" /d SSL ms\\version32.rc - -EOF -} - $defs.=&do_defs("T_EXE",$test,"\$(TEST_D)",$exep); foreach (split(/\s+/,$test)) { @@ -773,14 +758,6 @@ sub do_defs $Vars{$var}.="$t "; $ret.=$t; } - # hack to add version info on MSVC - if ($shlib && ($platform eq "VC-WIN32") || ($platform eq "VC-NT")) - { - if ($var eq "CRYPTOOBJ") - { $ret.="\$(OBJ_D)\\\$(CRYPTO).res "; } - elsif ($var eq "SSLOBJ") - { $ret.="\$(OBJ_D)\\\$(SSL).res "; } - } chop($ret); $ret.="\n\n"; return($ret); @@ -913,7 +890,6 @@ sub read_options elsif (/^no-sock$/) { $no_sock=1; } elsif (/^no-krb5$/) { $no_krb5=1; } elsif (/^no-ec$/) { $no_ec=1; } - elsif (/^no-ecdsa$/) { $no_ecdsa=1; } elsif (/^just-ssl$/) { $no_rc2=$no_idea=$no_des=$no_bf=$no_cast=1; $no_md2=$no_sha=$no_mdc2=$no_dsa=$no_dh=1; |