From 11190526ad118994cba687ca6e49dc916a29fbbe Mon Sep 17 00:00:00 2001 From: john hood Date: Sat, 19 Nov 2016 14:30:37 -0500 Subject: [PATCH] Fix Configure failure on FreeBSD with only base OpenSSL. Search for OpenSSL libraries both with pkg-config and directly. Fixes #763. --- configure.ac | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 173f096..6ae7e3c 100644 --- a/configure.ac +++ b/configure.ac @@ -323,10 +323,13 @@ dnl Checks for chosen crypto library case "${with_crypto_library}" in openssl) PKG_CHECK_MODULES([CRYPTO], [openssl], - [], - [AC_MSG_ERROR([OpenSSL crypto library not found])]) - AC_DEFINE([USE_OPENSSL_AES], [1], [Use OpenSSL library]) - ;; + [AC_DEFINE([USE_OPENSSL_AES], [1], [Use OpenSSL library])], + [AX_CHECK_LIBRARY([CRYPTO], [openssl/aes.h], [crypto], + [AC_DEFINE([USE_OPENSSL_AES], [1], [Use OpenSSL library]) + AC_SUBST([CRYPTO_CFLAGS], ["$CRYPTO_CPPFLAGS"]) + AC_SUBST([CRYPTO_LIBS], ["$CRYPTO_LDFLAGS -lcrypto"])], + [AC_MSG_ERROR([OpenSSL crypto library not found])])]) + ;; nettle) PKG_CHECK_MODULES([CRYPTO], [nettle], [],