X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Farpa_inet_h.m4;h=a6e63df01c376b124467f906268131fcc3e05573;hb=0a3f7af426469ab51370585e1a3afba66ff24b57;hp=8f530c5e7ab64def89cf5cb5123f59b3a7da4a83;hpb=88a40fa4f8a039aacbe54ce68e61ed1cdea6a0bf;p=gnulib.git

diff --git a/m4/arpa_inet_h.m4 b/m4/arpa_inet_h.m4
index 8f530c5e7..a6e63df01 100644
--- a/m4/arpa_inet_h.m4
+++ b/m4/arpa_inet_h.m4
@@ -1,10 +1,10 @@
-# arpa_inet_h.m4 serial 2
+# 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,
 dnl with or without modifications, as long as this notice is preserved.
 
-dnl Written by Simon Josefsson
+dnl Written by Simon Josefsson and Bruno Haible
 
 AC_DEFUN([gl_HEADER_ARPA_INET],
 [
@@ -14,11 +14,22 @@ AC_DEFUN([gl_HEADER_ARPA_INET],
 
   AC_CHECK_HEADERS_ONCE([arpa/inet.h])
   if test $ac_cv_header_arpa_inet_h = yes; then
-    ARPA_INET_H=''
+    HAVE_ARPA_INET_H=1
   else
     ARPA_INET_H='arpa/inet.h'
+    HAVE_ARPA_INET_H=0
   fi
-  AC_SUBST(ARPA_INET_H)
+  AC_SUBST([HAVE_ARPA_INET_H])
+  dnl Execute this unconditionally, because ARPA_INET_H may be set by other
+  dnl modules, after this code is executed.
+  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],
@@ -32,4 +43,8 @@ AC_DEFUN([gl_ARPA_INET_H_DEFAULTS],
 [
   GNULIB_INET_NTOP=0;     AC_SUBST([GNULIB_INET_NTOP])
   GNULIB_INET_PTON=0;     AC_SUBST([GNULIB_INET_PTON])
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_DECL_INET_NTOP=1;  AC_SUBST([HAVE_DECL_INET_NTOP])
+  HAVE_DECL_INET_PTON=1;  AC_SUBST([HAVE_DECL_INET_PTON])
+  ARPA_INET_H='';         AC_SUBST([ARPA_INET_H])
 ])