[FFmpeg-cvslog] configure: fix sctp check.

Michael Niedermayer git at videolan.org
Thu Sep 13 06:17:07 CEST 2012


ffmpeg | branch: release/0.11 | Michael Niedermayer <michaelni at gmx.at> | Wed Aug  8 16:01:01 2012 +0200| [ae8491ce33cfe5a9e33764579c9e55e785107e98] | committer: Michael Niedermayer

configure: fix sctp check.

This fixes build failures on debian/kfreebsd

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit bed63a5e98b1ba1f3bca6c81ea819666c2d81fde)

Conflicts:

	configure

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae8491ce33cfe5a9e33764579c9e55e785107e98
---

 configure |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 4e1a611..0b6e0ac 100755
--- a/configure
+++ b/configure
@@ -1217,7 +1217,6 @@ HAVE_LIST="
     memalign
     mkstemp
     mmap
-    netinet_sctp_h
     PeekNamedPipe
     poll_h
     posix_memalign
@@ -1237,6 +1236,7 @@ HAVE_LIST="
     struct_addrinfo
     struct_ipv6_mreq
     struct_rusage_ru_maxrss
+    struct_sctp_event_subscribe
     struct_sockaddr_in6
     struct_sockaddr_sa_len
     struct_sockaddr_storage
@@ -1665,7 +1665,7 @@ mmst_protocol_deps="network"
 rtmp_protocol_deps="!librtmp_protocol"
 rtmp_protocol_select="tcp_protocol"
 rtp_protocol_select="udp_protocol"
-sctp_protocol_deps="network netinet_sctp_h"
+sctp_protocol_deps="network struct_sctp_event_subscribe"
 tcp_protocol_deps="network"
 tls_protocol_deps_any="openssl gnutls"
 tls_protocol_select="tcp_protocol"
@@ -3070,7 +3070,7 @@ if enabled network; then
     check_type netinet/in.h "struct sockaddr_in6"
     check_type "sys/types.h sys/socket.h" "struct sockaddr_storage"
     check_struct "sys/types.h sys/socket.h" "struct sockaddr" sa_len
-    check_header netinet/sctp.h
+    check_type netinet/sctp.h "struct sctp_event_subscribe"
     # Prefer arpa/inet.h over winsock2
     if check_header arpa/inet.h ; then
         check_func closesocket



More information about the ffmpeg-cvslog mailing list