mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-04-24 22:09:20 +02:00
build: Add --disable-bip70 configure option
This patch adds a --disable-bip70 configure option that disables BIP70 payment request support. When disabled, this removes the dependency of the GUI on OpenSSL and Protobuf.
This commit is contained in:
committed by
James Hilliard
parent
1d1417430c
commit
9dcf6c0dfe
@@ -2,7 +2,13 @@
|
||||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#if defined(HAVE_CONFIG_H)
|
||||
#include <config/bitcoin-config.h>
|
||||
#endif
|
||||
|
||||
#if defined(ENABLE_WALLET) && defined(ENABLE_BIP70)
|
||||
#include <qt/paymentrequestplus.h> // this includes protobuf's port.h which defines its own bswap macos
|
||||
#endif
|
||||
|
||||
#include <qt/test/compattests.h>
|
||||
|
||||
|
||||
@@ -14,9 +14,11 @@
|
||||
|
||||
#ifdef ENABLE_WALLET
|
||||
#include <qt/test/addressbooktests.h>
|
||||
#ifdef ENABLE_BIP70
|
||||
#include <qt/test/paymentservertests.h>
|
||||
#endif // ENABLE_BIP70
|
||||
#include <qt/test/wallettests.h>
|
||||
#endif
|
||||
#endif // ENABLE_WALLET
|
||||
|
||||
#include <QApplication>
|
||||
#include <QObject>
|
||||
@@ -74,7 +76,7 @@ int main(int argc, char *argv[])
|
||||
if (QTest::qExec(&test1) != 0) {
|
||||
fInvalid = true;
|
||||
}
|
||||
#ifdef ENABLE_WALLET
|
||||
#if defined(ENABLE_WALLET) && defined(ENABLE_BIP70)
|
||||
PaymentServerTests test2;
|
||||
if (QTest::qExec(&test2) != 0) {
|
||||
fInvalid = true;
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
#include <qt/test/util.h>
|
||||
|
||||
#include <interfaces/node.h>
|
||||
#include <base58.h>
|
||||
#include <qt/bitcoinamountfield.h>
|
||||
#include <qt/callback.h>
|
||||
#include <qt/optionsmodel.h>
|
||||
|
||||
Reference in New Issue
Block a user