diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-12-07 15:03:40 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-12-09 14:56:12 +0100 |
| commit | 998c1ee10cd0436b6bf639a796d3614db42c369c (patch) | |
| tree | 8f45ff6299c5e5f394ecc68fa47e7622d671e765 | |
| parent | 5d471b73d20616f5ac701ff62e5de49465cda264 (diff) | |
| download | ffmpeg-998c1ee10cd0436b6bf639a796d3614db42c369c.tar.gz | |
configure: Have protocols select network code instead of depending on it
| -rwxr-xr-x | configure | 16 |
1 files changed, 7 insertions, 9 deletions
@@ -1705,10 +1705,8 @@ ffrtmpcrypt_protocol_deps_any="gcrypt nettle openssl" ffrtmpcrypt_protocol_select="tcp_protocol" ffrtmphttp_protocol_deps="!librtmp_protocol" ffrtmphttp_protocol_select="http_protocol" -gopher_protocol_deps="network" -httpproxy_protocol_deps="network" +gopher_protocol_select="network" httpproxy_protocol_select="tcp_protocol" -http_protocol_deps="network" http_protocol_select="tcp_protocol" https_protocol_select="tls_protocol" librtmp_protocol_deps="librtmp" @@ -1717,7 +1715,7 @@ librtmps_protocol_deps="librtmp" librtmpt_protocol_deps="librtmp" librtmpte_protocol_deps="librtmp" mmsh_protocol_select="http_protocol" -mmst_protocol_deps="network" +mmst_protocol_select="network" rtmp_protocol_deps="!librtmp_protocol" rtmp_protocol_select="tcp_protocol" rtmpe_protocol_select="ffrtmpcrypt_protocol" @@ -1727,11 +1725,12 @@ rtmpt_protocol_select="ffrtmphttp_protocol" rtmpte_protocol_select="ffrtmpcrypt_protocol ffrtmphttp_protocol" rtmpts_protocol_select="ffrtmphttp_protocol https_protocol" rtp_protocol_select="udp_protocol" -sctp_protocol_deps="network struct_sctp_event_subscribe" -tcp_protocol_deps="network" +sctp_protocol_deps="struct_sctp_event_subscribe" +sctp_protocol_select="network" +tcp_protocol_select="network" tls_protocol_deps_any="openssl gnutls" tls_protocol_select="tcp_protocol" -udp_protocol_deps="network" +udp_protocol_select="network" # filters blackframe_filter_deps="gpl" @@ -1810,7 +1809,6 @@ enable $LIBRARY_LIST $PROGRAM_LIST enable asm enable debug enable doc -enable network enable optimizations enable safe_bitstream_reader enable static @@ -3296,7 +3294,7 @@ elif check_func dlopen -ldl; then ldl=-ldl fi -if enabled network; then +if ! disabled network; then check_type "sys/types.h sys/socket.h" socklen_t check_type netdb.h "struct addrinfo" check_type netinet/in.h "struct group_source_req" -D_BSD_SOURCE |