Add support for disabling rpath; prepare for 0.0.3.2

10 files changed, 43 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/COPYING b/COPYING
index 8d6ae43..d49007d 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2024-2025 Laurent Bercot <ska-skaware@skarnet.org>
+Copyright (c) 2024-2026 Laurent Bercot <ska-skaware@skarnet.org>
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
diff --git a/INSTALL b/INSTALL
index 5eb5215..c6d8f9e 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.5.0 or later: https://skarnet.org/software/skalibs/
-  - s6-networking version 2.7.2.0 or later: https://skarnet.org/software/s6-networking/
+  - skalibs version 2.15.0.0 or later: https://skarnet.org/software/skalibs/
+  - 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 11d5ace..0f73af9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
 Changelog for apaste.
 
+In 0.0.3.2
+----------
+
+ - Support for disabling RPATH at configure time.
+ - Adaptation to skalibs-2.15.0.0.
+
+
 In 0.0.3.1
 ----------
 
diff --git a/configure b/configure
index 363b6b5..ee23975 100755
--- a/configure
+++ b/configure
@@ -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]
@@ -157,6 +158,7 @@ shlibext=so
 shared=false
 static=true
 allpic=true
+rpath=true
 slashpackage=false
 abspath=false
 pcw=false
@@ -210,6 +212,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 ; ;;
@@ -519,6 +523,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 c7bb1ad..200785a 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -35,11 +35,11 @@ other protocol.
  <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.5.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-networking/">s6-networking</a> version
-2.7.2.0 or later. It's a build-time and run-time requirement: it's the layer
+2.7.2.2 or later. It's a build-time and run-time requirement: it's the layer
 that provides the network connection. </li>
 </ul>
 
@@ -54,8 +54,8 @@ that provides the network connection. </li>
 
 <ul>
  <li> The current released version of apaste is
-<a href="apaste-0.0.3.1.tar.gz">0.0.3.1</a>.
-You can access its checksum <a href="apaste-0.0.3.1.tar.gz.sha256">here</a>. </li>
+<a href="apaste-0.0.3.2.tar.gz">0.0.3.2</a>.
+You can access its checksum <a href="apaste-0.0.3.2.tar.gz.sha256">here</a>. </li>
  <li> You can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/apaste/">apaste
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index b4923c1..7082438 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,14 @@
 
 <h1> What has changed in apaste </h1>
 
+<h2> in 0.0.3.2 </h2>
+
+<ul>
+ <li> Support for disabling RPATH at configure time. </li>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.15.0.0. </li>
+</ul>
+
 <h2> in 0.0.3.1 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 38abac2..191e33a 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=apaste
-version=0.0.3.1
+version=0.0.3.2
 category=web
 package_macro_name=APASTE
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