Fix from HEAD.

diff --git a/Configure b/Configure
index 6b4727cffaa9889f5a25ac500f6313a236713271..d88fe9d288a57f43a3c11209000a8e7e8750e04a 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -748,9 +748,13 @@ PROCESS_ARGS:
                                {
                                $withargs{"krb5-".$1}=$2;
                                }
-                       elsif (/^--with-zlib-(lib|include)=(.*)$/)
+                       elsif (/^--with-zlib-lib=(.*)$/)
                                {
-                               $withargs{"zlib-".$1}=$2;
+                               $withargs{"zlib-lib"}=$1;
+                               }
+                       elsif (/^--with-zlib-include=(.*)$/)
+                               {
+                               $withargs{"zlib-include"}="-I$1";
                                }
                        else
                                {

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index bf4f89f48c3da0b511a8ceb8814db9c38ca3ffe5..ba26f28fc63f409f300d81da4c7eee606e6395c3 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -291,7 +291,7 @@ for (;;)
                { $cflags .= " $val";}
 
        if ($key eq "ZLIB_INCLUDE")
-               { $cflags .= " -I$val";}
+               { $cflags .= " $val" if $val ne "";}
 
        if ($key eq "LIBZLIB")
                { $zlib_lib = "$val" if $val ne "";}