Mercurial > hg > octave-kai > gnulib-hg
changeset 12248:1bc8eb7d006a
getaddrinfo: Simplify Link: directive.
author | Simon Josefsson <simon@josefsson.org> |
---|---|
date | Fri, 06 Nov 2009 08:41:12 +0100 |
parents | 963fbd66201a |
children | ddd430aec0b9 |
files | ChangeLog m4/getaddrinfo.m4 modules/getaddrinfo |
diffstat | 3 files changed, 16 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-11-06 Simon Josefsson <simon@josefsson.org> + + * m4/getaddrinfo.m4: Add content of INET_NTOP_LIB to + GETADDRINFO_LIB. Bump serial number. + * modules/getaddrinfo (Link): Only mention GETADDRINFO_LIB again. + Suggested by Eric Blake <ebb9@byu.net>. + 2009-11-05 Eric Blake <ebb9@byu.net> strtod: detect darwin bug
--- a/m4/getaddrinfo.m4 +++ b/m4/getaddrinfo.m4 @@ -1,4 +1,4 @@ -# getaddrinfo.m4 serial 21 +# getaddrinfo.m4 serial 22 dnl Copyright (C) 2004-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -96,6 +96,7 @@ AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H AC_REQUIRE([gl_HOSTENT]) dnl for HOSTENT_LIB AC_REQUIRE([gl_SERVENT]) dnl for SERVENT_LIB + AC_REQUIRE([gl_INET_NTOP]) dnl for INET_NTOP_LIB AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_SOCKET_FAMILIES]) AC_REQUIRE([gl_HEADER_SYS_SOCKET]) @@ -163,4 +164,10 @@ *" $SERVENT_LIB "*) ;; *) GETADDRINFO_LIB="$GETADDRINFO_LIB $SERVENT_LIB" ;; esac + + dnl Append $INET_NTOP_LIB to GETADDRINFO_LIB, avoiding gratuitous duplicates. + case " $GETADDRINFO_LIB " in + *" $INET_NTOP_LIB "*) ;; + *) GETADDRINFO_LIB="$GETADDRINFO_LIB $INET_NTOP_LIB" ;; + esac ])