- Fix sed script in ssldir split handling.

diff --git a/acx_nlnetlabs.m4 b/acx_nlnetlabs.m4
index ed3cdb06742e4a4814c038596368e968adb2ae19..1574f97bfe027ea92d920bf7033afa2780db659c 100644 (file)
--- a/acx_nlnetlabs.m4
+++ b/acx_nlnetlabs.m4
@@ -2,7 +2,8 @@
 # Copyright 2009, Wouter Wijngaards, NLnet Labs.   
 # BSD licensed.
 #
-# Version 42
+# Version 43
+# 2021-08-17 fix sed script in ssldir split handling.
 # 2021-08-17 fix for openssl to detect split version, with ssldir_include
 #           and ssldir_lib output directories.
 # 2021-07-30 fix for openssl use of lib64 directory.
@@ -660,11 +661,11 @@ AC_DEFUN([ACX_SSL_CHECKS], [
                        withval=""
                        ssldir_include="$ssldir"
                        dnl find the libdir
-                       ssldir_lib=`echo $ssldir | sed -e '/include/lib/'`
+                       ssldir_lib=`echo $ssldir | sed -e 's/include/lib/'`
                        if test -f "$ssldir_lib/libssl.a" -o -f "$ssldir_lib/libssl.so"; then
                                : # found here
                        else
-                               ssldir_lib=`echo $ssldir | sed -e '/include/lib64/'`
+                               ssldir_lib=`echo $ssldir | sed -e 's/include/lib64/'`
                                if test -f "$ssldir_lib/libssl.a" -o -f "$ssldir_lib/libssl.so"; then
                                        : # found here
                                else

diff --git a/configure b/configure
index 186a13bfae52374efeab5960446a32ea67cf3aed..03e8fb5fdd48c555444e22a46abf408a917fac85 100755 (executable)
--- a/configure
+++ b/configure
@@ -18007,11 +18007,11 @@ $as_echo_n "checking for SSL... " >&6; }
                        found_ssl="yes"
                        withval=""
                        ssldir_include="$ssldir"
-                                               ssldir_lib=`echo $ssldir | sed -e '/include/lib/'`
+                                               ssldir_lib=`echo $ssldir | sed -e 's/include/lib/'`
                        if test -f "$ssldir_lib/libssl.a" -o -f "$ssldir_lib/libssl.so"; then
                                : # found here
                        else
-                               ssldir_lib=`echo $ssldir | sed -e '/include/lib64/'`
+                               ssldir_lib=`echo $ssldir | sed -e 's/include/lib64/'`
                                if test -f "$ssldir_lib/libssl.a" -o -f "$ssldir_lib/libssl.so"; then
                                        : # found here
                                else

diff --git a/doc/Changelog b/doc/Changelog
index 103fb37cb49d1895cb23a05224bddebd86adab7b..c02c5d3191e553c88d6f1cef370d3fef77915e5e 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
        - Fix that --with-ssl can use "/usr/include/openssl11" to pass the
          location of a different openssl version.
        - Fix #527: not sending quad9 cert to syslog (and may be more).
+       - Fix sed script in ssldir split handling.
 
 16 August 2021: George
        - Merge PR #528 from fobser: Make sldns_str2wire_svcparam_buf()