summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2005-12-05 13:34:56 +0000
committerDr. Stephen Henson <steve@openssl.org>2005-12-05 13:34:56 +0000
commit7614f0e55e7e71f4089f1e15d76aa7dcce49599e (patch)
treeb882a150e284570300d0626bbd8bc33bd9154204 /Configure
parent0632284f79cca9343a14b50cf4c570e0aacc9b90 (diff)
Various zlib related fixes and enhancements.
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure6
1 files changed, 6 insertions, 0 deletions
diff --git a/Configure b/Configure
index 855ad1522d..6b4727cffa 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;
@@ -1302,6 +1306,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);