summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2005-12-05 13:46:46 +0000
committerDr. Stephen Henson <steve@openssl.org>2005-12-05 13:46:46 +0000
commitad2695b1b753caa53d9127a6e869ed3692b08fee (patch)
treeb6d5ba532637c694b1db380216158ecfba49bce5 /Configure
parent9cbf062a705de395b4d0e6c5783a239b8f743f15 (diff)
Update from 0.9.8-stable.
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure6
1 files changed, 6 insertions, 0 deletions
diff --git a/Configure b/Configure
index bfff183e5c..561218717c 100755
--- a/Configure
+++ b/Configure
@@ -748,6 +748,10 @@ PROCESS_ARGS:
{
$withargs{"krb5-".$1}=$2;
}
+ elsif (/^--with-zlib-(lib|include)=(.*)$/)
+ {
+ $withargs{"zlib-".$1}=$2;
+ }
else
{
print STDERR $usage;
@@ -1304,6 +1308,8 @@ while (<IN>)
s/^PERL=.*/PERL= $perl/;
s/^KRB5_INCLUDES=.*/KRB5_INCLUDES=$withargs{"krb5-include"}/;
s/^LIBKRB5=.*/LIBKRB5=$withargs{"krb5-lib"}/;
+ s/^LIBZLIB=.*/LIBZLIB=$withargs{"zlib-lib"}/;
+ s/^ZLIB_INCLUDE=.*/ZLIB_INCLUDE=$withargs{"zlib-include"}/;
s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/;
s/^SHLIB_MARK=.*/SHLIB_MARK=$shared_mark/;
s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_CRYPTO) \$(SHARED_SSL)/ if (!$no_shared);