From 75dba03688115c26c8c8e195fc6b8f2d61828ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Wed, 26 Sep 2012 08:20:49 +0400 Subject: [PATCH] curl: fix build on win32 https://bugzilla.gnome.org/show_bug.cgi?id=684847 --- configure.ac | 5 +++-- ext/curl/Makefile.am | 1 + ext/curl/gstcurlbasesink.c | 8 ++++++++ ext/curl/gstcurlfilesink.c | 8 ++++++++ ext/curl/gstcurlftpsink.c | 8 ++++++++ ext/curl/gstcurlhttpsink.c | 8 ++++++++ ext/curl/gstcurlsmtpsink.c | 10 ++++++++++ ext/curl/gstcurltlssink.c | 8 ++++++++ 8 files changed, 54 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 8291016475..562e915dbf 100644 --- a/configure.ac +++ b/configure.ac @@ -851,8 +851,9 @@ translit(dnm, m, l) AM_CONDITIONAL(USE_CURL, true) AG_GST_CHECK_FEATURE(CURL, [Curl plugin], curl, [ PKG_CHECK_MODULES(CURL, libcurl >= 7.21.0, [ HAVE_CURL="yes" - AC_CHECK_HEADERS([unistd.h sys/socket.h sys/types.h netinet/in.h netinet/ip.h netinet/tcp.h fcntl.h], - [ ], [HAVE_CURL="no"]) + AC_CHECK_HEADERS([unistd.h sys/socket.h sys/types.h netinet/in.h netinet/ip.h netinet/tcp.h fcntl.h], [ ], [ + AC_CHECK_HEADERS([unistd.h sys/types.h winsock2.h ws2tcpip.h fcntl.h], [ ], [HAVE_CURL="no"]) + ]) AC_MSG_CHECKING([for socket support needed by curlsink]) AC_MSG_RESULT($HAVE_CURL) ], [ diff --git a/ext/curl/Makefile.am b/ext/curl/Makefile.am index 5d916b0fbb..3a52072251 100644 --- a/ext/curl/Makefile.am +++ b/ext/curl/Makefile.am @@ -16,6 +16,7 @@ libgstcurl_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ + $(WINSOCK2_LIBS) \ $(CURL_LIBS) libgstcurl_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstcurl_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/ext/curl/gstcurlbasesink.c b/ext/curl/gstcurlbasesink.c index 9f9ddeac66..8cbb104314 100644 --- a/ext/curl/gstcurlbasesink.c +++ b/ext/curl/gstcurlbasesink.c @@ -46,12 +46,20 @@ #include #include +#if HAVE_SYS_SOCKET_H #include +#endif #include +#if HAVE_NETINET_IN_H #include +#endif #include +#if HAVE_NETINET_IP_H #include +#endif +#if HAVE_NETINET_TCP_H #include +#endif #include #include diff --git a/ext/curl/gstcurlfilesink.c b/ext/curl/gstcurlfilesink.c index a1c661de7d..c8b7e2b5f0 100644 --- a/ext/curl/gstcurlfilesink.c +++ b/ext/curl/gstcurlfilesink.c @@ -43,12 +43,20 @@ #include #include +#if HAVE_SYS_SOCKET_H #include +#endif #include +#if HAVE_NETINET_IN_H #include +#endif #include +#if HAVE_NETINET_IP_H #include +#endif +#if HAVE_NETINET_TCP_H #include +#endif #include #include diff --git a/ext/curl/gstcurlftpsink.c b/ext/curl/gstcurlftpsink.c index 143539300a..58a057ffcf 100644 --- a/ext/curl/gstcurlftpsink.c +++ b/ext/curl/gstcurlftpsink.c @@ -43,12 +43,20 @@ #include #include +#if HAVE_SYS_SOCKET_H #include +#endif #include +#if HAVE_NETINET_IN_H #include +#endif #include +#if HAVE_NETINET_IP_H #include +#endif +#if HAVE_NETINET_TCP_H #include +#endif #include #include diff --git a/ext/curl/gstcurlhttpsink.c b/ext/curl/gstcurlhttpsink.c index 503803ef71..da35a10146 100644 --- a/ext/curl/gstcurlhttpsink.c +++ b/ext/curl/gstcurlhttpsink.c @@ -46,12 +46,20 @@ #include #include +#if HAVE_SYS_SOCKET_H #include +#endif #include +#if HAVE_NETINET_IN_H #include +#endif #include +#if HAVE_NETINET_IP_H #include +#endif +#if HAVE_NETINET_TCP_H #include +#endif #include #include diff --git a/ext/curl/gstcurlsmtpsink.c b/ext/curl/gstcurlsmtpsink.c index 28c581076d..4948ddbb2c 100644 --- a/ext/curl/gstcurlsmtpsink.c +++ b/ext/curl/gstcurlsmtpsink.c @@ -49,14 +49,24 @@ #include #include +#if HAVE_SYS_SOCKET_H #include +#endif #include #include +#if HAVE_PWD_H #include +#endif +#if HAVE_NETINET_IN_H #include +#endif #include +#if HAVE_NETINET_IP_H #include +#endif +#if HAVE_NETINET_TCP_H #include +#endif #include #include diff --git a/ext/curl/gstcurltlssink.c b/ext/curl/gstcurltlssink.c index 19b175b029..d96c33e1fa 100644 --- a/ext/curl/gstcurltlssink.c +++ b/ext/curl/gstcurltlssink.c @@ -34,12 +34,20 @@ #include #include +#if HAVE_SYS_SOCKET_H #include +#endif #include +#if HAVE_NETINET_IN_H #include +#endif #include +#if HAVE_NETINET_IP_H #include +#endif +#if HAVE_NETINET_TCP_H #include +#endif #include #include