X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Finet_pton.m4;h=e64da7b01ed9c80462428fc942b66d3eebc090db;hb=652e59d2790aaf0fedcd8267ac6fe84f10570d46;hp=6056ec16c49e72617674e7f825dbbaddc59ba9c5;hpb=e7df8796cf84f5d0d06c2a49067e24bcb1cf0551;p=gnulib.git

diff --git a/m4/inet_pton.m4 b/m4/inet_pton.m4
index 6056ec16c..e64da7b01 100644
--- a/m4/inet_pton.m4
+++ b/m4/inet_pton.m4
@@ -1,4 +1,4 @@
-# inet_pton.m4 serial 15
+# inet_pton.m4 serial 17
 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,
@@ -6,6 +6,8 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_INET_PTON],
 [
+  AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS])
+
   dnl Persuade Solaris <arpa/inet.h> to declare inet_pton.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
@@ -13,6 +15,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 +35,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
@@ -55,6 +58,7 @@ AC_DEFUN([gl_FUNC_INET_PTON],
     if test $ac_cv_have_decl_inet_pton = no; then
       HAVE_DECL_INET_PTON=0
     fi
+  fi
   AC_SUBST([INET_PTON_LIB])
 ])