From 59385bde709e93f31244c0b8119c204a03eec1c4 Mon Sep 17 00:00:00 2001
From: Tim-Philipp Müller <tim@centricular.net>
Date: Thu, 23 Feb 2006 20:08:58 +0000
Subject: ext/cdio/Makefile.am: Add GST_BASE_CFLAGS and GST_BASE_LIBS (seems to
 be required for Cygwin, see #317048)

Original commit message from CVS:
* ext/cdio/Makefile.am:
Add GST_BASE_CFLAGS and GST_BASE_LIBS (seems to be
required for Cygwin, see #317048)
* gst/rtp/gstasteriskh263.c:
Cygwin has includes for both the unix network socket API
and the windows API, but only one can be included, so fix
includes to only use one or the other, prefering the unxi
one (#317048).
---
 ChangeLog                 | 12 ++++++++++++
 ext/cdio/Makefile.am      |  2 ++
 gst/rtp/gstasteriskh263.c |  6 ++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 50102686..1d48516b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-02-23  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* ext/cdio/Makefile.am:
+	  Add GST_BASE_CFLAGS and GST_BASE_LIBS (seems to be
+	  required for Cygwin, see #317048)
+
+	* gst/rtp/gstasteriskh263.c:
+	  Cygwin has includes for both the unix network socket API
+	  and the windows API, but only one can be included, so fix
+	  includes to only use one or the other, prefering the unxi
+	  one (#317048).
+
 2006-02-23  Philippe Kalaf  <philippe.kalaf at collabora.co.uk>
 
 	* rtp/gst/gstrtppcmadepay.c:
diff --git a/ext/cdio/Makefile.am b/ext/cdio/Makefile.am
index a1c80e6c..ba454d65 100644
--- a/ext/cdio/Makefile.am
+++ b/ext/cdio/Makefile.am
@@ -8,10 +8,12 @@ libgstcdio_la_SOURCES = \
 libgstcdio_la_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(CDIO_CFLAGS) \
+	$(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS)
 
 libgstcdio_la_LIBADD = \
 	$(GST_PLUGINS_BASE_LIBS) -lgstcdda-@GST_MAJORMINOR@ \
+	$(GST_BASE_LIBS) \
 	$(CDIO_LIBS)
 
 libgstcdio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) 
diff --git a/gst/rtp/gstasteriskh263.c b/gst/rtp/gstasteriskh263.c
index 9597261c..df93cfe4 100644
--- a/gst/rtp/gstasteriskh263.c
+++ b/gst/rtp/gstasteriskh263.c
@@ -21,13 +21,15 @@
 #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>
-#endif
-
+#else
 #ifdef HAVE_WINSOCK2_H
 #  include <winsock2.h>
 #endif
+#endif
 
 #define GST_ASTERISKH263_HEADER_LEN 6
 
-- 
cgit