Merge commit '876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de'

* commit '876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de': configure: don't enable tls protocols if network is disabled Conflicts: configure See: 7fc6545d5d Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 21e40f006a
parent 12a83bc0aa 876d441fbe
commit 21e40f006a
1 changed files with 2 additions and 3 deletions
--- a/5
+++ b/5
@ -2649,14 +2649,13 @@ sctp_protocol_deps="struct_sctp_event_subscribe"
 sctp_protocol_select="network"
 srtp_protocol_select="rtp_protocol"
 tcp_protocol_select="network"
-tls_securetransport_protocol_deps="securetransport"
 tls_gnutls_protocol_deps="gnutls !tls_securetransport_protocol"
-tls_openssl_protocol_deps="openssl !tls_securetransport_protocol !tls_gnutls_protocol"
 tls_gnutls_protocol_select="tcp_protocol"
+tls_openssl_protocol_deps="openssl !tls_securetransport_protocol !tls_gnutls_protocol"
 tls_openssl_protocol_select="tcp_protocol"
+tls_securetransport_protocol_deps="securetransport"
 tls_securetransport_protocol_select="tcp_protocol"
 tls_protocol_deps_any="tls_securetransport_protocol tls_gnutls_protocol tls_openssl_protocol"
-tls_protocol_select="tcp_protocol"
 udp_protocol_select="network"
 udplite_protocol_select="network"
 unix_protocol_deps="sys_un_h"