X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Farpa_inet;h=3691fd5cb8dcda844055b1124c9d782751bede55;hb=e09edd140811395f660fb1e2bb50f8c58fd8f508;hp=9e456214ba2f22486570c2928533e91ed54b8713;hpb=3b531a0a68bbbda41930f6c3a56b5f8e6258b33e;p=gnulib.git

diff --git a/modules/arpa_inet b/modules/arpa_inet
index 9e456214b..3691fd5cb 100644
--- a/modules/arpa_inet
+++ b/modules/arpa_inet
@@ -1,18 +1,21 @@
 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
+link-warning
 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 +23,16 @@ 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|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|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' \
+	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+	      < $(srcdir)/arpa_inet.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += arpa/inet.h arpa/inet.h-t
@@ -30,7 +42,7 @@ Include:
 #include <arpa/inet.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Simon Josefsson