diff options
| -rw-r--r-- | m4/ChangeLog | 5 | ||||
| -rw-r--r-- | m4/sockpfaf.m4 | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index 0311116792..7a07dd1668 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2006-07-05 Eric Blake <ebb9@byu.net> + + * sockpfaf.m4 (gl_SOCKET_FAMILIES): Use gl_HEADER_SYS_SOCKET + to avoid 'header present but could not be compiled' on cygwin. + 2006-07-03 Bruno Haible <bruno@clisp.org> * strndup.m4 (gl_FUNC_STRNDUP): When cross-compiling, check whether diff --git a/m4/sockpfaf.m4 b/m4/sockpfaf.m4 index 9e396ebaf9..391abea24f 100644 --- a/m4/sockpfaf.m4 +++ b/m4/sockpfaf.m4 @@ -1,4 +1,4 @@ -# sockpfaf.m4 serial 3 +# sockpfaf.m4 serial 4 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, @@ -13,7 +13,8 @@ dnl From Bruno Haible. AC_DEFUN([gl_SOCKET_FAMILIES], [ - AC_CHECK_HEADERS_ONCE(sys/socket.h netinet/in.h winsock2.h) + AC_REQUIRE([gl_HEADER_SYS_SOCKET]) + AC_CHECK_HEADERS_ONCE([netinet/in.h]) AC_MSG_CHECKING(for IPv4 sockets) AC_CACHE_VAL(gl_cv_socket_ipv4, |