diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-03-18 20:34:01 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2010-03-18 20:41:01 +0100 |
| commit | f4c79b3c08b4b16f504a049b2ef14a238e94508f (patch) | |
| tree | 54f859757b8693eb80ebfa23d444d9525053dd51 /m4/sys_socket_h.m4 | |
| parent | 54eb59cf4948482461e41f73c0a5b1f9c7081326 (diff) | |
| download | guile-f4c79b3c08b4b16f504a049b2ef14a238e94508f.tar.gz | |
Update Gnulib; use the `func' module.
Update Gnulib to v0.0-3575-g128e4b8.
* m4/gnulib-cache.m4: Add `func'.
Diffstat (limited to 'm4/sys_socket_h.m4')
| -rw-r--r-- | m4/sys_socket_h.m4 | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4 index 1d4765602..993514c25 100644 --- a/m4/sys_socket_h.m4 +++ b/m4/sys_socket_h.m4 @@ -1,4 +1,4 @@ -# sys_socket_h.m4 serial 14 +# sys_socket_h.m4 serial 16 dnl Copyright (C) 2005-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -19,7 +19,6 @@ AC_DEFUN([gl_HEADER_SYS_SOCKET], [gl_cv_header_sys_socket_h_selfcontained=no]) ]) if test $gl_cv_header_sys_socket_h_selfcontained = yes; then - SYS_SOCKET_H='' dnl If the shutdown function exists, <sys/socket.h> should define dnl SHUT_RD, SHUT_WR, SHUT_RDWR. AC_CHECK_FUNCS([shutdown]) @@ -37,8 +36,6 @@ AC_DEFUN([gl_HEADER_SYS_SOCKET], SYS_SOCKET_H='sys/socket.h' fi fi - else - SYS_SOCKET_H='sys/socket.h' fi # We need to check for ws2tcpip.h now. gl_PREREQ_SYS_H_SOCKET @@ -56,16 +53,11 @@ AC_DEFUN([gl_HEADER_SYS_SOCKET], ]) if test $ac_cv_type_struct_sockaddr_storage = no; then HAVE_STRUCT_SOCKADDR_STORAGE=0 - SYS_SOCKET_H='sys/socket.h' fi if test $ac_cv_type_sa_family_t = no; then HAVE_SA_FAMILY_T=0 - SYS_SOCKET_H='sys/socket.h' - fi - if test -n "$SYS_SOCKET_H"; then - gl_PREREQ_SYS_H_WINSOCK2 fi - AC_SUBST([SYS_SOCKET_H]) + gl_PREREQ_SYS_H_WINSOCK2 dnl Check for declarations of anything we want to poison if the dnl corresponding gnulib module is not in use. @@ -134,6 +126,8 @@ AC_DEFUN([gl_SYS_SOCKET_MODULE_INDICATOR], dnl Use AC_REQUIRE here, so that the default settings are expanded once only. AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1 + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR([$1]) ]) AC_DEFUN([gl_SYS_SOCKET_H_DEFAULTS], |