diff options
| author | Bruno Haible <bruno@clisp.org> | 2008-11-17 12:17:39 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2008-11-17 12:17:39 +0100 |
| commit | 65dd62dfc3a9b407bcab208cc895d542eb10d8e7 (patch) | |
| tree | 31ed970d4a34007d377a416102a706d63abd94fc | |
| parent | 350b445ef71a216fd5c322d9f51c409b3a2226ac (diff) | |
| download | gnulib-65dd62dfc3a9b407bcab208cc895d542eb10d8e7.tar.gz | |
getaddrinfo: use the modules servent and hostent.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | m4/getaddrinfo.m4 | 24 | ||||
| -rw-r--r-- | modules/getaddrinfo | 2 |
3 files changed, 12 insertions, 20 deletions
@@ -1,5 +1,11 @@ 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 -lnetwork and -lnet. Needed for Haiku and BeOS. diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4 index 1c7b5c33bc..f1cc01da12 100644 --- a/m4/getaddrinfo.m4 +++ b/m4/getaddrinfo.m4 @@ -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_GETADDRINFO], 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]) diff --git a/modules/getaddrinfo b/modules/getaddrinfo index e08cf578b6..bc60a78c61 100644 --- a/modules/getaddrinfo +++ b/modules/getaddrinfo @@ -16,6 +16,8 @@ stdbool sys_socket netdb strdup +servent +hostent configure.ac: gl_GETADDRINFO |