X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Finet_ntop.m4;h=5b27759c5e3b34ad5acc34311062a3a8ae2f8e5c;hb=1276a2c5f24c0c932426aca9c899fa524d2443f2;hp=c7b3227d6ccb285e4c338d28ad899ea65e9611fc;hpb=91d0cb58387e1e52b7023bcd0b01c1337c0fb9c8;p=gnulib.git

diff --git a/m4/inet_ntop.m4 b/m4/inet_ntop.m4
index c7b3227d6..5b27759c5 100644
--- a/m4/inet_ntop.m4
+++ b/m4/inet_ntop.m4
@@ -1,11 +1,13 @@
-# inet_ntop.m4 serial 17
-dnl Copyright (C) 2005-2006, 2008-2011 Free Software Foundation, Inc.
+# inet_ntop.m4 serial 19
+dnl Copyright (C) 2005-2006, 2008-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_INET_NTOP],
 [
+  AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS])
+
   dnl Persuade Solaris <arpa/inet.h> to declare inet_ntop.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
@@ -13,6 +15,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 +35,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