Make Qt OpenSSL TLS plugin optional
This commit is contained in:
@@ -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])
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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=/ \
|
||||
|
||||
Reference in New Issue
Block a user