Rename module spawn to spawn-h.

* modules/spawn-h: Renamed from modules/spawn.
* modules/spawn-h-tests: Renamed from modules/spawn-tests.
* modules/spawn-h-c++-tests: Renamed from modules/spawn-c++-tests.
* tests/test-spawn-h.c: Renamed from tests/test-spawn.c.
* tests/test-spawn-h-c++.cc: Renamed from tests/test-spawn-c++.cc.
* doc/posix-headers/spawn.texi: Update.
* modules/* (Depends-on): Update.
* modules/spawn: New file.

diff --git a/ChangeLog b/ChangeLog
index 893f2900f5e4d94c622adf6c86442510f6682db1..f33ce8ce6c7b8cec6b43ec8cff0b92937f44393c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+       Rename module spawn to spawn-h.
+       * modules/spawn-h: Renamed from modules/spawn.
+       * modules/spawn-h-tests: Renamed from modules/spawn-tests.
+       * modules/spawn-h-c++-tests: Renamed from modules/spawn-c++-tests.
+       * tests/test-spawn-h.c: Renamed from tests/test-spawn.c.
+       * tests/test-spawn-h-c++.cc: Renamed from tests/test-spawn-c++.cc.
+       * doc/posix-headers/spawn.texi: Update.
+       * modules/* (Depends-on): Update.
+       * modules/spawn: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>
 
        Rename module search to search-h.

diff --git a/doc/posix-headers/spawn.texi b/doc/posix-headers/spawn.texi
index ce729eddccae365fddbc3963d6605aeb565d7df2..819b2d885370e749d66f04fdcc3ea24668556725 100644 (file)
--- a/doc/posix-headers/spawn.texi
+++ b/doc/posix-headers/spawn.texi
@@ -3,8 +3,8 @@
 
 POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/spawn.h.html}
 
-Gnulib module: spawn
-@mindex spawn
+Gnulib module: spawn-h
+@mindex spawn-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/modules/execute b/modules/execute
index 2b302deeda9269200585b14b7eacab3ce298e6f1..3189477fbae5a479bdf3ca0774f816093f6151ec 100644 (file)
--- a/modules/execute
+++ b/modules/execute
@@ -18,7 +18,7 @@ free-posix
 msvc-nothrow
 gettext-h
 gnulib-i18n
-spawn
+spawn-h
 posix_spawn
 posix_spawnp
 posix_spawn_file_actions_init

diff --git a/modules/posix_spawn b/modules/posix_spawn
index 6ca7ab9331311e346a208228e91cdbe356bd15ae..29b57e639d164285e1e870618a41c0da716fc3cc 100644 (file)
--- a/modules/posix_spawn
+++ b/modules/posix_spawn
@@ -6,7 +6,7 @@ lib/spawn.c
 m4/posix_spawn.m4
 
 Depends-on:
-spawn
+spawn-h
 posix_spawn-internal [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1]
 
 configure.ac:

diff --git a/modules/posix_spawn-internal b/modules/posix_spawn-internal
index b55e3fcfd0bc74e8bb9f0c2748688f7c413bdaf2..7e80c6dc15063bd3949d2d6a62ef7ffb75310198 100644 (file)
--- a/modules/posix_spawn-internal
+++ b/modules/posix_spawn-internal
@@ -7,7 +7,7 @@ lib/spawn_int.h
 m4/posix_spawn.m4
 
 Depends-on:
-spawn
+spawn-h
 alloca-opt
 dup2
 errno-h

diff --git a/modules/posix_spawn_file_actions_addchdir b/modules/posix_spawn_file_actions_addchdir
index 8f02bb5f2750d3ea5529d839815c2c3d8a6f690c..8106962c1cf613009b7a828e8e8b41e7ba02688d 100644 (file)
--- a/modules/posix_spawn_file_actions_addchdir
+++ b/modules/posix_spawn_file_actions_addchdir
@@ -8,7 +8,7 @@ lib/spawn_int.h
 m4/posix_spawn_faction_addchdir.m4
 
 Depends-on:
-spawn
+spawn-h
 posix_spawn_file_actions_init [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = 1]
 
 configure.ac:

diff --git a/modules/posix_spawn_file_actions_addclose b/modules/posix_spawn_file_actions_addclose
index 53a3b232a67b9dc900a51c82ff3104db416845cc..e7ac43130b9d41b1b5365f5817c6a5409eca346a 100644 (file)
--- a/modules/posix_spawn_file_actions_addclose
+++ b/modules/posix_spawn_file_actions_addclose
@@ -8,7 +8,7 @@ lib/spawn_int.h
 m4/posix_spawn.m4
 
 Depends-on:
-spawn
+spawn-h
 getdtablesize                 [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = 1]
 posix_spawn_file_actions_init [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = 1]
 

diff --git a/modules/posix_spawn_file_actions_adddup2 b/modules/posix_spawn_file_actions_adddup2
index 367a7519492c809234bf5854f1875db8467d5f95..e040a30a6b6de821a145a3a49b3a16f6cfec378f 100644 (file)
--- a/modules/posix_spawn_file_actions_adddup2
+++ b/modules/posix_spawn_file_actions_adddup2
@@ -8,7 +8,7 @@ lib/spawn_int.h
 m4/posix_spawn.m4
 
 Depends-on:
-spawn
+spawn-h
 getdtablesize                 [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = 1]
 posix_spawn_file_actions_init [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = 1]
 

diff --git a/modules/posix_spawn_file_actions_addfchdir b/modules/posix_spawn_file_actions_addfchdir
index 4f15fdf2df6a6b299770d6444c71818879a78291..a12a394326d87999a0d6e0d01ea1d212b3928623 100644 (file)
--- a/modules/posix_spawn_file_actions_addfchdir
+++ b/modules/posix_spawn_file_actions_addfchdir
@@ -8,7 +8,7 @@ lib/spawn_int.h
 m4/posix_spawn_faction_addfchdir.m4
 
 Depends-on:
-spawn
+spawn-h
 posix_spawn_file_actions_init [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR = 1]
 
 configure.ac:

diff --git a/modules/posix_spawn_file_actions_addopen b/modules/posix_spawn_file_actions_addopen
index 18b547768a01de0aeeb8f9f31346ad0c5dec234e..1d60609b5db097cd0aee0d40aac13e2ff3c9f502 100644 (file)
--- a/modules/posix_spawn_file_actions_addopen
+++ b/modules/posix_spawn_file_actions_addopen
@@ -8,7 +8,7 @@ lib/spawn_int.h
 m4/posix_spawn.m4
 
 Depends-on:
-spawn
+spawn-h
 getdtablesize                 [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = 1]
 posix_spawn_file_actions_init [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = 1]
 

diff --git a/modules/posix_spawn_file_actions_destroy b/modules/posix_spawn_file_actions_destroy
index d0a3e42ffbc41efbee581c08a9400ea4932435c5..b5a60248c6587abf802bb900f6a421a4faa27261 100644 (file)
--- a/modules/posix_spawn_file_actions_destroy
+++ b/modules/posix_spawn_file_actions_destroy
@@ -7,7 +7,7 @@ lib/spawn_faction_destroy.c
 m4/posix_spawn.m4
 
 Depends-on:
-spawn
+spawn-h
 
 configure.ac:
 gl_POSIX_SPAWN

diff --git a/modules/posix_spawn_file_actions_init b/modules/posix_spawn_file_actions_init
index 1b9a87dc17198f4d10babaa21f1213b14c0c445e..7afe8b3138874971586643fff3c7dd2a3da6ce9d 100644 (file)
--- a/modules/posix_spawn_file_actions_init
+++ b/modules/posix_spawn_file_actions_init
@@ -8,7 +8,7 @@ lib/spawn_int.h
 m4/posix_spawn.m4
 
 Depends-on:
-spawn
+spawn-h
 
 configure.ac:
 gl_POSIX_SPAWN

diff --git a/modules/posix_spawnattr_destroy b/modules/posix_spawnattr_destroy
index 751981b1cae47952822c3c4056d78021b3765ddc..423d70f34e2b7bc79dee878d40ad981eafa7d3e1 100644 (file)
--- a/modules/posix_spawnattr_destroy
+++ b/modules/posix_spawnattr_destroy
@@ -7,7 +7,7 @@ lib/spawnattr_destroy.c
 m4/posix_spawn.m4
 
 Depends-on:
-spawn
+spawn-h
 
 configure.ac:
 gl_POSIX_SPAWN

diff --git a/modules/posix_spawnattr_getflags b/modules/posix_spawnattr_getflags
index 8cbbfcc1e258a739d7bfc0f39c2d01014008eda6..d5f18a25c3a5d2d7430c022f2a4b0dbdc17df41c 100644 (file)
--- a/modules/posix_spawnattr_getflags
+++ b/modules/posix_spawnattr_getflags
@@ -7,7 +7,7 @@ lib/spawnattr_getflags.c
 m4/posix_spawn.m4
 
 Depends-on:
-spawn
+spawn-h
 
 configure.ac:
 gl_POSIX_SPAWN

diff --git a/modules/posix_spawnattr_getpgroup b/modules/posix_spawnattr_getpgroup
index 9738eec832d378abea7aa0a8311d9d3207cca3c4..3a3d4e916e46a82b7715b49ca2aaf5e732f9d394 100644 (file)
--- a/modules/posix_spawnattr_getpgroup
+++ b/modules/posix_spawnattr_getpgroup
@@ -7,7 +7,7 @@ lib/spawnattr_getpgroup.c
 m4/posix_spawn.m4
 
 Depends-on:
-spawn
+spawn-h
 
 configure.ac:
 gl_POSIX_SPAWN

diff --git a/modules/posix_spawnattr_getschedparam b/modules/posix_spawnattr_getschedparam
index 3a2ba00a1dba5426d980b2cd954d1f29d1d462aa..b40ed87e5c7d3408cbc51bceab9fe355c168622e 100644 (file)
--- a/modules/posix_spawnattr_getschedparam
+++ b/modules/posix_spawnattr_getschedparam
@@ -7,7 +7,7 @@ lib/spawnattr_getschedparam.c
 m4/posix_spawn.m4
 
 Depends-on:
-spawn
+spawn-h
 
 configure.ac:
 gl_POSIX_SPAWN

diff --git a/modules/posix_spawnattr_getschedpolicy b/modules/posix_spawnattr_getschedpolicy
index a09fe7eb76fecc6f18ea946e22087a578a4a3aca..ec7bd8bb4df0ec08e5f99dad62082d2ba5844266 100644 (file)
--- a/modules/posix_spawnattr_getschedpolicy
+++ b/modules/posix_spawnattr_getschedpolicy
@@ -7,7 +7,7 @@ lib/spawnattr_getschedpolicy.c
 m4/posix_spawn.m4
 
 Depends-on:
-spawn
+spawn-h
 
 configure.ac:
 gl_POSIX_SPAWN

diff --git a/modules/posix_spawnattr_getsigdefault b/modules/posix_spawnattr_getsigdefault
index a9672e241c2699bb65648cc83216de825638d307..f2647a9b913c1702f8e93d2ee91708af0b22aea9 100644 (file)
--- a/modules/posix_spawnattr_getsigdefault
+++ b/modules/posix_spawnattr_getsigdefault
@@ -7,7 +7,7 @@ lib/spawnattr_getdefault.c
 m4/posix_spawn.m4
 
 Depends-on:
-spawn
+spawn-h
 
 configure.ac:
 gl_POSIX_SPAWN

diff --git a/modules/posix_spawnattr_getsigmask b/modules/posix_spawnattr_getsigmask
index 608127f2990fae1a93624b57417a752c4182df94..b7ac254b5a7690d7fcb5a4e70e77235ecd01f119 100644 (file)
--- a/modules/posix_spawnattr_getsigmask
+++ b/modules/posix_spawnattr_getsigmask
@@ -7,7 +7,7 @@ lib/spawnattr_getsigmask.c
 m4/posix_spawn.m4
 
 Depends-on:
-spawn
+spawn-h
 
 configure.ac:
 gl_POSIX_SPAWN

diff --git a/modules/posix_spawnattr_init b/modules/posix_spawnattr_init
index d564b73e596c80e1f1756485640dbb79d8877e86..24473d448b4ee2b5ce42e7d98e53005d149a593d 100644 (file)
--- a/modules/posix_spawnattr_init
+++ b/modules/posix_spawnattr_init
@@ -7,7 +7,7 @@ lib/spawnattr_init.c
 m4/posix_spawn.m4
 
 Depends-on:
-spawn
+spawn-h
 
 configure.ac:
 gl_POSIX_SPAWN

diff --git a/modules/posix_spawnattr_setflags b/modules/posix_spawnattr_setflags
index 9b0135906174605afe951e066a69bb3ff1ec45a9..0875319f73502db746e0e5cbc9e88320b6eb8de4 100644 (file)
--- a/modules/posix_spawnattr_setflags
+++ b/modules/posix_spawnattr_setflags
@@ -7,7 +7,7 @@ lib/spawnattr_setflags.c
 m4/posix_spawn.m4
 
 Depends-on:
-spawn
+spawn-h
 
 configure.ac:
 gl_POSIX_SPAWN

diff --git a/modules/posix_spawnattr_setpgroup b/modules/posix_spawnattr_setpgroup
index 70f78684c1f6ad917a41e212892babd5051a7627..0b5d030d4a961d81620cfc5b1c4d9a057f7667a6 100644 (file)
--- a/modules/posix_spawnattr_setpgroup
+++ b/modules/posix_spawnattr_setpgroup
@@ -6,7 +6,7 @@ lib/spawnattr_setpgroup.c
 m4/posix_spawn.m4
 
 Depends-on:
-spawn
+spawn-h
 
 configure.ac:
 gl_POSIX_SPAWN

diff --git a/modules/posix_spawnattr_setschedparam b/modules/posix_spawnattr_setschedparam
index 3bb0ff7248461b07881c5c9707e3fb1c9ebd49c4..94e3a45f8f815f7500ecdccc1e70b16942d4d8fe 100644 (file)
--- a/modules/posix_spawnattr_setschedparam
+++ b/modules/posix_spawnattr_setschedparam
@@ -7,7 +7,7 @@ lib/spawnattr_setschedparam.c
 m4/posix_spawn.m4
 
 Depends-on:
-spawn
+spawn-h
 
 configure.ac:
 gl_POSIX_SPAWN

diff --git a/modules/posix_spawnattr_setschedpolicy b/modules/posix_spawnattr_setschedpolicy
index d6944e23445f70aeedbec85cb93d0b104041c757..c0c04d7d56b4a0c097d90fbd529e804278b3b630 100644 (file)
--- a/modules/posix_spawnattr_setschedpolicy
+++ b/modules/posix_spawnattr_setschedpolicy
@@ -7,7 +7,7 @@ lib/spawnattr_setschedpolicy.c
 m4/posix_spawn.m4
 
 Depends-on:
-spawn
+spawn-h
 
 configure.ac:
 gl_POSIX_SPAWN

diff --git a/modules/posix_spawnattr_setsigdefault b/modules/posix_spawnattr_setsigdefault
index e6aa9dd37cc8b82eba4e234d7d05ed7668c4610d..521dce65a3b6e9676fa635efa45643036bb17ad8 100644 (file)
--- a/modules/posix_spawnattr_setsigdefault
+++ b/modules/posix_spawnattr_setsigdefault
@@ -7,7 +7,7 @@ lib/spawnattr_setdefault.c
 m4/posix_spawn.m4
 
 Depends-on:
-spawn
+spawn-h
 
 configure.ac:
 gl_POSIX_SPAWN

diff --git a/modules/posix_spawnattr_setsigmask b/modules/posix_spawnattr_setsigmask
index 2f0b3f4a30db597660944b7b036cbe0195b3dca3..9f06eb71a8b3c90a9848e4f3e65bdc90ebcd0f20 100644 (file)
--- a/modules/posix_spawnattr_setsigmask
+++ b/modules/posix_spawnattr_setsigmask
@@ -7,7 +7,7 @@ lib/spawnattr_setsigmask.c
 m4/posix_spawn.m4
 
 Depends-on:
-spawn
+spawn-h
 
 configure.ac:
 gl_POSIX_SPAWN

diff --git a/modules/posix_spawnp b/modules/posix_spawnp
index 3cd07212872664462df2afe1d38a72a0117c2c1e..d53b860c5c9e77f3a71e46a456b6fe87e8578dab 100644 (file)
--- a/modules/posix_spawnp
+++ b/modules/posix_spawnp
@@ -6,7 +6,7 @@ lib/spawnp.c
 m4/posix_spawn.m4
 
 Depends-on:
-spawn
+spawn-h
 posix_spawn-internal [test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1]
 
 configure.ac:

diff --git a/modules/posixcheck b/modules/posixcheck
index dfb047929a82d0c673054c0821abdc9d92e435ee..48791e56791cb2d57512ee7cfde903cce155816a 100644 (file)
--- a/modules/posixcheck
+++ b/modules/posixcheck
@@ -27,7 +27,7 @@ pty-h
 sched-h
 search-h
 signal-h
-spawn
+spawn-h
 stdio
 stdlib
 string

diff --git a/modules/spawn b/modules/spawn
index e096e11a237d2b00c0ce04d250b39a5693b7f138..8f6ac9398d77628878f7ef48b58ef4fbd75525c7 100644 (file)
--- a/modules/spawn
+++ b/modules/spawn
@@ -1,79 +1,20 @@
 Description:
 A POSIX compliant <spawn.h>.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'spawn-h' instead.
+
 Files:
-lib/spawn.in.h
-m4/spawn_h.m4
-m4/pid_t.m4
 
 Depends-on:
-gen-header
-include_next
-sched-h
-signal-h
-snippet/arg-nonnull
-snippet/c++defs
-snippet/warn-on-use
+spawn-h
 
 configure.ac:
-gl_SPAWN_H
-gl_SPAWN_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P
 
 Makefile.am:
-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 $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-@NMD@  $(AM_V_GEN)$(MKDIR_P) '%reldir%'
-       $(gl_V_at)$(SED_HEADER_STDOUT) \
-             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-             -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' \
-             -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT)/g' \
-             -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)/g' \
-             -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)/g' \
-             -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)/g' \
-             -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR)/g' \
-             -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)/g' \
-             -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY)/g' \
-             -e 's/@''GNULIB_POSIX_SPAWNATTR_INIT''@/$(GNULIB_POSIX_SPAWNATTR_INIT)/g' \
-             -e 's/@''GNULIB_POSIX_SPAWNATTR_GETFLAGS''@/$(GNULIB_POSIX_SPAWNATTR_GETFLAGS)/g' \
-             -e 's/@''GNULIB_POSIX_SPAWNATTR_SETFLAGS''@/$(GNULIB_POSIX_SPAWNATTR_SETFLAGS)/g' \
-             -e 's/@''GNULIB_POSIX_SPAWNATTR_GETPGROUP''@/$(GNULIB_POSIX_SPAWNATTR_GETPGROUP)/g' \
-             -e 's/@''GNULIB_POSIX_SPAWNATTR_SETPGROUP''@/$(GNULIB_POSIX_SPAWNATTR_SETPGROUP)/g' \
-             -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM''@/$(GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM)/g' \
-             -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM''@/$(GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM)/g' \
-             -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY''@/$(GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY)/g' \
-             -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY''@/$(GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY)/g' \
-             -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT''@/$(GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT)/g' \
-             -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT''@/$(GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT)/g' \
-             -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSIGMASK''@/$(GNULIB_POSIX_SPAWNATTR_GETSIGMASK)/g' \
-             -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|@''HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR''@|$(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)|g' \
-             -e 's|@''HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR''@|$(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR)|g' \
-             -e 's|@''REPLACE_POSIX_SPAWN''@|$(REPLACE_POSIX_SPAWN)|g' \
-             -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)|g' \
-             -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)|g' \
-             -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)|g' \
-             -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR)|g' \
-             -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)|g' \
-             -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
-       $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += spawn.h spawn.h-t
 
 Include:
 <spawn.h>
@@ -82,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-glibc

diff --git a/modules/spawn-c++-tests b/modules/spawn-c++-tests
deleted file mode 100644 (file)
index 1ee6404..0000000
--- a/modules/spawn-c++-tests
+++ /dev/null
@@ -1,19 +0,0 @@
-Files:
-tests/test-spawn-c++.cc
-tests/signature.h
-
-Status:
-c++-test
-
-Depends-on:
-ansi-c++-opt
-
-configure.ac:
-
-Makefile.am:
-if ANSICXX
-TESTS += test-spawn-c++
-check_PROGRAMS += test-spawn-c++
-test_spawn_c___SOURCES = test-spawn-c++.cc
-test_spawn_c___LDADD = $(LDADD) $(LIBINTL) $(NANOSLEEP_LIB)
-endif

diff --git a/modules/spawn-h b/modules/spawn-h
new file mode 100644 (file)
index 0000000..e096e11
--- /dev/null
+++ b/modules/spawn-h
@@ -0,0 +1,85 @@
+Description:
+A POSIX compliant <spawn.h>.
+
+Files:
+lib/spawn.in.h
+m4/spawn_h.m4
+m4/pid_t.m4
+
+Depends-on:
+gen-header
+include_next
+sched-h
+signal-h
+snippet/arg-nonnull
+snippet/c++defs
+snippet/warn-on-use
+
+configure.ac:
+gl_SPAWN_H
+gl_SPAWN_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+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 $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+@NMD@  $(AM_V_GEN)$(MKDIR_P) '%reldir%'
+       $(gl_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+             -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' \
+             -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT)/g' \
+             -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)/g' \
+             -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)/g' \
+             -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)/g' \
+             -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR)/g' \
+             -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)/g' \
+             -e 's/@''GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY''@/$(GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY)/g' \
+             -e 's/@''GNULIB_POSIX_SPAWNATTR_INIT''@/$(GNULIB_POSIX_SPAWNATTR_INIT)/g' \
+             -e 's/@''GNULIB_POSIX_SPAWNATTR_GETFLAGS''@/$(GNULIB_POSIX_SPAWNATTR_GETFLAGS)/g' \
+             -e 's/@''GNULIB_POSIX_SPAWNATTR_SETFLAGS''@/$(GNULIB_POSIX_SPAWNATTR_SETFLAGS)/g' \
+             -e 's/@''GNULIB_POSIX_SPAWNATTR_GETPGROUP''@/$(GNULIB_POSIX_SPAWNATTR_GETPGROUP)/g' \
+             -e 's/@''GNULIB_POSIX_SPAWNATTR_SETPGROUP''@/$(GNULIB_POSIX_SPAWNATTR_SETPGROUP)/g' \
+             -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM''@/$(GNULIB_POSIX_SPAWNATTR_GETSCHEDPARAM)/g' \
+             -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM''@/$(GNULIB_POSIX_SPAWNATTR_SETSCHEDPARAM)/g' \
+             -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY''@/$(GNULIB_POSIX_SPAWNATTR_GETSCHEDPOLICY)/g' \
+             -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY''@/$(GNULIB_POSIX_SPAWNATTR_SETSCHEDPOLICY)/g' \
+             -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT''@/$(GNULIB_POSIX_SPAWNATTR_GETSIGDEFAULT)/g' \
+             -e 's/@''GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT''@/$(GNULIB_POSIX_SPAWNATTR_SETSIGDEFAULT)/g' \
+             -e 's/@''GNULIB_POSIX_SPAWNATTR_GETSIGMASK''@/$(GNULIB_POSIX_SPAWNATTR_GETSIGMASK)/g' \
+             -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|@''HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR''@|$(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)|g' \
+             -e 's|@''HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR''@|$(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR)|g' \
+             -e 's|@''REPLACE_POSIX_SPAWN''@|$(REPLACE_POSIX_SPAWN)|g' \
+             -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR)|g' \
+             -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE)|g' \
+             -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2)|g' \
+             -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR)|g' \
+             -e 's|@''REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN''@|$(REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN)|g' \
+             -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
+       $(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += spawn.h spawn.h-t
+
+Include:
+<spawn.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+glibc

diff --git a/modules/spawn-h-c++-tests b/modules/spawn-h-c++-tests
new file mode 100644 (file)
index 0000000..09496a8
--- /dev/null
+++ b/modules/spawn-h-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-spawn-h-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-spawn-h-c++
+check_PROGRAMS += test-spawn-h-c++
+test_spawn_h_c___SOURCES = test-spawn-h-c++.cc
+test_spawn_h_c___LDADD = $(LDADD) $(LIBINTL) $(NANOSLEEP_LIB)
+endif

diff --git a/modules/spawn-h-tests b/modules/spawn-h-tests
new file mode 100644 (file)
index 0000000..e751948
--- /dev/null
+++ b/modules/spawn-h-tests
@@ -0,0 +1,11 @@
+Files:
+tests/test-spawn-h.c
+
+Depends-on:
+spawn-h-c++-tests
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-spawn-h
+check_PROGRAMS += test-spawn-h

diff --git a/modules/spawn-pipe b/modules/spawn-pipe
index fc1046112885c5b3316199eea71cf9a13619d4a1..a1693d930b9989d655e27f01905d7cc1f910da68 100644 (file)
--- a/modules/spawn-pipe
+++ b/modules/spawn-pipe
@@ -23,7 +23,7 @@ msvc-nothrow
 open
 pipe2
 pipe2-safer
-spawn
+spawn-h
 posix_spawn
 posix_spawnp
 posix_spawn_file_actions_init

diff --git a/modules/spawn-tests b/modules/spawn-tests
deleted file mode 100644 (file)
index 056b2d8..0000000
--- a/modules/spawn-tests
+++ /dev/null
@@ -1,11 +0,0 @@
-Files:
-tests/test-spawn.c
-
-Depends-on:
-spawn-c++-tests
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-spawn
-check_PROGRAMS += test-spawn

diff --git a/tests/test-spawn-c++.cc b/tests/test-spawn-h-c++.cc
similarity index 100%
rename from tests/test-spawn-c++.cc
rename to tests/test-spawn-h-c++.cc

diff --git a/tests/test-spawn.c b/tests/test-spawn-h.c
similarity index 100%
rename from tests/test-spawn.c
rename to tests/test-spawn-h.c