From fc79d035ccc4c1a5da26bbd780aeb7e0a0afebf5 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Fri, 14 Aug 2020 13:36:30 -0700 Subject: [PATCH] test_ca: Look for libsofthsm2.so in /usr/${libdir}/softhsm too Signed-off-by: Matt Turner --- src/external/test_ca.m4 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/external/test_ca.m4 b/src/external/test_ca.m4 index 4d45a5a16..d318789bc 100644 --- a/src/external/test_ca.m4 +++ b/src/external/test_ca.m4 @@ -33,9 +33,10 @@ AC_DEFUN([AM_CHECK_TEST_CA], AM_CONDITIONAL([BUILD_TEST_CA], [test -x "$OPENSSL" -a -x "$SSH_KEYGEN" -a -x "$CERTUTIL" -a -x "$PK12UTIL"]) else - for p in /usr/lib64/pkcs11/libsofthsm2.so /usr/lib/pkcs11/libsofthsm2.so /usr/lib/x86_64-linux-gnu/softhsm/libsofthsm2.so; do - if test -f "${p}"; then - SOFTHSM2_PATH="${p}" + for p in /usr/lib{64,}/{softhsm,pkcs11} /usr/lib/x86_64-linux-gnu/softhsm; do + f="${p}/libsofthsm2.so" + if test -f "${f}"; then + SOFTHSM2_PATH="${f}" break; fi done -- 2.26.2