Fix link error on Solaris 8.

diff --git a/ChangeLog b/ChangeLog
index fae0235de900a12db0f00cedeb60921d77b6df35..9347ec727906c5a70235a06979274b19d71fca8f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-02  Paul Eggert  <eggert@cs.ucla.edu>
+            Simon Josefsson  <simon@josefsson.org>
+            Bruno Haible  <bruno@clisp.org>
+
+       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  <simon@josefsson.org>
             Bruno Haible  <bruno@clisp.org>
 

diff --git a/m4/inet_pton.m4 b/m4/inet_pton.m4
index e0ec432bc6e3e600608789f0d38162ee401e7004..f0718016a8ec4098a32015f9f239d315269eaa81 100644 (file)
--- 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 563a5529d54a27324f2a3ca62e34a73ca4c98c56..260074741313702a5fae5b11fc7adcf81ef48c98 100644 (file)
--- a/modules/inet_pton
+++ b/modules/inet_pton
@@ -26,5 +26,8 @@ LGPLv2+
 Include:
 <arpa/inet.h>
 
+Link:
+$(INET_PTON_LIB)
+
 Maintainer:
 Simon Josefsson, glibc