Add support for disabling rpath; update deps

9 files changed, 27 insertions, 9 deletions

diff --git a/CONTRIBUTING b/CONTRIBUTING
index 3173998..bc10b3c 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -10,7 +10,7 @@
 
  * I, the contributor, am the copyright owner of these changes
  * I submit these changes according to the project's license
-with no additionam requirements
+with no additional requirements
  * I understand these changes in full and will be able to respond
 to review comments.
 
diff --git a/INSTALL b/INSTALL
index 3986a5b..d1ce0af 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,8 +6,8 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.14.6.0 or later: https://skarnet.org/software/skalibs/
-  - execline version 2.9.8.1 or later: https://skarnet.org/software/execline/
+  - skalibs version 2.15.0.0 or later: https://skarnet.org/software/skalibs/
+  - execline version 2.9.8.2 or later: https://skarnet.org/software/execline/
   - s6 version 2.15.0.0 or later: https://skarnet.org/software/s6/
 
  This software will run on any operating system that implements
diff --git a/Makefile b/Makefile
index f519a87..c1197b1 100644
--- a/Makefile
+++ b/Makefile
@@ -188,7 +188,7 @@ lib%.a.xyzzy:
 	exec $(RANLIB) $@
 
 lib%.so.xyzzy:
-	exec $(CC) -o $@ $(CFLAGS_ALL) $(CFLAGS_SHARED) $(LDFLAGS_ALL) $(LDFLAGS_SHARED) -Wl,-soname,$(patsubst lib%.so.xyzzy,lib%.so.$(version_M),$@) -Wl,-rpath=$(dynlibdir) $^ $(EXTRA_LIBS) $(LDLIBS)
+	exec $(CC) -o $@ $(CFLAGS_ALL) $(CFLAGS_SHARED) $(LDFLAGS_ALL) $(LDFLAGS_SHARED) -Wl,-soname,$(patsubst lib%.so.xyzzy,lib%.so.$(version_M),$@) $(LDFLAGS_RPATH) $^ $(EXTRA_LIBS) $(LDLIBS)
 
 -lskarnet:
 	$(error Unable to link against skalibs. Check that you are using the correct --with-lib or --with-dynlib options; see ./configure --help)
diff --git a/NEWS b/NEWS
index fad46fa..7728a88 100644
--- a/NEWS
+++ b/NEWS
@@ -3,8 +3,8 @@ Changelog for s6-rc.
 In 0.6.0.1
 ----------
 
- - Adaptation to s6-2.15.0.0.
  - Bugfixes.
+ - Adaptation to s6-2.15.0.0.
 
 
 In 0.6.0.0
diff --git a/configure b/configure
index 28e9bc5..20dc82b 100755
--- a/configure
+++ b/configure
@@ -48,6 +48,7 @@ Optional features:
   --disable-allstatic           do not prefer linking against static libraries [enabled]
   --enable-static-libc          make entirely static binaries [disabled]
   --disable-all-pic             do not build executables or static libs as PIC [enabled]
+  --disable-rpath               do not embed RPATH in libraries [enabled]
   --enable-pkgconfig            Build and install .pc files for pkg-config [disabled]
   --enable-slashpackage[=ROOT]  assume /package installation at ROOT [disabled]
   --enable-absolute-paths       hardcode absolute BINDIR/foobar paths in binaries [disabled]
@@ -155,6 +156,7 @@ shlibext=so
 shared=false
 static=true
 allpic=true
+rpath=true
 slashpackage=false
 abspath=false
 pcw=false
@@ -206,6 +208,8 @@ for arg ; do
     --disable-static-libc|--enable-static-libc=no) evenmorestatic=false ;;
     --enable-all-pic|--enable-all-pic=yes) allpic=true ;;
     --disable-all-pic|--enable-all-pic=no) allpic=false ;;
+    --enable-rpath|--enable-rpath=yes) rpath=true ;;
+    --disable-rpath|--enable-rpath=no) rpath=false ;;
     --enable-pkgconfig|--enable-pkgconfig=yes) pcw=true ;;
     --disable-pkgconfig|--enable-pkgconfig=no) pcw=false ;;
     --enable-slashpackage=*) sproot=${arg#*=} ; slashpackage=true ; ;;
@@ -513,6 +517,11 @@ if $shared ; then
 else
   echo "DO_SHARED :="
 fi
+if $rpath ; then
+  echo "LDFLAGS_RPATH := -Wl,-rpath=${dynlibdir}"
+else
+  echo "LDFLAGS_RPATH :="
+fi
 if $pcw ; then
   echo "DO_PKGCONFIG := 1"
 else
diff --git a/doc/index.html b/doc/index.html
index 98237c4..838ec9c 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -49,10 +49,10 @@ scripts are also run in a controlled environment.
  <li> A POSIX-compliant system with a standard C development environment </li>
  <li> GNU make, version 3.81 or later </li>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.14.6.0 or later. It's a build-time requirement. It's also a run-time
+2.15.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>
  <li> <a href="//skarnet.org/software/execline/">execline</a> version
-2.9.8.1 or later. It's a build-time <em>and</em> run-time requirement. </li>
+2.9.8.2 or later. It's a build-time <em>and</em> run-time requirement. </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a> version
 2.15.0.0 or later. It's a build-time <em>and</em> run-time requirement. </li>
 </ul>
diff --git a/doc/overview.html b/doc/overview.html
index 45ebdbe..0419feb 100644
--- a/doc/overview.html
+++ b/doc/overview.html
@@ -228,7 +228,7 @@ calling <a href="s6-rc-compile.html">s6-rc-compile</a>. The
 databases to add bundles to them, or delete bundles from them.
 </p>
 
-<h2> Management of source definition directories <h2>
+<h2> Management of source definition directories </h2>
 
 <p>
  Starting with version 0.6.0.0, s6-rc provides tools to help users
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 57e2b84..6a7cdf6 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -34,7 +34,7 @@ minor and bugfix version changes.
 
 <ul>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
-dependency bumped to 2.14.6.0. </li>
+dependency bumped to 2.15.0.0. </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a>
 dependency bumped to 2.15.0.0. </li>
 </ul>
diff --git a/tools/configure.template b/tools/configure.template
index ac8ac86..b693f5c 100755
--- a/tools/configure.template
+++ b/tools/configure.template
@@ -45,6 +45,7 @@ Optional features:
   --disable-allstatic           do not prefer linking against static libraries [enabled]
   --enable-static-libc          make entirely static binaries [disabled]
   --disable-all-pic             do not build executables or static libs as PIC [enabled]
+  --disable-rpath               do not embed RPATH in libraries [enabled]
   --enable-pkgconfig            Build and install .pc files for pkg-config [disabled]
   --enable-slashpackage[=ROOT]  assume /package installation at ROOT [disabled]
   --enable-absolute-paths       hardcode absolute BINDIR/foobar paths in binaries [disabled]
@@ -151,6 +152,7 @@ shlibext=so
 shared=false
 static=true
 allpic=true
+rpath=true
 slashpackage=false
 abspath=false
 pcw=false
@@ -199,6 +201,8 @@ for arg ; do
     --disable-static-libc|--enable-static-libc=no) evenmorestatic=false ;;
     --enable-all-pic|--enable-all-pic=yes) allpic=true ;;
     --disable-all-pic|--enable-all-pic=no) allpic=false ;;
+    --enable-rpath|--enable-rpath=yes) rpath=true ;;
+    --disable-rpath|--enable-rpath=no) rpath=false ;;
     --enable-pkgconfig|--enable-pkgconfig=yes) pcw=true ;;
     --disable-pkgconfig|--enable-pkgconfig=no) pcw=false ;;
     --enable-slashpackage=*) sproot=${arg#*=} ; slashpackage=true ; ;;
@@ -502,6 +506,11 @@ if $shared ; then
 else
   echo "DO_SHARED :="
 fi
+if $rpath ; then
+  echo "LDFLAGS_RPATH := -Wl,-rpath=${dynlibdir}"
+else
+  echo "LDFLAGS_RPATH :="
+fi
 if $pcw ; then
   echo "DO_PKGCONFIG := 1"
 else