From 813bd94a6924376089b934fb885c99db0db6c61a Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Wed, 14 Sep 2011 13:50:03 -0400
Subject: [PATCH] Fixes for solaris headers that need <sys/types.h> and
 <sys/socket.h> first

---
 configure.in | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index fba6ad69..e32f58aa 100644
--- a/configure.in
+++ b/configure.in
@@ -450,13 +450,10 @@ AC_CHECK_HEADERS(			\
 	linux/socket.h			\
 	machine/endian.h		\
 	net/errno.h			\
-	net/if.h			\
 	net/if_var.h			\
-	net/route.h			\
 	netinet/in.h			\
 	nfs/export.h			\
 	nfs/mount.h			\
-	nfs/nfs_clnt.h			\
 	nfs/nfs_gfs.h			\
 	nfs/nfs_mount.h			\
 	nfs/nfsmount.h			\
@@ -572,6 +569,21 @@ dnl	dirent.h			\
 	varargs.h			\
 	unistd.h			\
 	)
+dnl headers that likely have dependencies
+AC_CHECK_HEADERS([			\
+	net/if.h			\
+	net/route.h			\
+	nfs/nfs_clnt.h			\
+], [], [],
+[
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif /* HAVE_SYS_TYPES_H */
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif /* HAVE_SYS_SOCKET_H */
+])
+
 dnl optional headers
 if test "$with_ldap" = "yes"; then
 AC_CHECK_HEADERS(			\
@@ -603,6 +615,9 @@ AC_CHECK_HEADERS([			\
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif /* HAVE_SYS_TYPES_H */
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif /* HAVE_SYS_SOCKET_H */
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif /* HAVE_SYS_PARAM_H */
-- 
2.43.0