From 59e08fa503a0914b04a470ddad120da88ca2d514 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Tue, 17 Jan 2012 16:53:31 +0100
Subject: [PATCH] configure: Remove socket/winsock specific checks

Not necessary anymore.
---
 configure.ac              | 25 -------------------------
 gst/rtp/Makefile.am       |  9 +--------
 gst/rtp/gstasteriskh263.c | 10 ----------
 3 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/configure.ac b/configure.ac
index f836898..3cde72d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,11 +149,6 @@ AC_HEADER_STDC
 dnl used by ext/wavpack
 AX_CREATE_STDINT_H
 
-dnl used in gst/rtp/gstasteriskh263.c
-AC_CHECK_HEADERS([netinet/in.h])
-AC_CHECK_HEADERS([winsock2.h], HAVE_WINSOCK2_H=yes)
-AM_CONDITIONAL(HAVE_WINSOCK2_H, test "x$HAVE_WINSOCK2_H" = "xyes")
-
 dnl used in gst/udp
 AC_CHECK_HEADERS([sys/time.h])
 
@@ -382,25 +377,6 @@ AG_GST_CHECK_PLUGIN(wavenc)
 AG_GST_CHECK_PLUGIN(wavparse)
 AG_GST_CHECK_PLUGIN(y4m)
 
-dnl *** checks for socket and nsl libraries ***
-AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)])
-
-dnl disable gst plugins we might not be able to build on this
-dnl platform: udp and rtsp (ugly but minimally invasive)
-dnl FIXME: maybe move to sys
-AC_CHECK_HEADERS([sys/socket.h], HAVE_SYS_SOCKET_H=yes)
-AC_CHECK_HEADERS([winsock2.h], HAVE_WINSOCK2_H=yes)
-
-if test "x$HAVE_SYS_SOCKET_H" != "xyes" -a "x$HAVE_WINSOCK2_H" != "xyes"; then
-  AG_GST_DISABLE_PLUGIN(udp)
-  AG_GST_DISABLE_PLUGIN(rtsp)
-fi
-
-if test "x$HAVE_WINSOCK2_H" = "xyes"; then
-  WIN32_LIBS="-lws2_32"
-  AC_SUBST(WIN32_LIBS)
-fi
-
 dnl disable experimental plug-ins
 if test "x$BUILD_EXPERIMENTAL" != "xyes"; then
   AG_GST_DISABLE_PLUGIN(monoscope)
@@ -1215,7 +1191,6 @@ sed \
     -e 's/.* HAVE_SYS_STAT_H$/#define HAVE_SYS_STAT_H 1/' \
     -e 's/.* HAVE_SYS_TYPES_H$/#define HAVE_SYS_TYPES_H 1/' \
     -e 's/.* HAVE_WIN32$/#define HAVE_WIN32 1/' \
-    -e 's/.* HAVE_WINSOCK2_H$/#define HAVE_WINSOCK2_H 1/' \
     -e 's/.* HOST_CPU$/#define HOST_CPU "i686"/' \
     -e 's/.* LIBDIR$/#ifdef _DEBUG\n#  define LIBDIR PREFIX "\\\\debug\\\\lib"\n#else\n#  define LIBDIR PREFIX "\\\\lib"\n#endif/' \
     -e 's/.* LOCALEDIR$/#define LOCALEDIR PREFIX "\\\\share\\\\locale"/' \
diff --git a/gst/rtp/Makefile.am b/gst/rtp/Makefile.am
index bfdc5d8..c26ab6c 100644
--- a/gst/rtp/Makefile.am
+++ b/gst/rtp/Makefile.am
@@ -73,13 +73,6 @@ libgstrtp_la_SOURCES = \
 	gstrtpvrawdepay.c  \
 	gstrtpvrawpay.c 
 
-
-if HAVE_WINSOCK2_H
-WINSOCK2_LIBS = -lws2_32
-else
-WINSOCK2_LIBS =
-endif
-
 libgstrtp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstrtp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
 		-lgstaudio-@GST_MAJORMINOR@ \
@@ -88,7 +81,7 @@ libgstrtp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
                 -lgstrtp-@GST_MAJORMINOR@ \
                 -lgstpbutils-@GST_MAJORMINOR@ \
 		$(GST_BASE_LIBS) $(GST_LIBS) \
-		$(WINSOCK2_LIBS) $(LIBM)
+		$(LIBM)
 libgstrtp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) 
 libgstrtp_la_LIBTOOLFLAGS = --tag=disable-static
 
diff --git a/gst/rtp/gstasteriskh263.c b/gst/rtp/gstasteriskh263.c
index 1ef184b..2151173 100644
--- a/gst/rtp/gstasteriskh263.c
+++ b/gst/rtp/gstasteriskh263.c
@@ -26,16 +26,6 @@
 #include <gst/rtp/gstrtpbuffer.h>
 #include "gstasteriskh263.h"
 
-/* Cygwin has both netinet/in.h and winsock2.h, but
- * only one can be included, so prefer the unix one */
-#ifdef HAVE_NETINET_IN_H
-#  include <netinet/in.h>
-#else
-#ifdef HAVE_WINSOCK2_H
-#  include <winsock2.h>
-#endif
-#endif
-
 #define GST_ASTERISKH263_HEADER_LEN 6
 
 typedef struct _GstAsteriskH263Header
-- 
2.7.4