Mercurial > hg > octave-lyh > gnulib-hg
changeset 12225:e06ba2ed6c0f
Avoid link error for inet_ntop on Solaris.
| author | Simon Josefsson <simon@josefsson.org> |
|---|---|
| date | Tue, 03 Nov 2009 00:49:47 +0100 |
| parents | ba9f6f755aa8 |
| children | c878d857a1d2 |
| files | ChangeLog m4/inet_ntop.m4 modules/inet_ntop |
| diffstat | 3 files changed, 18 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-11-02 Simon Josefsson <simon@josefsson.org> + Bruno Haible <bruno@clisp.org> + + * m4/inet_ntop.m4 (gl_INET_NTOP): Define also INET_NTOP_LIB. + * modules/inet_ntop (Link): New section. + Reported by Boyan Kasarov <bkasarov@gmail.com>. + 2009-11-02 Eric Blake <ebb9@byu.net> maint: avoid compiler warnings in m4 macros
--- a/m4/inet_ntop.m4 +++ b/m4/inet_ntop.m4 @@ -1,4 +1,4 @@ -# inet_ntop.m4 serial 9 +# inet_ntop.m4 serial 10 dnl Copyright (C) 2005, 2006, 2008, 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, @@ -11,17 +11,17 @@ gl_REPLACE_ARPA_INET_H - dnl The AC_SEARCH_LIBS call is a hack to persuade the Solaris 8 linker to - dnl find inet_ntop. - dnl - dnl It is the responsibility of gl_INET_NTOP's caller to arrange for - dnl -lnsl if it is needed. Normally -lnsl is not needed on Solaris 8, - dnl since inet_ntop is needed only by getaddrinfo, and getaddrinfo - dnl isn't built on Solaris 8. + dnl Most platforms that provide inet_ntop define it in libc. + dnl Solaris 8..10 provide inet_ntop in libnsl instead. gl_save_LIBS=$LIBS AC_SEARCH_LIBS([inet_ntop], [nsl], [], [AC_REPLACE_FUNCS([inet_ntop])]) LIBS=$gl_save_LIBS + INET_NTOP_LIB= + if test "$ac_cv_search_inet_ntop" != "none needed"; then + INET_NTOP_LIB="$ac_cv_search_inet_ntop" + fi + AC_SUBST([INET_NTOP_LIB]) gl_PREREQ_INET_NTOP ])