Ignore zlib related options in mk1mf.pl

diff --git a/Configure b/Configure
index e3d9e428a8a38c27d0d8e88e439adc6e78d64e50..9407acceb56e29656cf061daaf3c499097d742cc 100755 (executable)
--- 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 957264c6b54b4588aea79fb95b7be152bb28155d..790eff97161bca8215c0256d466efc9e36fb8997 100755 (executable)
--- 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/) && (!/^-\?/) && /^-.*$/)