From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Wed, 29 May 2013 00:43:47 +0000 (-0700)
Subject: Add configure checks for sys/socket.h
X-Git-Tag: upstream/1.9.6^2~201
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=7057e733c1465661c410b65d90e4c5d0939f1617;p=deb_libnfs.git

Add configure checks for sys/socket.h
---

diff --git a/configure.ac b/configure.ac
index d76896a..1b4b66b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,6 +101,10 @@ AC_CHECK_HEADERS([sys/vfs.h])
 dnl Check for sys/statvfs.h
 AC_CHECK_HEADERS([sys/statvfs.h])
 
+# check for sys/socket.h
+dnl Check for sys/socket.h
+AC_CHECK_HEADERS([sys/socket.h])
+
 # check for netinet/in.h
 dnl Check for netinet/in.h
 AC_CHECK_HEADERS([netinet/in.h])
diff --git a/examples/nfsclient-bcast.c b/examples/nfsclient-bcast.c
index 9f7076b..ae08f16 100644
--- a/examples/nfsclient-bcast.c
+++ b/examples/nfsclient-bcast.c
@@ -37,7 +37,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/socket.h>
 #include <sys/time.h>
 #include <net/if.h>
 #include <netdb.h>
@@ -46,6 +45,10 @@
 #include <sys/ioctl.h>
 #endif
 
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
 #include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
diff --git a/lib/libnfs-sync.c b/lib/libnfs-sync.c
index c145d8f..836e135 100644
--- a/lib/libnfs-sync.c
+++ b/lib/libnfs-sync.c
@@ -30,7 +30,6 @@
 #else
 #include <strings.h>
 #include <netdb.h>
-#include <sys/socket.h>
 #include <net/if.h>
 #endif /*WIN32*/
 
@@ -50,6 +49,10 @@
 #include <sys/ioctl.h>
 #endif
 
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
 #ifdef HAVE_POLL_H
 #include <poll.h>
 #endif
diff --git a/lib/pdu.c b/lib/pdu.c
index 8311d88..d25c448 100644
--- a/lib/pdu.c
+++ b/lib/pdu.c
@@ -26,13 +26,16 @@
 #include "win32_compat.h"
 #else
 #include <strings.h>
-#include <sys/socket.h>
 #endif/*WIN32*/
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
 
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/socket.c b/lib/socket.c
index 699ed8a..6538535 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -26,7 +26,6 @@
 #include "win32_compat.h"
 #else
 #include <arpa/inet.h>
-#include <sys/socket.h>
 #include <netdb.h>
 #endif/*WIN32*/
 
@@ -42,6 +41,10 @@
 #include <sys/ioctl.h>
 #endif
 
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>