From b01658b63da1e10190b8c434bc051c6f7d19b274 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 3 Nov 2009 01:04:41 +0100 Subject: [PATCH] Fix link error on Solaris 8. --- ChangeLog | 9 +++++++++ m4/inet_pton.m4 | 15 +++++++++++++-- modules/inet_pton | 3 +++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fae0235de..9347ec727 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-11-02 Paul Eggert + Simon Josefsson + Bruno Haible + + Fix link error on Solaris 8. + * m4/inet_pton.m4 (gl_INET_PTON): Search for the function inet_pton + also in libnsl. Define also INET_PTON_LIB. + * modules/inet_pton (Link): New section. + 2009-11-02 Simon Josefsson Bruno Haible diff --git a/m4/inet_pton.m4 b/m4/inet_pton.m4 index e0ec432bc..f0718016a 100644 --- a/m4/inet_pton.m4 +++ b/m4/inet_pton.m4 @@ -1,4 +1,4 @@ -# inet_pton.m4 serial 7 +# inet_pton.m4 serial 8 dnl Copyright (C) 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,7 +11,18 @@ AC_DEFUN([gl_INET_PTON], gl_REPLACE_ARPA_INET_H - AC_REPLACE_FUNCS([inet_pton]) + dnl Most platforms that provide inet_pton define it in libc. + dnl Solaris 8..10 provide inet_pton in libnsl instead. + gl_save_LIBS=$LIBS + AC_SEARCH_LIBS([inet_pton], [nsl], [], + [AC_REPLACE_FUNCS([inet_pton])]) + LIBS=$gl_save_LIBS + INET_PTON_LIB= + if test "$ac_cv_search_inet_pton" != "none needed"; then + INET_PTON_LIB="$ac_cv_search_inet_pton" + fi + AC_SUBST([INET_PTON_LIB]) + gl_PREREQ_INET_PTON ]) diff --git a/modules/inet_pton b/modules/inet_pton index 563a5529d..260074741 100644 --- a/modules/inet_pton +++ b/modules/inet_pton @@ -26,5 +26,8 @@ LGPLv2+ Include: +Link: +$(INET_PTON_LIB) + Maintainer: Simon Josefsson, glibc -- 2.11.0