Merge commit '876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de'

* commit '876d441fbe37c3ffc57ada9ce1f9ea841ca4c9de':
  configure: don't enable tls protocols if network is disabled

Conflicts:
	configure

See: 7fc6545d5d7301196d1c23a45a24a9707bac0060
Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc configure
index a94c70f134c198c9e3537171cedd6d3d2c8a122b,2458adb6b82f59de6a80733f0e85cc8773f94021..529bc9a25e0269573c8dc2af19eaac757389ca61
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -2649,16 -2214,12 +2649,15 @@@ sctp_protocol_deps="struct_sctp_event_s
  sctp_protocol_select="network"
  srtp_protocol_select="rtp_protocol"
  tcp_protocol_select="network"
- tls_securetransport_protocol_deps="securetransport"
 -tls_gnutls_protocol_deps="gnutls"
 +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_gnutls_protocol"
++tls_openssl_protocol_deps="openssl !tls_securetransport_protocol !tls_gnutls_protocol"
  tls_openssl_protocol_select="tcp_protocol"
 -tls_protocol_deps_any="tls_gnutls_protocol tls_openssl_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"
  unix_protocol_select="network"