From: Richard Levitte <levitte@openssl.org>
Date: Mon, 14 May 2018 03:01:54 +0000 (+0200)
Subject: When configuring 'no-comp', zlib support should be disabled too
X-Git-Tag: OpenSSL_1_0_2p~50
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fe4fe67139bc1e1abb62035d9eb0992f614bf645;p=oweals%2Fopenssl.git

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)
---

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";