Mercurial > gnulib
changeset 10820:bd7113fe42ce
getaddrinfo: use the modules servent and hostent.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Mon, 17 Nov 2008 12:17:39 +0100 |
| parents | bb8ef9cffa38 |
| children | 97fca29bb224 |
| files | ChangeLog m4/getaddrinfo.m4 modules/getaddrinfo |
| diffstat | 3 files changed, 12 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Nov 17 12:12:39 2008 +0100 +++ b/ChangeLog Mon Nov 17 12:17:39 2008 +0100 @@ -1,3 +1,9 @@ +2008-11-17 Bruno Haible <bruno@clisp.org> + + * modules/getaddrinfo (Depends-on): Add servent, hostent. + * m4/getaddrinfo.m4 (gl_PREREQ_GETADDRINFO): Use gl_SERVENT and + gl_HOSTENT. + 2008-11-17 Bruno Haible <bruno@clisp.org> * m4/sockets.m4 (gl_SOCKETS): After trying -lsocket, try also
--- a/m4/getaddrinfo.m4 Mon Nov 17 12:12:39 2008 +0100 +++ b/m4/getaddrinfo.m4 Mon Nov 17 12:17:39 2008 +0100 @@ -1,4 +1,4 @@ -# getaddrinfo.m4 serial 17 +# getaddrinfo.m4 serial 18 dnl Copyright (C) 2004, 2005, 2006, 2007, 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, @@ -76,25 +76,9 @@ AC_DEFUN([gl_PREREQ_GETADDRINFO], [ AC_REQUIRE([gl_NETDB_H_DEFAULTS]) AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H - AC_SEARCH_LIBS(gethostbyname, [inet nsl]) - AC_SEARCH_LIBS(getservbyname, [inet nsl socket xnet]) - AC_CHECK_FUNCS(gethostbyname,, [ - AC_CACHE_CHECK(for gethostbyname in winsock2.h and -lws2_32, - gl_cv_w32_gethostbyname, [ - gl_cv_w32_gethostbyname=no - am_save_LIBS="$LIBS" - LIBS="$LIBS -lws2_32" - AC_TRY_LINK([ -#ifdef HAVE_WINSOCK2_H -#include <winsock2.h> -#endif -#include <stddef.h> -], [gethostbyname(NULL);], gl_cv_w32_gethostbyname=yes) - LIBS="$am_save_LIBS"]) - if test "$gl_cv_w32_gethostbyname" = "yes"; then - LIBS="$LIBS -lws2_32" - fi - ]) + AC_REQUIRE([gl_HOSTENT]) dnl for HOSTENT_LIB + AC_REQUIRE([gl_SERVENT]) dnl for SERVENT_LIB + LIBS="$LIBS $HOSTENT_LIB $SERVENT_LIB" AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_SOCKET_FAMILIES]) AC_REQUIRE([gl_HEADER_SYS_SOCKET])