From 223cf305e9bc83964ff0392b91529c92c2d86330 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 1 May 2026 16:15:17 +0000 Subject: [PATCH] Make Qt OpenSSL TLS plugin optional --- build-aux/m4/bitcoin_qt.m4 | 5 +++-- contrib/build-linux-wallet.sh | 2 +- contrib/build-win64-wallet.sh | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index 0087ee84..e9470e76 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/bitcoin_qt.m4 @@ -138,8 +138,9 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ AC_DEFINE(QT_QPA_PLATFORM_MINIMAL, 1, [Define this symbol if the minimal qt platform exists]) ]) if test "x$QT_LIB_PREFIX" = xQt6; then - _BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QTlsBackendOpenSSL)],[-lqopensslbackend -lssl -lcrypto]) - AC_DEFINE(QT_TLS_OPENSSL, 1, [Define this symbol if the Qt OpenSSL TLS backend exists]) + _BITCOIN_QT_CHECK_STATIC_PLUGINS_OPTIONAL([Q_IMPORT_PLUGIN(QTlsBackendOpenSSL)],[-lqopensslbackend -lssl -lcrypto],[ + AC_DEFINE(QT_TLS_OPENSSL, 1, [Define this symbol if the Qt OpenSSL TLS backend exists]) + ]) fi if test "x$TARGET_OS" = xwindows; then _BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)],[-lqwindows]) diff --git a/contrib/build-linux-wallet.sh b/contrib/build-linux-wallet.sh index 606b7e47..4806f250 100755 --- a/contrib/build-linux-wallet.sh +++ b/contrib/build-linux-wallet.sh @@ -101,7 +101,7 @@ if [[ ! -f configure || ! -f src/secp256k1/configure || ! -f src/secp256k1/Makef ./autogen.sh fi -if [[ build-aux/m4/bitcoin_qt.m4 -nt configure ]]; then +if [[ build-aux/m4/bitcoin_qt.m4 -nt configure || build-aux/m4/bitcoin_qt.m4 -nt aclocal.m4 ]]; then ./autogen.sh fi diff --git a/contrib/build-win64-wallet.sh b/contrib/build-win64-wallet.sh index 64e06c1a..72ab037f 100755 --- a/contrib/build-win64-wallet.sh +++ b/contrib/build-win64-wallet.sh @@ -115,6 +115,10 @@ if [[ ! -f configure || ! -f src/secp256k1/configure || ! -f src/secp256k1/Makef ./autogen.sh fi +if [[ build-aux/m4/bitcoin_qt.m4 -nt configure || build-aux/m4/bitcoin_qt.m4 -nt aclocal.m4 ]]; then + ./autogen.sh +fi + echo "Configuring Win64 Qt6 wallet build..." CONFIG_SITE="$PREFIX/share/config.site" ./configure \ --prefix=/ \