X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Farpa_inet;h=27eccc3eec17850c2853d085c2964a10f46cbf0e;hb=8f3aa1fee051bc5091d5f9b207609c03cf023894;hp=250c15b0ff23124fcb0333187e08956ca06b26b0;hpb=e8886c908325158b4e127ac82fbc4fb8918aad85;p=gnulib.git

diff --git a/modules/arpa_inet b/modules/arpa_inet
index 250c15b0f..27eccc3ee 100644
--- a/modules/arpa_inet
+++ b/modules/arpa_inet
@@ -1,35 +1,50 @@
 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
+arg-nonnull
 sys_socket
 
 configure.ac:
 gl_HEADER_ARPA_INET
+AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += $(ARPA_INET_H)
+BUILT_SOURCES += arpa/inet.h
 
 # We need the following in order to create <arpa/inet.h> when the system
 # doesn't have one.
-arpa/inet.h:
-	test -d arpa || mkdir arpa
-	rm -f $@-t $@
+arpa/inet.h: arpa_inet.in.h $(LINK_WARNING_H) $(ARG_NONNULL_H)
+	$(AM_V_at)$(MKDIR_P) arpa
+	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  echo '#include <sys/socket.h>'; \
-	} > $@-t
+	  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)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      < $(srcdir)/arpa_inet.in.h; \
+	} > $@-t && \
 	mv $@-t $@
 MOSTLYCLEANFILES += arpa/inet.h arpa/inet.h-t
 MOSTLYCLEANDIRS += arpa
 
 Include:
-#include <arpa/inet.h>
+<arpa/inet.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Simon Josefsson