2005-10-01 Simon Josefsson <jas@extundo.com>

	* getaddrinfo.m4: Include sys/types.h for sys/socket.h, on FreeBSD
	and Darwin.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index d8b5e87042e2d354e72eac1060e6d343b139edde..41cee1be13e6815ca750f5f85d02bacb031de768 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,5 +1,8 @@
 2005-10-01  Simon Josefsson  <jas@extundo.com>
 
+       * getaddrinfo.m4: Include sys/types.h for sys/socket.h, on FreeBSD
+       and Darwin.
+
        * getaddrinfo.m4: Use AC_GNU_SOURCE, GNU only declare getaddrinfo
        as an (POSIX) extension.  Check for sys/types.h, sys/socket.h, and
        netdb.h too, needed by getaddrinfo.h.  Check if getaddrinfo,

diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4
index f95bb1a93f349b05e35819318c1621903e306403..be44232d704b5237cf8f41a57adac2aa5a376849 100644 (file)
--- a/m4/getaddrinfo.m4
+++ b/m4/getaddrinfo.m4
@@ -21,6 +21,12 @@ AC_DEFUN([gl_PREREQ_GETADDRINFO], [
   AC_REQUIRE([AC_GNU_SOURCE])
   AC_CHECK_HEADERS_ONCE(sys/socket.h netdb.h sys/types.h netinet/in.h)
   AC_CHECK_DECLS([getaddrinfo, freeaddrinfo, gai_strerror],,,[
+  /* sys/types.h is not needed according to POSIX, but the
+     sys/socket.h in i386-unknown-freebsd4.10 and
+     powerpc-apple-darwin5.5 required it. */
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
@@ -29,6 +35,9 @@ AC_DEFUN([gl_PREREQ_GETADDRINFO], [
 #endif
 ])
   AC_CHECK_TYPES([struct addrinfo],,,[
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif