From 505f74ca34ea59f18ec980d1fd9150d8e348d1e3 Mon Sep 17 00:00:00 2001
From: Matt Caswell <matt@openssl.org>
Date: Wed, 20 Apr 2016 11:24:49 +0100
Subject: Cascade no-dgram from no-sock in Configure not e_os.h

e_os.h was defining OPENSSL_NO_DGRAM if OPENSSL_NO_SOCK was defined.
This causes link problems on Windows because the generated .def files
still contain the DGRAM symbols even though they have not been compiled.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---
 Configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Configure')

diff --git a/Configure b/Configure
index a7b9ed564f..367ede3648 100755
--- a/Configure
+++ b/Configure
@@ -364,7 +364,7 @@ my @disable_cascades = (
     "ec"		=> [ "ecdsa", "ecdh" ],
 
     "dgram"		=> [ "dtls", "sctp" ],
-    "sock"		=> [ "sctp" ],
+    "sock"		=> [ "dgram" ],
     "dtls"		=> [ @dtls ],
 
     # SSL 3.0, (D)TLS 1.0 and TLS 1.1 require MD5 and SHA
-- 
cgit v1.2.3