From 486d76b4544ee9d2c4cf6ab5730f0f12c422a6d0 Mon Sep 17 00:00:00 2001
From: Brian Cameron <brian.cameron@sun.com>
Date: Fri, 23 Jan 2009 10:11:52 +0100
Subject: [PATCH] Fix build on Solaris. Fixes bug #568480.

Fix linking on Solaris by checking for the nsl and socket
libraries which are needed for socket() and gethostbyname().

Don't initialize some fields of struct mh to NULL/0, they're
already set to NULL/0 by a memset(). Also this fields don't
exist on Solaris.
---
 configure.ac       | 4 ++++
 gst/dccp/gstdccp.c | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index e31a119f1a..167953bfdc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -157,6 +157,10 @@ dnl *** checks for library functions ***
 
 dnl *** checks for dependency libraries ***
 
+dnl *** checks for socket and nsl libraries ***
+AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)])
+AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
+
 dnl GLib is required
 AG_GST_GLIB_CHECK([2.6])
 
diff --git a/gst/dccp/gstdccp.c b/gst/dccp/gstdccp.c
index f10eadb2df..cf67beca95 100644
--- a/gst/dccp/gstdccp.c
+++ b/gst/dccp/gstdccp.c
@@ -141,8 +141,6 @@ gst_dccp_read_buffer (GstElement * this, int socket, GstBuffer ** buf)
   iov.iov_len = readsize;
   mh.msg_iov = &iov;
   mh.msg_iovlen = 1;
-  mh.msg_control = NULL;
-  mh.msg_controllen = 0;
 
   bytes_read = recvmsg (socket, &mh, 0);
 
@@ -324,8 +322,6 @@ gst_dccp_socket_write (GstElement * element, int socket, const void *buf,
       iov.iov_len = MIN (packet_size, size - bytes_written);
       mh.msg_iov = &iov;
       mh.msg_iovlen = 1;
-      mh.msg_control = NULL;
-      mh.msg_controllen = 0;
 
       wrote = sendmsg (socket, &mh, 0);
     } while (wrote == -1 && errno == EAGAIN);