Mercurial > gnulib
changeset 30406:aeb8405efc47
Reduce the dependencies of m4/sys_socket_h.m4.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sat, 25 Oct 2008 22:51:05 +0200 |
| parents | fa3bbafb1489 |
| children | 6770691c5fde |
| files | ChangeLog m4/sys_socket_h.m4 modules/sys_socket |
| diffstat | 3 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Oct 25 22:48:11 2008 +0200 +++ b/ChangeLog Sat Oct 25 22:51:05 2008 +0200 @@ -1,5 +1,9 @@ 2008-10-25 Bruno Haible <bruno@clisp.org> + * m4/sys_socket_h.m4 (gl_PREREQ_SYS_H_WINSOCK2): Require + gl_UNISTD_H_DEFAULTS, gl_SYS_IOCTL_H_DEFAULTS only if they exist. + * modules/sys_socket (Files): Remove m4/unistd_h.m4, m4/sys_ioctl_h.m4. + * lib/sys_socket.in.h (HAVE__GL_CLOSE_FD_MAYBE_SOCKET); Move macro from here ... * lib/unistd.in.h (HAVE__GL_CLOSE_FD_MAYBE_SOCKET); ... to here.
--- a/m4/sys_socket_h.m4 Sat Oct 25 22:48:11 2008 +0200 +++ b/m4/sys_socket_h.m4 Sat Oct 25 22:51:05 2008 +0200 @@ -71,8 +71,8 @@ # Sets and substitutes HAVE_WINSOCK2_H. AC_DEFUN([gl_PREREQ_SYS_H_WINSOCK2], [ - AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) - AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS]) + m4_ifdef([gl_UNISTD_H_DEFAULTS], [AC_REQUIRE([gl_UNISTD_H_DEFAULTS])]) + m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS])]) AC_CHECK_HEADERS_ONCE([sys/socket.h]) if test $ac_cv_header_sys_socket_h != yes; then dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make