generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ignore zlib related options in mk1mf.pl

Browse Source
This commit is contained in:
Dr. Stephen Henson
2005-04-20 16:27:57 +00:00
parent 76693ca0a3
commit 37ce8cffcc
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Configure
View File

@@ -1056,7 +1056,7 @@ else
} }
} }
$withargs{"krb5-lib"} .= " -lresolv" $withargs{"krb5-lib"} .= " -lresolv"
if ("$lresolv" ne ""); if ("$lresolv" ne "" && !$IsWindows);
$withargs{"krb5-include"} = "-I".$withargs{"krb5-dir"}."/include" $withargs{"krb5-include"} = "-I".$withargs{"krb5-dir"}."/include"
if $withargs{"krb5-include"} eq "" && if $withargs{"krb5-include"} eq "" &&
$withargs{"krb5-dir"} ne ""; $withargs{"krb5-dir"} ne "";

2
util/mk1mf.pl
View File

@@ -935,6 +935,8 @@ sub read_options
elsif (/^shlib$/) { $shlib=1; } elsif (/^shlib$/) { $shlib=1; }
elsif (/^dll$/) { $shlib=1; } elsif (/^dll$/) { $shlib=1; }
elsif (/^shared$/) { } # We just need to ignore it for now... elsif (/^shared$/) { } # We just need to ignore it for now...
elsif (/^zlib$/) { } # Ignore
elsif (/^zlib-dynamic$/){ } # Ignore
elsif (/^([^=]*)=(.*)$/){ $VARS{$1}=$2; } elsif (/^([^=]*)=(.*)$/){ $VARS{$1}=$2; }
elsif (/^-[lL].*$/) { $l_flags.="$_ "; } elsif (/^-[lL].*$/) { $l_flags.="$_ "; }
elsif ((!/^-help/) && (!/^-h/) && (!/^-\?/) && /^-.*$/) elsif ((!/^-help/) && (!/^-h/) && (!/^-\?/) && /^-.*$/)