configure.ac: Remove use of PKCS11_HELPER_LIBS in mbedTLS checks

This code was copied over and over since many years,
since commit 9a3f670248d6f519a399e65a7232e2196b5115db
("Fixed autoconf script to properly detect missing pkcs11
with polarssl"). It is unclear what exact purpose it
served back then but probably it is obsolete. It is
definitely wrong since it means that you get
PKCS11_HELPER_LIBS even if you do not specify
--enable-pkcs11.

Change-Id: I317be5253d6563906dd3826421dc81f737beba76
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Arne Schwabe <arne-openvpn@rfc2549.org>
Message-Id: <20250716151857.385959-1-frank@lichtenheld.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32187.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>

diff --git a/configure.ac b/configure.ac
index 8fc48ba93972a1d561b942a2e7300080f44c8da1..66cb79b157e8932ed224c85d332f8c3fe8811519 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -798,14 +798,6 @@ case "${with_mem_check}" in
                ;;
 esac
 
-PKG_CHECK_MODULES(
-       [PKCS11_HELPER],
-       [libpkcs11-helper-1 >= 1.11],
-       [have_pkcs11_helper="yes"],
-       []
-)
-
-
 if test "$enable_dco" != "no"; then
        enable_dco_arg="$enable_dco"
        if test "${enable_iproute2}" = "yes"; then
@@ -1014,13 +1006,12 @@ elif test "${with_crypto_library}" = "mbedtls"; then
                                [mbedtls_ssl_init],
                                [MBEDTLS_LIBS="-lmbedtls -lmbedx509 -lmbedcrypto"],
                                [AC_MSG_ERROR([Could not find mbed TLS.])],
-                               [${PKCS11_HELPER_LIBS}]
                        )
                fi
        fi
 
-       CFLAGS="${MBEDTLS_CFLAGS} ${PKCS11_HELPER_CFLAGS} ${CFLAGS}"
-       LIBS="${MBEDTLS_LIBS} ${PKCS11_HELPER_LIBS} ${LIBS}"
+       CFLAGS="${MBEDTLS_CFLAGS} ${CFLAGS}"
+       LIBS="${MBEDTLS_LIBS} ${LIBS}"
 
        AC_MSG_CHECKING([mbedtls version])
        AC_COMPILE_IFELSE(
@@ -1359,7 +1350,12 @@ fi
 
 AM_CONDITIONAL([HAVE_SOFTHSM2], [false])
 if test "${enable_pkcs11}" = "yes"; then
-       test "${have_pkcs11_helper}" != "yes" && AC_MSG_ERROR([PKCS11 enabled but libpkcs11-helper is missing])
+       PKG_CHECK_MODULES(
+               [PKCS11_HELPER],
+               [libpkcs11-helper-1 >= 1.11],
+               [have_pkcs11_helper="yes"],
+               [AC_MSG_ERROR([PKCS11 enabled but libpkcs11-helper is missing])]
+       )
        OPTIONAL_PKCS11_HELPER_CFLAGS="${PKCS11_HELPER_CFLAGS}"
        OPTIONAL_PKCS11_HELPER_LIBS="${PKCS11_HELPER_LIBS}"
        AC_DEFINE([ENABLE_PKCS11], [1], [Enable PKCS11])