From ba9c0304144c219fcd641f8907691e6c44625e4e Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 30 Nov 2020 21:08:17 +0000
Subject:  Fix sysdep lib filling of config.mak

---
 INSTALL   |  3 +++
 configure | 10 ++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/INSTALL b/INSTALL
index e98ff41..93e7b42 100644
--- a/INSTALL
+++ b/INSTALL
@@ -113,6 +113,9 @@ configure is: --with-sysdep-K=V
  For instance, to say that the target has a working pseudorandom
 number generator in /dev/urandom, you would give the following
 option to configure: --with-sysdep-devurandom=yes
+ If there are additional arguments to the sysdep, such as linker
+flags, give them separated by commas. Example:
+--with-sysdep-posixspawn=yes,-lrt
 
  ./configure --help lists all the sysdeps you need to manually
 provide a value for when cross-compiling.
diff --git a/configure b/configure
index 48af9e5..dec5e15 100755
--- a/configure
+++ b/configure
@@ -315,7 +315,8 @@ detectlibs () {
 
 trylibs () {
   name="$1"
-  libfile="$2"
+  libvar="$2"_lib
+  libfile="$2".lib
   echo "Checking whether system has $3..."
   shift 3
   if args=`iscached $name 3>&1 1>&4 4>&-` 4>&1 ; then :
@@ -330,6 +331,7 @@ trylibs () {
     echo "${name}: no" >> ${sysdeps}/sysdeps
     echo "  ... no"
   fi
+  eval "${libvar}=\"$args\""
   echo "$args" > "${sysdeps}/$libfile"
 }
 
@@ -592,11 +594,11 @@ else
 fi
 echo "$socket_lib" > $sysdeps/socket.lib
 
-trylibs clockrt sysclock.lib 'clock_gettime()' -lrt
+trylibs clockrt sysclock 'clock_gettime()' -lrt
 choose cl clockmon CLOCK_MONOTONIC `cat "${sysdeps}/sysclock.lib"`
 choose cl clockboot CLOCK_BOOTTIME `cat "${sysdeps}/sysclock.lib"`
-trylibs posixspawn spawn.lib 'posix_spawn()' -lrt
-trylibs timer timer.lib 'timer_create()' -lrt
+trylibs posixspawn spawn 'posix_spawn()' -lrt
+trylibs timer timer 'timer_create()' -lrt
 
 tryendianness
 trytypes
-- 
cgit v1.2.3