X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fspawn;h=61e5e073eda32d253bea6d5db0da554798902823;hb=9a29c4d601c340a8329954974386bb3dc7f1ea4d;hp=55c17f6e109f459b580692d720c7607fac7c4c6c;hpb=47a8dd64accd4e522331866a73bb79adc2d6ca78;p=gnulib.git

diff --git a/modules/spawn b/modules/spawn
index 55c17f6e1..61e5e073e 100644
--- a/modules/spawn
+++ b/modules/spawn
@@ -6,24 +6,27 @@ lib/spawn.in.h
 m4/spawn_h.m4
 
 Depends-on:
+arg-nonnull
+c++defs
 include_next
-link-warning
 sched
+warn-on-use
 
 configure.ac:
 gl_SPAWN_H
 
 Makefile.am:
-BUILT_SOURCES += $(SPAWN_H)
+BUILT_SOURCES += spawn.h
 
 # We need the following in order to create a replacement for <spawn.h> when
 # the system doesn't have one.
-spawn.h: spawn.in.h
+spawn.h: spawn.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's|@''HAVE_SPAWN_H''@|$(HAVE_SPAWN_H)|g' \
 	      -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|@''NEXT_SPAWN_H''@|$(NEXT_SPAWN_H)|g' \
 	      -e 's|@''GNULIB_POSIX_SPAWN''@|$(GNULIB_POSIX_SPAWN)|g' \
 	      -e 's|@''GNULIB_POSIX_SPAWNP''@|$(GNULIB_POSIX_SPAWNP)|g' \
@@ -47,8 +50,12 @@ spawn.h: spawn.in.h
 	      -e 's|@''GNULIB_POSIX_SPAWNATTR_SETSIGMASK''@|$(GNULIB_POSIX_SPAWNATTR_SETSIGMASK)|g' \
 	      -e 's|@''GNULIB_POSIX_SPAWNATTR_DESTROY''@|$(GNULIB_POSIX_SPAWNATTR_DESTROY)|g' \
 	      -e 's|@''HAVE_POSIX_SPAWN''@|$(HAVE_POSIX_SPAWN)|g' \
+	      -e 's|@''HAVE_POSIX_SPAWNATTR_T''@|$(HAVE_POSIX_SPAWNATTR_T)|g' \
+	      -e 's|@''HAVE_POSIX_SPAWN_FILE_ACTIONS_T''@|$(HAVE_POSIX_SPAWN_FILE_ACTIONS_T)|g' \
 	      -e 's|@''REPLACE_POSIX_SPAWN''@|$(REPLACE_POSIX_SPAWN)|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)/spawn.in.h; \
 	} > $@-t && \
 	mv $@-t $@
@@ -58,7 +65,7 @@ Include:
 <spawn.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible, glibc