Add spawn_lib support

17 files changed, 34 insertions, 17 deletions

diff --git a/INSTALL b/INSTALL
index fd30611..0044aab 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.3.10.0 or later: http://skarnet.org/software/skalibs/
+  - skalibs version 2.4.0.0 or later: http://skarnet.org/software/skalibs/
 
  This software will run on any operating system that implements
 POSIX.1-2008, available at:
diff --git a/configure b/configure
index 85148a3..32f7ab2 100755
--- a/configure
+++ b/configure
@@ -289,7 +289,7 @@ if [ "x$target" != "x$(cat $sysdeps/target)" ] ; then
   exit 1
 fi
 
-rt_lib=$(cat $sysdeps/rt.lib)
+spawn_lib=$(cat $sysdeps/spawn.lib)
 socket_lib=$(cat $sysdeps/socket.lib)
 sysclock_lib=$(cat $sysdeps/sysclock.lib)
 tainnow_lib=$(cat $sysdeps/tainnow.lib)
@@ -364,7 +364,7 @@ sproot := $sproot
 version := $version
 home := $home
 exthome := $exthome
-RT_LIB := ${rt_lib}
+SPAWN_LIB := ${spawn_lib}
 SOCKET_LIB := ${socket_lib}
 SYSCLOCK_LIB := ${sysclock_lib}
 TAINNOW_LIB := ${tainnow_lib}
diff --git a/doc/index.html b/doc/index.html
index dc6a016..fa4764b 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -51,7 +51,7 @@ shell's syntax, and has no security issues.
  <li> A POSIX-compliant system with a standard C development environment </li>
  <li> GNU make, version 3.81 or later. </li>
  <li> <a href="http://skarnet.org/software/skalibs/">skalibs</a> version
-2.3.10.0 or later. It's a build-time requirement. It's also a run-time
+2.4.0.0 or later. It's a build-time requirement. It's also a run-time
 requirement if you link against the shared version of the skalibs
 library. </li>
 </ul>
@@ -66,7 +66,7 @@ library. </li>
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of execline is <a href="execline-2.1.5.0.tar.gz">2.1.5.0</a>. </li>
+ <li> The current released version of execline is <a href="execline-2.2.0.0.tar.gz">2.2.0.0</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="http://git.skarnet.org/cgi-bin/cgit.cgi/execline/">execline
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 7b51c28..622a8a0 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,12 @@
 
 <h1> What has changed in execline </h1>
 
+<h2> in 2.2.0.0 </h2>
+
+<ul>
+ <li> skalibs dependency bumped to 2.4.0.0 </li>
+</ul>
+
 <h2> in 2.1.5.0 </h2>
 
 <ul>
diff --git a/package/deps.mak b/package/deps.mak
index 88138b3..709808d 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -72,9 +72,9 @@ src/libexecline/exlsn_import.o src/libexecline/exlsn_import.lo: src/libexecline/
 src/libexecline/exlsn_main.o src/libexecline/exlsn_main.lo: src/libexecline/exlsn_main.c src/include/execline/execline.h src/include-local/exlsn.h
 src/libexecline/exlsn_multidefine.o src/libexecline/exlsn_multidefine.lo: src/libexecline/exlsn_multidefine.c src/include/execline/execline.h src/include-local/exlsn.h
 
-background: EXTRA_LIBS :=
+background: EXTRA_LIBS := ${SPAWN_LIB}
 background: src/execline/background.o ${LIBEXECLINE} -lskarnet
-backtick: EXTRA_LIBS :=
+backtick: EXTRA_LIBS := ${SPAWN_LIB}
 backtick: src/execline/backtick.o ${LIBEXECLINE} -lskarnet
 cd: EXTRA_LIBS :=
 cd: src/execline/cd.o -lskarnet
@@ -112,9 +112,9 @@ forbacktickx: EXTRA_LIBS :=
 forbacktickx: src/execline/forbacktickx.o -lskarnet
 foreground: EXTRA_LIBS :=
 foreground: src/execline/foreground.o ${LIBEXECLINE} -lskarnet
-forstdin: EXTRA_LIBS :=
+forstdin: EXTRA_LIBS := ${SPAWN_LIB}
 forstdin: src/execline/forstdin.o ${LIBEXECLINE} -lskarnet
-forx: EXTRA_LIBS :=
+forx: EXTRA_LIBS := ${SPAWN_LIB}
 forx: src/execline/forx.o ${LIBEXECLINE} -lskarnet
 getcwd: EXTRA_LIBS :=
 getcwd: src/execline/getcwd.o -lskarnet
@@ -124,25 +124,25 @@ heredoc: EXTRA_LIBS :=
 heredoc: src/execline/heredoc.o -lskarnet
 homeof: EXTRA_LIBS :=
 homeof: src/execline/homeof.o -lskarnet
-if: EXTRA_LIBS :=
+if: EXTRA_LIBS := ${SPAWN_LIB}
 if: src/execline/if.o ${LIBEXECLINE} -lskarnet
-ifelse: EXTRA_LIBS :=
+ifelse: EXTRA_LIBS := ${SPAWN_LIB}
 ifelse: src/execline/ifelse.o ${LIBEXECLINE} -lskarnet
-ifte: EXTRA_LIBS :=
+ifte: EXTRA_LIBS := ${SPAWN_LIB}
 ifte: src/execline/ifte.o ${LIBEXECLINE} -lskarnet
-ifthenelse: EXTRA_LIBS :=
+ifthenelse: EXTRA_LIBS := ${SPAWN_LIB}
 ifthenelse: src/execline/ifthenelse.o ${LIBEXECLINE} -lskarnet
 import: EXTRA_LIBS :=
 import: src/execline/import.o ${LIBEXECLINE} -lskarnet
 importas: EXTRA_LIBS :=
 importas: src/execline/importas.o ${LIBEXECLINE} -lskarnet
-loopwhilex: EXTRA_LIBS :=
+loopwhilex: EXTRA_LIBS := ${SPAWN_LIB}
 loopwhilex: src/execline/loopwhilex.o ${LIBEXECLINE} -lskarnet
 multidefine: EXTRA_LIBS :=
 multidefine: src/execline/multidefine.o ${LIBEXECLINE} -lskarnet
 multisubstitute: EXTRA_LIBS :=
 multisubstitute: src/execline/multisubstitute.o ${LIBEXECLINE} -lskarnet
-pipeline: EXTRA_LIBS :=
+pipeline: EXTRA_LIBS := ${SPAWN_LIB}
 pipeline: src/execline/pipeline.o ${LIBEXECLINE} -lskarnet
 piperw: EXTRA_LIBS :=
 piperw: src/execline/piperw.o -lskarnet
@@ -152,7 +152,7 @@ runblock: EXTRA_LIBS :=
 runblock: src/execline/runblock.o ${LIBEXECLINE} -lskarnet
 shift: EXTRA_LIBS :=
 shift: src/execline/shift.o ${LIBEXECLINE} -lskarnet
-trap: EXTRA_LIBS :=
+trap: EXTRA_LIBS := ${SPAWN_LIB}
 trap: src/execline/trap.o ${LIBEXECLINE} -lskarnet
 tryexec: EXTRA_LIBS :=
 tryexec: src/execline/tryexec.o ${LIBEXECLINE} -lskarnet
diff --git a/package/info b/package/info
index 08e732d..2513db2 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=execline
-version=2.1.5.0
+version=2.2.0.0
 category=admin
 package_macro_name=EXECLINE
diff --git a/src/execline/deps-exe/background b/src/execline/deps-exe/background
index 97021b5..7161673 100644
--- a/src/execline/deps-exe/background
+++ b/src/execline/deps-exe/background
@@ -1,2 +1,3 @@
 ${LIBEXECLINE}
 -lskarnet
+${SPAWN_LIB}
diff --git a/src/execline/deps-exe/backtick b/src/execline/deps-exe/backtick
index 97021b5..7161673 100644
--- a/src/execline/deps-exe/backtick
+++ b/src/execline/deps-exe/backtick
@@ -1,2 +1,3 @@
 ${LIBEXECLINE}
 -lskarnet
+${SPAWN_LIB}
diff --git a/src/execline/deps-exe/forstdin b/src/execline/deps-exe/forstdin
index 97021b5..7161673 100644
--- a/src/execline/deps-exe/forstdin
+++ b/src/execline/deps-exe/forstdin
@@ -1,2 +1,3 @@
 ${LIBEXECLINE}
 -lskarnet
+${SPAWN_LIB}
diff --git a/src/execline/deps-exe/forx b/src/execline/deps-exe/forx
index 97021b5..7161673 100644
--- a/src/execline/deps-exe/forx
+++ b/src/execline/deps-exe/forx
@@ -1,2 +1,3 @@
 ${LIBEXECLINE}
 -lskarnet
+${SPAWN_LIB}
diff --git a/src/execline/deps-exe/if b/src/execline/deps-exe/if
index 97021b5..7161673 100644
--- a/src/execline/deps-exe/if
+++ b/src/execline/deps-exe/if
@@ -1,2 +1,3 @@
 ${LIBEXECLINE}
 -lskarnet
+${SPAWN_LIB}
diff --git a/src/execline/deps-exe/ifelse b/src/execline/deps-exe/ifelse
index 97021b5..7161673 100644
--- a/src/execline/deps-exe/ifelse
+++ b/src/execline/deps-exe/ifelse
@@ -1,2 +1,3 @@
 ${LIBEXECLINE}
 -lskarnet
+${SPAWN_LIB}
diff --git a/src/execline/deps-exe/ifte b/src/execline/deps-exe/ifte
index 97021b5..7161673 100644
--- a/src/execline/deps-exe/ifte
+++ b/src/execline/deps-exe/ifte
@@ -1,2 +1,3 @@
 ${LIBEXECLINE}
 -lskarnet
+${SPAWN_LIB}
diff --git a/src/execline/deps-exe/ifthenelse b/src/execline/deps-exe/ifthenelse
index 97021b5..7161673 100644
--- a/src/execline/deps-exe/ifthenelse
+++ b/src/execline/deps-exe/ifthenelse
@@ -1,2 +1,3 @@
 ${LIBEXECLINE}
 -lskarnet
+${SPAWN_LIB}
diff --git a/src/execline/deps-exe/loopwhilex b/src/execline/deps-exe/loopwhilex
index 97021b5..7161673 100644
--- a/src/execline/deps-exe/loopwhilex
+++ b/src/execline/deps-exe/loopwhilex
@@ -1,2 +1,3 @@
 ${LIBEXECLINE}
 -lskarnet
+${SPAWN_LIB}
diff --git a/src/execline/deps-exe/pipeline b/src/execline/deps-exe/pipeline
index 97021b5..7161673 100644
--- a/src/execline/deps-exe/pipeline
+++ b/src/execline/deps-exe/pipeline
@@ -1,2 +1,3 @@
 ${LIBEXECLINE}
 -lskarnet
+${SPAWN_LIB}
diff --git a/src/execline/deps-exe/trap b/src/execline/deps-exe/trap
index 97021b5..7161673 100644
--- a/src/execline/deps-exe/trap
+++ b/src/execline/deps-exe/trap
@@ -1,2 +1,3 @@
 ${LIBEXECLINE}
 -lskarnet
+${SPAWN_LIB}