Avoid link error for inet_ntop on Solaris.

diff --git a/ChangeLog b/ChangeLog
index 8fd4b77ffb05f1d70a583beafa1d28a85163be87..fae0235de900a12db0f00cedeb60921d77b6df35 100644 (file)
--- 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

diff --git a/m4/inet_ntop.m4 b/m4/inet_ntop.m4
index 2bbdca10889797ecc5fbef4a315a5406b2c92f21..85a6bb6808b5bbc7f370136daf2b48e71a406ff9 100644 (file)
--- 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 bf7ab756952dd683d7530de1cebf539865f0dd78..7e5c8dc78033f9f8d6b6a1d230cbba170018a13b 100644 (file)
--- a/modules/inet_ntop
+++ b/modules/inet_ntop
@@ -25,5 +25,8 @@ LGPLv2+
 Include:
 <arpa/inet.h>
 
+Link:
+$(INET_NTOP_LIB)
+
 Maintainer:
 Yoann Vandoorselaere, glibc