X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Farpa_inet;h=365f36dbb6dc8fbea6d5da9394d6fb0705e266ce;hb=7cbbd8a31a3be111f26d87fb8e55f4438f9c885f;hp=cee421bd51a97d785e663cf9e4239dd8d147ca65;hpb=f87db1aa7ec2bb87daba4a0dd09a2e733d313f81;p=gnulib.git

diff --git a/modules/arpa_inet b/modules/arpa_inet
index cee421bd5..365f36dbb 100644
--- a/modules/arpa_inet
+++ b/modules/arpa_inet
@@ -6,32 +6,38 @@ lib/arpa_inet.in.h
 m4/arpa_inet_h.m4
 
 Depends-on:
+arg-nonnull
+c++defs
 include_next
-link-warning
 sys_socket
+warn-on-use
 
 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: arpa_inet.in.h
+arpa/inet.h: arpa_inet.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
 	$(AM_V_at)$(MKDIR_P) arpa
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''HAVE_FEATURES_H''@|$(HAVE_FEATURES_H)|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 '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/arpa_inet.in.h; \
 	} > $@-t && \
 	mv $@-t $@
@@ -39,7 +45,7 @@ MOSTLYCLEANFILES += arpa/inet.h arpa/inet.h-t
 MOSTLYCLEANDIRS += arpa
 
 Include:
-#include <arpa/inet.h>
+<arpa/inet.h>
 
 License:
 LGPLv2+