avoid some overlong lines from posix urls, etc.

[gnulib.git] / modules / sys_socket

diff --git a/modules/sys_socket b/modules/sys_socket
index 72d3959..8c47352 100644 (file)
--- a/modules/sys_socket
+++ b/modules/sys_socket
@@ -7,21 +7,23 @@ m4/sys_socket_h.m4
 m4/sockpfaf.m4
 
 Depends-on:
-include_next
-link-warning
-errno
 alignof
+arg-nonnull
+c++defs
+errno
+include_next
+warn-on-use
 
 configure.ac:
 gl_HEADER_SYS_SOCKET
 AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += $(SYS_SOCKET_H)
+BUILT_SOURCES += sys/socket.h
 
 # We need the following in order to create <sys/socket.h> when the system
 # doesn't have one that works with the given compiler.
-sys/socket.h: sys_socket.in.h $(LINK_WARNING_H)
+sys/socket.h: sys_socket.in.h $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
        $(AM_V_at)$(MKDIR_P) sys
        $(AM_V_GEN)rm -f $@-t $@ && \
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
@@ -50,7 +52,9 @@ sys/socket.h: sys_socket.in.h $(LINK_WARNING_H)
              -e 's|@''HAVE_STRUCT_SOCKADDR_STORAGE''@|$(HAVE_STRUCT_SOCKADDR_STORAGE)|g' \
              -e 's|@''HAVE_SA_FAMILY_T''@|$(HAVE_SA_FAMILY_T)|g' \
              -e 's|@''HAVE_ACCEPT4''@|$(HAVE_ACCEPT4)|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)/sys_socket.in.h; \
        } > $@-t && \
        mv -f $@-t $@