X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Finet_pton.m4;h=073df21a938a1fde01d409cd16819215c57b8aa0;hb=563a0ca5af7e984098ebe90d85a9ff7abe504581;hp=f0718016a8ec4098a32015f9f239d315269eaa81;hpb=b01658b63da1e10190b8c434bc051c6f7d19b274;p=gnulib.git

diff --git a/m4/inet_pton.m4 b/m4/inet_pton.m4
index f0718016a..073df21a9 100644
--- a/m4/inet_pton.m4
+++ b/m4/inet_pton.m4
@@ -1,16 +1,14 @@
-# inet_pton.m4 serial 8
-dnl Copyright (C) 2006, 2008, 2009 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
@@ -18,7 +16,8 @@ AC_DEFUN([gl_INET_PTON],
     [AC_REPLACE_FUNCS([inet_pton])])
   LIBS=$gl_save_LIBS
   INET_PTON_LIB=
-  if test "$ac_cv_search_inet_pton" != "none needed"; then
+  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])
@@ -28,7 +27,13 @@ AC_DEFUN([gl_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