diff options
Diffstat (limited to 'm4/getaddrinfo.m4')
| -rw-r--r-- | m4/getaddrinfo.m4 | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4 index 006cdab2a..3c6a86915 100644 --- a/m4/getaddrinfo.m4 +++ b/m4/getaddrinfo.m4 @@ -1,4 +1,4 @@ -# getaddrinfo.m4 serial 7 +# getaddrinfo.m4 serial 8 dnl Copyright (C) 2004, 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, @@ -11,19 +11,21 @@ AC_DEFUN([gl_GETADDRINFO], AC_SEARCH_LIBS(getaddrinfo, [nsl socket]) AC_CHECK_FUNCS(getaddrinfo,, [ AC_CACHE_CHECK(for getaddrinfo in ws2tcpip.h and -lws2_32, - gl_cv_w32_getaddrinfo, [ + gl_cv_w32_getaddrinfo, [ gl_cv_w32_getaddrinfo=no am_save_LIBS="$LIBS" LIBS="$LIBS -lws2_32" AC_TRY_LINK([ +#ifdef HAVE_WS2TCPIP_H #define WINVER 0x0501 #include <ws2tcpip.h> +#endif ], [getaddrinfo(0, 0, 0, 0);], gl_cv_w32_getaddrinfo=yes) LIBS="$am_save_LIBS" if test "$gl_cv_w32_getaddrinfo" = "yes"; then - LIBS="$LIBS -lws2_32" + LIBS="$LIBS -lws2_32" else - AC_LIBOBJ(getaddrinfo) + AC_LIBOBJ(getaddrinfo) fi ])]) @@ -37,9 +39,10 @@ AC_DEFUN([gl_PREREQ_GETADDRINFO], [ AC_SEARCH_LIBS(getservbyname, [inet nsl socket xnet]) AC_REQUIRE([gl_C_RESTRICT]) AC_REQUIRE([gl_SOCKET_FAMILIES]) + AC_REQUIRE([gl_HEADER_SYS_SOCKET]) AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([AC_GNU_SOURCE]) - AC_CHECK_HEADERS_ONCE(netinet/in.h sys/socket.h netdb.h ws2tcpip.h) + AC_CHECK_HEADERS_ONCE(netinet/in.h netdb.h) AC_CHECK_DECLS([getaddrinfo, freeaddrinfo, gai_strerror],,,[ /* sys/types.h is not needed according to POSIX, but the sys/socket.h in i386-unknown-freebsd4.10 and |