X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Finet_pton.m4;h=073df21a938a1fde01d409cd16819215c57b8aa0;hb=b7b02f28a67ed112845d6010833dc81858ca7890;hp=06331e9dec4c89c89a0dccf3f0072a564c7d451c;hpb=af6914c5f20f09c491bf9e360d5544f912d03602;p=gnulib.git

diff --git a/m4/inet_pton.m4 b/m4/inet_pton.m4
index 06331e9de..073df21a9 100644
--- a/m4/inet_pton.m4
+++ b/m4/inet_pton.m4
@@ -1,23 +1,39 @@
-# inet_pton.m4 serial 6
-dnl Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+# inet_pton.m4 serial 12
+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,
 dnl with or without modifications, as long as this notice is preserved.
 
-AC_DEFUN([gl_INET_PTON],
+AC_DEFUN([gl_FUNC_INET_PTON],
 [
   dnl Persuade Solaris <arpa/inet.h> to declare inet_pton.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
-  gl_REPLACE_ARPA_INET_H
+  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" != "no" &&
+     test "$ac_cv_search_inet_pton" != "none required"; then
+    INET_PTON_LIB="$ac_cv_search_inet_pton"
+  fi
+  AC_SUBST([INET_PTON_LIB])
 
-  AC_REPLACE_FUNCS(inet_pton)
   gl_PREREQ_INET_PTON
 ])
 
 # Prerequisites of lib/inet_pton.c.
 AC_DEFUN([gl_PREREQ_INET_PTON], [
-  AC_CHECK_DECLS([inet_pton],,,[#include <arpa/inet.h>])
+  AC_CHECK_HEADERS_ONCE([netdb.h])
+  AC_CHECK_DECLS([inet_pton],,,
+    [#include <arpa/inet.h>
+     #if HAVE_NETDB_H
+     # include <netdb.h>
+     #endif
+    ])
   if test $ac_cv_have_decl_inet_pton = no; then
     HAVE_DECL_INET_PTON=0
   fi