Enable gnulib's <arpa/inet.h> replacement also when inet_ntop or inet_pton need to...

[gnulib.git] / modules / arpa_inet

diff --git a/modules/arpa_inet b/modules/arpa_inet
index 9e45621..75092be 100644 (file)
--- a/modules/arpa_inet
+++ b/modules/arpa_inet
@@ -1,18 +1,20 @@
 Description:
-A <arpa/inet.h> for systems lacking it (e.g., Mingw).
+A GNU-like <arpa/inet.h>.
 
 Files:
+lib/arpa_inet.in.h
 m4/arpa_inet_h.m4
 
 Depends-on:
+include_next
 sys_socket
 
 configure.ac:
 gl_HEADER_ARPA_INET
+AC_PROG_MKDIR_P
 
 Makefile.am:
 BUILT_SOURCES += $(ARPA_INET_H)
-AC_PROG_MKDIR_P
 
 # We need the following in order to create <arpa/inet.h> when the system
 # doesn't have one.
@@ -20,7 +22,14 @@ arpa/inet.h:
        @MKDIR_P@ arpa
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         echo '#include <sys/socket.h>'; \
+         sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+             -e 's|@''NEXT_ARPA_INET_H''@|$(NEXT_ARPA_INET_H)|g' \
+             -e 's|@''HAVE_ARPA_INET_H''@|$(HAVE_ARPA_INET_H)|g' \
+             -e 's|@''GNULIB_INET_NTOP''@|$(GNULIB_INET_NTOP)|g' \
+             -e 's|@''GNULIB_INET_PTON''@|$(GNULIB_INET_PTON)|g' \
+             -e 's|@''HAVE_DECL_INET_NTOP''@|$(HAVE_DECL_INET_NTOP)|g' \
+             -e 's|@''HAVE_DECL_INET_PTON''@|$(HAVE_DECL_INET_PTON)|g' \
+             < $(srcdir)/arpa_inet.in.h; \
        } > $@-t
        mv $@-t $@
 MOSTLYCLEANFILES += arpa/inet.h arpa/inet.h-t
@@ -30,7 +39,7 @@ Include:
 #include <arpa/inet.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Simon Josefsson