Avoid assigning ARPA_INET_H in different .m4 files.

diff --git a/ChangeLog b/ChangeLog
index 5a3a8897fd21ae29a70f68c85c985aa938f7cd54..9167e3471d162be2fae12efe7f595b0b98687e33 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 --git a/m4/arpa_inet_h.m4 b/m4/arpa_inet_h.m4
index 20bd3bc6f5b81287f9d6e539c623158be0f5ee12..c1fc9e9e75abb9da35c05b3352eb624bb97a3ab5 100644 (file)
--- a/m4/arpa_inet_h.m4
+++ b/m4/arpa_inet_h.m4
@@ -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 @@ AC_DEFUN([gl_HEADER_ARPA_INET],
   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 --git a/m4/inet_ntop.m4 b/m4/inet_ntop.m4
index 25a3ee9b68e8c2eb379038f5248fa4afcea76178..6f873063b95e0517e8f2fe13c0822b26a4152c9f 100644 (file)
--- a/m4/inet_ntop.m4
+++ b/m4/inet_ntop.m4
@@ -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 @@ 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'
+  gl_REPLACE_ARPA_INET_H
 
   AC_REPLACE_FUNCS(inet_ntop)
   gl_PREREQ_INET_NTOP

diff --git a/m4/inet_pton.m4 b/m4/inet_pton.m4
index a72cd2383ca0157c01c06642b4aea7aeff996aaa..06331e9dec4c89c89a0dccf3f0072a564c7d451c 100644 (file)
--- a/m4/inet_pton.m4
+++ b/m4/inet_pton.m4
@@ -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 @@ AC_DEFUN([gl_INET_PTON],
   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