diff options
author | Simon Josefsson <simon@josefsson.org> | 2006-03-01 10:01:11 +0000 |
---|---|---|
committer | Simon Josefsson <simon@josefsson.org> | 2006-03-01 10:01:11 +0000 |
commit | 779b95502ab0230b88d5cd4ede4d84a9a827c3be (patch) | |
tree | 6d42caee0b7e75adfa0f813b57a7c384c0e17ec5 /gl/m4/sys_socket_h.m4 | |
parent | 29b6feb2284f08803a74b6e2fddb3d1d0f3388cd (diff) | |
download | gnutls-779b95502ab0230b88d5cd4ede4d84a9a827c3be.tar.gz |
Update.
Diffstat (limited to 'gl/m4/sys_socket_h.m4')
-rw-r--r-- | gl/m4/sys_socket_h.m4 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gl/m4/sys_socket_h.m4 b/gl/m4/sys_socket_h.m4 index 10d042c321..d3e45b48c1 100644 --- a/gl/m4/sys_socket_h.m4 +++ b/gl/m4/sys_socket_h.m4 @@ -1,4 +1,4 @@ -# sys_socket_h.m4 serial 1 +# sys_socket_h.m4 serial 2 dnl Copyright (C) 2005, 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, @@ -12,7 +12,11 @@ AC_DEFUN([gl_HEADER_SYS_SOCKET], if test $ac_cv_header_sys_socket_h = yes; then SYS_SOCKET_H='' else - AC_CHECK_HEADERS_ONCE([winsock2.h ws2tcpip.h]) + dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make + dnl the check for those headers unconditional; yet cygwin reports + dnl that the headers are present but cannot be compiled (since on + dnl cygwin, all socket information should come from sys/socket.h). + AC_CHECK_HEADERS([winsock2.h ws2tcpip.h]) SYS_SOCKET_H='sys/socket.h' fi AC_SUBST(SYS_SOCKET_H) |