From 62a1bf49213545f3540b6f2df95dd4b74fc3adfe Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Tue, 3 Nov 2009 00:49:47 +0100 Subject: [PATCH] Avoid link error for inet_ntop on Solaris. --- ChangeLog | 7 +++++++ m4/inet_ntop.m4 | 16 ++++++++-------- modules/inet_ntop | 3 +++ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8fd4b77ff..fae0235de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-11-02 Simon Josefsson + Bruno Haible + + * m4/inet_ntop.m4 (gl_INET_NTOP): Define also INET_NTOP_LIB. + * modules/inet_ntop (Link): New section. + Reported by Boyan Kasarov . + 2009-11-02 Eric Blake maint: avoid compiler warnings in m4 macros diff --git a/m4/inet_ntop.m4 b/m4/inet_ntop.m4 index 2bbdca108..85a6bb680 100644 --- 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 @@ AC_DEFUN([gl_INET_NTOP], 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 ]) diff --git a/modules/inet_ntop b/modules/inet_ntop index bf7ab7569..7e5c8dc78 100644 --- a/modules/inet_ntop +++ b/modules/inet_ntop @@ -25,5 +25,8 @@ LGPLv2+ Include: +Link: +$(INET_NTOP_LIB) + Maintainer: Yoann Vandoorselaere, glibc -- 2.11.0