diff options
author | Thomas Guyot-Sionnest <dermoth@users.sourceforge.net> | 2008-02-12 11:07:18 +0000 |
---|---|---|
committer | Thomas Guyot-Sionnest <dermoth@users.sourceforge.net> | 2008-02-12 11:07:18 +0000 |
commit | bd7029a99b0c2974265c6665638ef14a052f42ab (patch) | |
tree | f5661ba73366d81ef6e91f889ea7fec5ebe07b6b /gl/m4/sys_socket_h.m4 | |
parent | f99612320d6eda67644c07be04bb21aa4d7789db (diff) | |
download | monitoring-plugins-bd7029a99b0c2974265c6665638ef14a052f42ab.tar.gz |
Sync to latest Gnulib
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1925 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'gl/m4/sys_socket_h.m4')
-rw-r--r-- | gl/m4/sys_socket_h.m4 | 48 |
1 files changed, 38 insertions, 10 deletions
diff --git a/gl/m4/sys_socket_h.m4 b/gl/m4/sys_socket_h.m4 index d3e45b48..d9659c2d 100644 --- a/gl/m4/sys_socket_h.m4 +++ b/gl/m4/sys_socket_h.m4 | |||
@@ -1,5 +1,5 @@ | |||
1 | # sys_socket_h.m4 serial 2 | 1 | # sys_socket_h.m4 serial 4 |
2 | dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc. | 2 | dnl Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. |
3 | dnl This file is free software; the Free Software Foundation | 3 | dnl This file is free software; the Free Software Foundation |
4 | dnl gives unlimited permission to copy and/or distribute it, | 4 | dnl gives unlimited permission to copy and/or distribute it, |
5 | dnl with or without modifications, as long as this notice is preserved. | 5 | dnl with or without modifications, as long as this notice is preserved. |
@@ -8,16 +8,44 @@ dnl From Simon Josefsson. | |||
8 | 8 | ||
9 | AC_DEFUN([gl_HEADER_SYS_SOCKET], | 9 | AC_DEFUN([gl_HEADER_SYS_SOCKET], |
10 | [ | 10 | [ |
11 | AC_CHECK_HEADERS_ONCE([sys/socket.h]) | 11 | AC_CACHE_CHECK([whether <sys/socket.h> is self-contained], |
12 | if test $ac_cv_header_sys_socket_h = yes; then | 12 | [gl_cv_header_sys_socket_h_selfcontained], |
13 | [ | ||
14 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <sys/socket.h>], [])], | ||
15 | [gl_cv_header_sys_socket_h_selfcontained=yes], | ||
16 | [gl_cv_header_sys_socket_h_selfcontained=no]) | ||
17 | ]) | ||
18 | if test $gl_cv_header_sys_socket_h_selfcontained = yes; then | ||
13 | SYS_SOCKET_H='' | 19 | SYS_SOCKET_H='' |
14 | else | 20 | else |
15 | dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make | ||
16 | dnl the check for those headers unconditional; yet cygwin reports | ||
17 | dnl that the headers are present but cannot be compiled (since on | ||
18 | dnl cygwin, all socket information should come from sys/socket.h). | ||
19 | AC_CHECK_HEADERS([winsock2.h ws2tcpip.h]) | ||
20 | SYS_SOCKET_H='sys/socket.h' | 21 | SYS_SOCKET_H='sys/socket.h' |
22 | |||
23 | gl_CHECK_NEXT_HEADERS([sys/socket.h]) | ||
24 | if test $ac_cv_header_sys_socket_h = yes; then | ||
25 | HAVE_SYS_SOCKET_H=1 | ||
26 | HAVE_WINSOCK2_H=0 | ||
27 | HAVE_WS2TCPIP_H=0 | ||
28 | else | ||
29 | HAVE_SYS_SOCKET_H=0 | ||
30 | dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make | ||
31 | dnl the check for those headers unconditional; yet cygwin reports | ||
32 | dnl that the headers are present but cannot be compiled (since on | ||
33 | dnl cygwin, all socket information should come from sys/socket.h). | ||
34 | AC_CHECK_HEADERS([winsock2.h ws2tcpip.h]) | ||
35 | if test $ac_cv_header_winsock2_h = yes; then | ||
36 | HAVE_WINSOCK2_H=1 | ||
37 | else | ||
38 | HAVE_WINSOCK2_H=0 | ||
39 | fi | ||
40 | if test $ac_cv_header_ws2tcpip_h = yes; then | ||
41 | HAVE_WS2TCPIP_H=1 | ||
42 | else | ||
43 | HAVE_WS2TCPIP_H=0 | ||
44 | fi | ||
45 | fi | ||
46 | AC_SUBST([HAVE_SYS_SOCKET_H]) | ||
47 | AC_SUBST([HAVE_WINSOCK2_H]) | ||
48 | AC_SUBST([HAVE_WS2TCPIP_H]) | ||
21 | fi | 49 | fi |
22 | AC_SUBST(SYS_SOCKET_H) | 50 | AC_SUBST([SYS_SOCKET_H]) |
23 | ]) | 51 | ]) |