From: Bruno Haible <bruno@clisp.org>
Date: Tue, 29 Apr 2008 23:27:49 +0000 (+0200)
Subject: Ensure the system declares inet_ntop, inet_pton when possible.
X-Git-Tag: v0.1~7452
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=f07f7c50e984ba04e7cdcdc5963a822a64005681;p=gnulib.git

Ensure the system declares inet_ntop, inet_pton when possible.
---

diff --git a/ChangeLog b/ChangeLog
index eb4e64bcb..ab0e29275 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-29  Bruno Haible  <bruno@clisp.org>
+
+	* m4/inet_ntop.m4 (gl_INET_NTOP): Require gl_USE_SYSTEM_EXTENSIONS.
+	* m4/inet_pton.m4 (gl_INET_PTON): Likewise.
+	* modules/inet_ntop (Depends-on): Add extensions.
+	* modules/inet_pton (Depends-on): Likewise.
+	Reported by Simon Josefsson.
+
 2008-04-29  Jim Meyering  <meyering@redhat.com>
 
 	When the is more than one match in a block, match all of them.
diff --git a/m4/inet_ntop.m4 b/m4/inet_ntop.m4
index ee7ba5196..342cd28a4 100644
--- a/m4/inet_ntop.m4
+++ b/m4/inet_ntop.m4
@@ -6,6 +6,9 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_INET_NTOP],
 [
+  dnl Persuade Solaris <arpa/inet.h> to declare inet_ntop.
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+
   AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS])
   ARPA_INET_H='arpa/inet.h'
 
diff --git a/m4/inet_pton.m4 b/m4/inet_pton.m4
index 4ea89d26e..7d7f993a0 100644
--- a/m4/inet_pton.m4
+++ b/m4/inet_pton.m4
@@ -6,6 +6,9 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_INET_PTON],
 [
+  dnl Persuade Solaris <arpa/inet.h> to declare inet_ntop.
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+
   AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS])
   ARPA_INET_H='arpa/inet.h'
 
diff --git a/modules/inet_ntop b/modules/inet_ntop
index a83ea8076..98df38e51 100644
--- a/modules/inet_ntop
+++ b/modules/inet_ntop
@@ -10,6 +10,7 @@ socklen
 sys_socket
 arpa_inet
 netinet_in
+extensions
 
 configure.ac:
 gl_INET_NTOP
diff --git a/modules/inet_pton b/modules/inet_pton
index 74a68b7ae..642b8fc56 100644
--- a/modules/inet_pton
+++ b/modules/inet_pton
@@ -10,6 +10,7 @@ socklen
 sys_socket
 arpa_inet
 netinet_in
+extensions
 
 configure.ac:
 gl_INET_PTON