# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1222679785 -7200
# Node ID b636c4338efcdef93fa2648142112fa18a4825d8
# Parent  051ed487f38b840f47379fae5da4e33d7acb73b7
Avoid assigning ARPA_INET_H in different .m4 files.

diff -r 051ed487f38b -r b636c4338efc ChangeLog
--- a/ChangeLog	Sun Sep 28 17:41:17 2008 +0200
+++ b/ChangeLog	Mon Sep 29 11:16:25 2008 +0200
@@ -1,3 +1,10 @@
+2008-09-29  Bruno Haible  <bruno@clisp.org>
+
+	* m4/arpa_inet_h.m4 (gl_REPLACE_ARPA_INET_H): New macro.
+	* m4/inet_ntop.m4 (gl_INET_NTOP): Invoke it instead of assigning
+	ARPA_INET_H directly.
+	* m4/inet_pton.m4 (gl_INET_PTON): Likewise.
+
 2008-09-28  Bruno Haible  <bruno@clisp.org>
 
 	* m4/sys_socket_h.m4 (gl_PREREQ_SYS_H_WINSOCK2): New macro, extracted
diff -r 051ed487f38b -r b636c4338efc m4/arpa_inet_h.m4
--- a/m4/arpa_inet_h.m4	Sun Sep 28 17:41:17 2008 +0200
+++ b/m4/arpa_inet_h.m4	Mon Sep 29 11:16:25 2008 +0200
@@ -1,4 +1,4 @@
-# arpa_inet_h.m4 serial 4
+# arpa_inet_h.m4 serial 5
 dnl Copyright (C) 2006, 2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -25,6 +25,13 @@
   gl_CHECK_NEXT_HEADERS([arpa/inet.h])
 ])
 
+dnl Unconditionally enables the replacement of <arpa/inet.h>.
+AC_DEFUN([gl_REPLACE_ARPA_INET_H],
+[
+  AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS])
+  ARPA_INET_H='arpa/inet.h'
+)
+
 AC_DEFUN([gl_ARPA_INET_MODULE_INDICATOR],
 [
   dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
diff -r 051ed487f38b -r b636c4338efc m4/inet_ntop.m4
--- a/m4/inet_ntop.m4	Sun Sep 28 17:41:17 2008 +0200
+++ b/m4/inet_ntop.m4	Mon Sep 29 11:16:25 2008 +0200
@@ -1,4 +1,4 @@
-# inet_ntop.m4 serial 6
+# inet_ntop.m4 serial 7
 dnl Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,8 +9,7 @@
   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'
+  gl_REPLACE_ARPA_INET_H
 
   AC_REPLACE_FUNCS(inet_ntop)
   gl_PREREQ_INET_NTOP
diff -r 051ed487f38b -r b636c4338efc m4/inet_pton.m4
--- a/m4/inet_pton.m4	Sun Sep 28 17:41:17 2008 +0200
+++ b/m4/inet_pton.m4	Mon Sep 29 11:16:25 2008 +0200
@@ -1,4 +1,4 @@
-# inet_pton.m4 serial 5
+# inet_pton.m4 serial 6
 dnl Copyright (C) 2006, 2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,8 +9,7 @@
   dnl Persuade Solaris <arpa/inet.h> to declare inet_pton.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
-  AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS])
-  ARPA_INET_H='arpa/inet.h'
+  gl_REPLACE_ARPA_INET_H
 
   AC_REPLACE_FUNCS(inet_pton)
   gl_PREREQ_INET_PTON