From 95bffa1a1f4b2e00e2b004f643b9b27cffbfcbfb Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Tue, 6 Dec 2005 13:37:56 +0000
Subject: [PATCH] Fix from HEAD.

---
 Configure     | 8 ++++++--
 util/mk1mf.pl | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Configure b/Configure
index 6b4727cffa..d88fe9d288 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 bf4f89f48c..ba26f28fc6 100755
--- 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 "";}