From c90d9d892409c285cc426fc42ad5ad4faeba0efb Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Thu, 22 Jun 2006 13:08:43 +0000 Subject: [PATCH] 2006-06-22 Simon Josefsson * sockpfaf.m4: Include winsock2.h too, to make it work under MinGW. --- m4/ChangeLog | 5 +++++ m4/sockpfaf.m4 | 24 ++++++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/m4/ChangeLog b/m4/ChangeLog index e5e22ca83..16bb9c697 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2006-06-22 Simon Josefsson + + * sockpfaf.m4: Include winsock2.h too, to make it work under + MinGW. + 2006-06-21 Simon Josefsson * getaddrinfo.m4: Don't define WINVER. Look for gethostbyname in diff --git a/m4/sockpfaf.m4 b/m4/sockpfaf.m4 index b224faec5..9e396ebaf 100644 --- a/m4/sockpfaf.m4 +++ b/m4/sockpfaf.m4 @@ -1,5 +1,5 @@ -# sockpfaf.m4 serial 2 -dnl Copyright (C) 2004 Free Software Foundation, Inc. +# sockpfaf.m4 serial 3 +dnl Copyright (C) 2004, 2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,11 +13,20 @@ dnl From Bruno Haible. AC_DEFUN([gl_SOCKET_FAMILIES], [ + AC_CHECK_HEADERS_ONCE(sys/socket.h netinet/in.h winsock2.h) + AC_MSG_CHECKING(for IPv4 sockets) AC_CACHE_VAL(gl_cv_socket_ipv4, [AC_TRY_COMPILE([#include +#ifdef HAVE_SYS_SOCKET_H #include -#include ], +#endif +#ifdef HAVE_NETINET_IN_H +#include +#endif +#ifdef HAVE_WINSOCK2_H +#include +#endif], [int x = AF_INET; struct in_addr y; struct sockaddr_in z;], gl_cv_socket_ipv4=yes, gl_cv_socket_ipv4=no)]) AC_MSG_RESULT($gl_cv_socket_ipv4) @@ -28,8 +37,15 @@ AC_DEFUN([gl_SOCKET_FAMILIES], AC_MSG_CHECKING(for IPv6 sockets) AC_CACHE_VAL(gl_cv_socket_ipv6, [AC_TRY_COMPILE([#include +#ifdef HAVE_SYS_SOCKET_H #include -#include ], +#endif +#ifdef HAVE_NETINET_IN_H +#include +#endif +#ifdef HAVE_WINSOCK2_H +#include +#endif], [int x = AF_INET6; struct in6_addr y; struct sockaddr_in6 z;], gl_cv_socket_ipv6=yes, gl_cv_socket_ipv6=no)]) AC_MSG_RESULT($gl_cv_socket_ipv6) -- 2.11.0