From: Bruno Haible <bruno@clisp.org>
Date: Mon, 19 Sep 2011 01:44:56 +0000 (+0200)
Subject: inet_ntop, inet_pton: Look for it also in libresolv.
X-Git-Tag: v0.1~1870
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=a8aedbc8a5f3ebb963970345c9c8a67879a53cd8;p=gnulib.git

inet_ntop, inet_pton: Look for it also in libresolv.

* m4/inet_ntop.m4 (gl_FUNC_INET_NTOP): If the function was not found in
libnsl, search for it in libresolv.
* m4/inet_pton.m4 (gl_FUNC_INET_PTON): Likewise.
Needed on Solaris 7.
---

diff --git a/ChangeLog b/ChangeLog
index a6bdfdee8..a2e395d4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-09-18  Bruno Haible  <bruno@clisp.org>
 
+	inet_ntop, inet_pton: Look for it also in libresolv.
+	* m4/inet_ntop.m4 (gl_FUNC_INET_NTOP): If the function was not found in
+	libnsl, search for it in libresolv.
+	* m4/inet_pton.m4 (gl_FUNC_INET_PTON): Likewise.
+	Needed on Solaris 7.
+
+2011-09-18  Bruno Haible  <bruno@clisp.org>
+
 	accept, accept4 tests: Avoid link error on Solaris.
 	* modules/accept-tests (Makefile.am): Link test-accept against
 	$(LIBSOCKET).
diff --git a/m4/inet_ntop.m4 b/m4/inet_ntop.m4
index c7b3227d6..8291edd0a 100644
--- a/m4/inet_ntop.m4
+++ b/m4/inet_ntop.m4
@@ -1,4 +1,4 @@
-# inet_ntop.m4 serial 17
+# inet_ntop.m4 serial 18
 dnl Copyright (C) 2005-2006, 2008-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -13,6 +13,7 @@ AC_DEFUN([gl_FUNC_INET_NTOP],
 
   dnl Most platforms that provide inet_ntop define it in libc.
   dnl Solaris 8..10 provide inet_ntop in libnsl instead.
+  dnl Solaris 2.6..7 provide inet_ntop in libresolv instead.
   dnl Native Windows provides it in -lws2_32 instead, with a declaration in
   dnl <ws2tcpip.h>, and it uses stdcall calling convention, not cdecl
   dnl (hence we cannot use AC_CHECK_FUNCS, AC_SEARCH_LIBS to find it).
@@ -32,7 +33,7 @@ AC_DEFUN([gl_FUNC_INET_NTOP],
     fi
   else
     gl_save_LIBS=$LIBS
-    AC_SEARCH_LIBS([inet_ntop], [nsl], [],
+    AC_SEARCH_LIBS([inet_ntop], [nsl resolv], [],
       [AC_CHECK_FUNCS([inet_ntop])
        if test $ac_cv_func_inet_ntop = no; then
          HAVE_INET_NTOP=0
diff --git a/m4/inet_pton.m4 b/m4/inet_pton.m4
index 2f339b5c6..807a4dd28 100644
--- a/m4/inet_pton.m4
+++ b/m4/inet_pton.m4
@@ -1,4 +1,4 @@
-# inet_pton.m4 serial 15
+# inet_pton.m4 serial 16
 dnl Copyright (C) 2006, 2008-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -13,6 +13,7 @@ AC_DEFUN([gl_FUNC_INET_PTON],
 
   dnl Most platforms that provide inet_pton define it in libc.
   dnl Solaris 8..10 provide inet_pton in libnsl instead.
+  dnl Solaris 2.6..7 provide inet_pton in libresolv instead.
   dnl Native Windows provides it in -lws2_32 instead, with a declaration in
   dnl <ws2tcpip.h>, and it uses stdcall calling convention, not cdecl
   dnl (hence we cannot use AC_CHECK_FUNCS, AC_SEARCH_LIBS to find it).
@@ -32,7 +33,7 @@ AC_DEFUN([gl_FUNC_INET_PTON],
     fi
   else
     gl_save_LIBS=$LIBS
-    AC_SEARCH_LIBS([inet_pton], [nsl], [],
+    AC_SEARCH_LIBS([inet_pton], [nsl resolv], [],
       [AC_CHECK_FUNCS([inet_pton])
        if test $ac_cv_func_inet_pton = no; then
          HAVE_INET_PTON=0