no-ssl2 with no-ssl3 does not mean drop the ssl lib
authorTim Hudson <tjh@openssl.org>
Mon, 20 Oct 2014 05:12:17 +0000 (15:12 +1000)
committerTim Hudson <tjh@openssl.org>
Mon, 20 Oct 2014 05:25:13 +0000 (15:25 +1000)
Reviewed-by: Geoff Thorpe <geoff@openssl.org>
(cherry picked from commit c882abd52269a59ed8e0510e5febf667428ece85)

util/mk1mf.pl

index afe8c7326ddbc38025e192be9993212db3167a1c..ecba6a2b589e1ed6fb4d33e6b9f986b5bfffb0ec 100755 (executable)
@@ -634,12 +634,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);