diff options
| author | Simon Josefsson <simon@josefsson.org> | 2008-10-30 15:29:21 +0100 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2008-10-30 15:29:21 +0100 |
| commit | c26849cfd1875820ae39b73b6a806840bf86fb65 (patch) | |
| tree | b854584633a078ddab6c14eec42fd4cf96f1021b /lib/gl/m4/sys_socket_h.m4 | |
| parent | 94206092ba19455c1c0bab71e14af47228e83271 (diff) | |
| download | gnutls-c26849cfd1875820ae39b73b6a806840bf86fb65.tar.gz | |
Update gnulib files.
Diffstat (limited to 'lib/gl/m4/sys_socket_h.m4')
| -rw-r--r-- | lib/gl/m4/sys_socket_h.m4 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/gl/m4/sys_socket_h.m4 b/lib/gl/m4/sys_socket_h.m4 index b7b18e5300..85a0ace8ad 100644 --- a/lib/gl/m4/sys_socket_h.m4 +++ b/lib/gl/m4/sys_socket_h.m4 @@ -1,4 +1,4 @@ -# sys_socket_h.m4 serial 11 +# sys_socket_h.m4 serial 12 dnl Copyright (C) 2005-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -71,8 +71,8 @@ AC_DEFUN([gl_HEADER_SYS_SOCKET], # 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 @@ -100,7 +100,6 @@ AC_DEFUN([gl_SYS_SOCKET_MODULE_INDICATOR], AC_DEFUN([gl_SYS_SOCKET_H_DEFAULTS], [ - AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for GNULIB_CLOSE GNULIB_SOCKET=0; AC_SUBST([GNULIB_SOCKET]) GNULIB_CONNECT=0; AC_SUBST([GNULIB_CONNECT]) GNULIB_ACCEPT=0; AC_SUBST([GNULIB_ACCEPT]) |