svn commit: lorikeet r595 - in trunk/heimdal/cf: .

[lha at samba.org]

Author: lha
Date: 2006-10-19 05:22:07 +0000 (Thu, 19 Oct 2006)
New Revision: 595

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=595

Log:
merge from heimdal cvs - Include sys/types.h for sys/socket.h and netdb.h.
Modified:
   trunk/heimdal/cf/roken-frag.m4


Changeset:
Modified: trunk/heimdal/cf/roken-frag.m4
===================================================================
--- trunk/heimdal/cf/roken-frag.m4	2006-10-19 05:01:27 UTC (rev 594)
+++ trunk/heimdal/cf/roken-frag.m4	2006-10-19 05:22:07 UTC (rev 595)
@@ -1,4 +1,4 @@
-dnl $Id: roken-frag.m4,v 1.61 2006/09/16 17:31:39 lha Exp $
+dnl $Id: roken-frag.m4,v 1.62 2006/10/19 05:20:41 lha Exp $
 dnl
 dnl some code to get roken working
 dnl
@@ -55,7 +55,6 @@
 	fnmatch.h				\
 	grp.h					\
 	ifaddrs.h				\
-	netdb.h					\
 	netinet/in.h				\
 	netinet/in6.h				\
 	netinet/in_systm.h			\
@@ -71,7 +70,6 @@
 	sys/mman.h				\
 	sys/param.h				\
 	sys/resource.h				\
-	sys/socket.h				\
 	sys/sockio.h				\
 	sys/stat.h				\
 	sys/time.h				\
@@ -99,12 +97,30 @@
 #error invis
 #endif])
 	
+AC_CHECK_HEADERS(netdb.h, , , [AC_INCLUDES_DEFAULT
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+])
+
+AC_CHECK_HEADERS(sys/socket.h, , , [AC_INCLUDES_DEFAULT
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+])
+
 AC_CHECK_HEADERS(net/if.h, , , [AC_INCLUDES_DEFAULT
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 #if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif])
 
 AC_CHECK_HEADERS(netinet6/in6_var.h, , , [AC_INCLUDES_DEFAULT
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 #if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
@@ -568,11 +584,21 @@
 rk_CHECK_VAR(timezone,[#include <time.h>])
 rk_CHECK_VAR(altzone,[#include <time.h>])
 
-AC_HAVE_TYPE([sa_family_t],[#include <sys/socket.h>])
-AC_HAVE_TYPE([socklen_t],[#include <sys/socket.h>])
-AC_HAVE_TYPE([struct sockaddr], [#include <sys/socket.h>])
-AC_HAVE_TYPE([struct sockaddr_storage], [#include <sys/socket.h>])
-AC_HAVE_TYPE([struct addrinfo], [#include <netdb.h>])
+AC_HAVE_TYPE([sa_family_t],[
+#include <sys/types.h>
+#include <sys/socket.h>])
+AC_HAVE_TYPE([socklen_t],[
+#include <sys/types.h>
+#include <sys/socket.h>])
+AC_HAVE_TYPE([struct sockaddr], [
+#include <sys/types.h>
+#include <sys/socket.h>])
+AC_HAVE_TYPE([struct sockaddr_storage], [
+#include <sys/types.h>
+#include <sys/socket.h>])
+AC_HAVE_TYPE([struct addrinfo], [
+#include <sys/types.h>
+#include <netdb.h>])
 AC_HAVE_TYPE([struct ifaddrs], [#include <ifaddrs.h>])
 AC_HAVE_TYPE([struct iovec],[
 #include <sys/types.h>