summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xConfigure8
-rwxr-xr-xutil/mk1mf.pl2
2 files changed, 7 insertions, 3 deletions
diff --git a/Configure b/Configure
index 561218717c..8aa7ee1c73 100755
--- 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 606e9209cc..7f901ee934 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -292,7 +292,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 "";}