Don't include zlib header dir if it is not defined.
authorDr. Stephen Henson <steve@openssl.org>
Tue, 6 Dec 2005 13:36:59 +0000 (13:36 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Tue, 6 Dec 2005 13:36:59 +0000 (13:36 +0000)
Configure
util/mk1mf.pl

index 5612187..8aa7ee1 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
                                {
index 606e920..7f901ee 100755 (executable)
@@ -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 "";}