From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 20 Apr 2005 16:27:57 +0000 (+0000)
Subject: Ignore zlib related options in mk1mf.pl
X-Git-Tag: BEN_FIPS_TEST_8~71
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=37ce8cffcc7075f1190724429b72cccecf3a81df;p=oweals%2Fopenssl.git

Ignore zlib related options in mk1mf.pl
---

diff --git a/Configure b/Configure
index e3d9e428a8..9407acceb5 100755
--- a/Configure
+++ b/Configure
@@ -1056,7 +1056,7 @@ else
 			}
 		}
 	$withargs{"krb5-lib"} .= " -lresolv"
-		if ("$lresolv" ne "");
+		if ("$lresolv" ne "" && !$IsWindows);
 	$withargs{"krb5-include"} = "-I".$withargs{"krb5-dir"}."/include"
 		if $withargs{"krb5-include"} eq "" &&
 		   $withargs{"krb5-dir"} ne "";
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 957264c6b5..790eff9716 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -935,6 +935,8 @@ sub read_options
 	elsif (/^shlib$/)	{ $shlib=1; }
 	elsif (/^dll$/)		{ $shlib=1; }
 	elsif (/^shared$/)	{ } # We just need to ignore it for now...
+	elsif (/^zlib$/)	{ } # Ignore
+	elsif (/^zlib-dynamic$/){ } # Ignore
 	elsif (/^([^=]*)=(.*)$/){ $VARS{$1}=$2; }
 	elsif (/^-[lL].*$/)	{ $l_flags.="$_ "; }
 	elsif ((!/^-help/) && (!/^-h/) && (!/^-\?/) && /^-.*$/)