Add support for disabling rpath; update deps

8 files changed, 31 insertions, 10 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 36862cf..2dce67d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,9 +6,9 @@ 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/
+  - skalibs version 2.15.0.0 or later: https://skarnet.org/software/skalibs/
   - s6 version 2.15.0.0 or later: https://skarnet.org/software/s6/
-  - s6-networking version 2.7.2.1 or later: https://skarnet.org/software/s6-networking/
+  - s6-networking version 2.7.2.2 or later: https://skarnet.org/software/s6-networking/
 
  This software will run on any operating system that implements
 POSIX.1-2024, available at:
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 0144c50..0551907 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ Changelog for smtpd-starttls-proxy.
 In 0.1.0.0
 ----------
 
+ - Support for disabling RPATH at configure time.
+ - Adaptation to skalibs-2.15.0.0.
  - New binary: qmail-remote. Comes with a qmail-remote-io helper.
 This is a full implementation of qmail's SMTP client.
 
diff --git a/configure b/configure
index b1f3565..241a8ad 100755
--- a/configure
+++ b/configure
@@ -46,6 +46,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]
@@ -154,6 +155,7 @@ shlibext=so
 shared=false
 static=true
 allpic=true
+rpath=true
 slashpackage=false
 abspath=false
 pcw=false
@@ -204,6 +206,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 ; ;;
@@ -510,6 +514,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 c6db2ac..52f85a6 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -34,16 +34,16 @@ inetd-like mail servers that do not already support it.
  <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/s6/">s6</a> version
 2.15.0.0 or later. It's a build-time and run-time requirement. </li>
  <li> <a href="//skarnet.org/software/s6-dns/">s6-dns</a> version
-2.4.1.1 or later. It's a build-time requirement. It's also a run-time requirement
+2.4.1.2 or later. It's a build-time requirement. It's also a run-time requirement
 if you link against the shared version of the s6-dns library. </li>
  <li> <a href="//skarnet.org/software/s6-networking/">s6-networking</a> version
-2.7.2.1 or later. It's a build-time and run-time requirement. </li>
+2.7.2.2 or later. It's a build-time and run-time requirement. </li>
 </ul>
 
 <h3> Licensing </h3>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 2720b16..4e3e27d 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -21,13 +21,14 @@
 <h2> in 0.1.0.0 </h2>
 
 <ul>
+ <li> Support for disabling RPATH at configure time. </li>
  <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>
- <li> New dependency: <a href="//skarnet.org/software/s6-dns/">s6-dns</a> 2.4.1.1 </li>
+ <li> New dependency: <a href="//skarnet.org/software/s6-dns/">s6-dns</a> 2.4.1.2 </li>
  <li> <a href="//skarnet.org/software/s6-networking/">s6-networking</a>
-dependency bumped to 2.7.2.1 and made mandatory. </li>
+dependency bumped to 2.7.2.2 and made mandatory. </li>
 </ul>
 
 <h2> in 0.0.2.1 </h2>
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