From: Dr. Stephen Henson <steve@openssl.org>
Date: Tue, 6 Dec 2005 13:36:59 +0000 (+0000)
Subject: Don't include zlib header dir if it is not defined.
X-Git-Tag: OpenSSL_0_9_8k^2~1661
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1291dfdeaddf67e5b9f470147790495cc9c35efc;p=oweals%2Fopenssl.git

Don't include zlib header dir if it is not defined.
---

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 "";}