diff --git a/configure.ac b/configure.ac index 009519213d..5f1b3ad098 100644 --- a/configure.ac +++ b/configure.ac @@ -594,6 +594,7 @@ AC_ARG_WITH([daemon], [build_bitcoind=$withval], [build_bitcoind=yes]) +pkg_openssl=no case $host in *mingw*) TARGET_OS=windows @@ -662,6 +663,7 @@ case $host in if test x$openssl_prefix != x; then PKG_CONFIG_PATH="$openssl_prefix/lib/pkgconfig:$PKG_CONFIG_PATH" export PKG_CONFIG_PATH + pkg_openssl=yes fi if test "x$use_sqlite" != xno && $BREW list --versions sqlite3 >/dev/null; then @@ -1264,11 +1266,6 @@ if test x$enable_wallet != xno; then AC_MSG_RESULT([$use_sqlite]) fi -dnl Check for libbitcoin_crypto_avx2 -AC_CHECK_HEADER([openssl/crypto.h],,AC_MSG_ERROR(libcrypto headers missing)) -AC_CHECK_LIB([crypto], [main],CRYPTO_LIBS=-lcrypto, AC_MSG_ERROR(libcrypto missing)) - - dnl Check for libminiupnpc (optional) if test x$use_upnp != xno; then AC_CHECK_HEADERS( @@ -1369,6 +1366,15 @@ if test x$use_tests = xyes; then fi fi +dnl openssl check + +if test "x$pkg_openssl" = xyes; then + PKG_CHECK_MODULES([CRYPTO], [libcrypto],,[AC_MSG_ERROR(libcrypto not found.)]) +else + AC_CHECK_HEADER([openssl/crypto.h],,AC_MSG_ERROR(libcrypto headers missing)) + AC_CHECK_LIB([crypto], [main],CRYPTO_LIBS=-lcrypto, AC_MSG_ERROR(libcrypto missing)) +fi + dnl libevent check if test x$build_bitcoin_cli$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench != xnonononono; then @@ -1782,6 +1788,7 @@ echo " with gui / qt = $bitcoin_enable_qt" if test x$bitcoin_enable_qt != xno; then echo " with qr = $use_qr" fi +echo " pkg openssl = $pkg_openssl" echo " with zmq = $use_zmq" echo " with test = $use_tests" if test x$use_tests != xno; then