diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2005-12-06 13:36:59 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2005-12-06 13:36:59 +0000 |
commit | 1291dfdeaddf67e5b9f470147790495cc9c35efc (patch) | |
tree | 832e23689cd9948f0c82dc2b75877268e84d20ca | |
parent | df278aff3e2d3258035a05d9952a0f332628b5b0 (diff) |
Don't include zlib header dir if it is not defined.
-rwxr-xr-x | Configure | 8 | ||||
-rwxr-xr-x | util/mk1mf.pl | 2 |
2 files changed, 7 insertions, 3 deletions
@@ -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 "";} |