summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-05-14 05:01:54 +0200
committerRichard Levitte <levitte@openssl.org>2018-05-14 14:53:11 +0200
commitfe4fe67139bc1e1abb62035d9eb0992f614bf645 (patch)
tree8d6ff952592f1d11f2b1e8a73ff84aa1eecaac39 /Configure
parent4080f4d2fefbb7186171eb620d565e91f56be5b3 (diff)
When configuring 'no-comp', zlib support should be disabled too
Fixes #6241 Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/6248)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure1
1 files changed, 1 insertions, 0 deletions
diff --git a/Configure b/Configure
index 9c1879eaf9..c7066dc97c 100755
--- a/Configure
+++ b/Configure
@@ -1173,6 +1173,7 @@ foreach (sort (keys %disabled))
$depflags .= " -DOPENSSL_NO_$ALGO";
}
}
+ if (/^comp$/) { $zlib = 0; }
}
print "\n";