Add --disable-wallet option to build system

Make it possible to build Bitcoin without wallet
(and thus without BDB) so that it only functions as node.

5 files changed, 51 insertions, 12 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 9d3365fd60..5daf625695 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,6 +4,9 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/leveldb/helpers/memenv \
   -I$(builddir)
 
 noinst_LIBRARIES = libbitcoin_server.a libbitcoin_common.a libbitcoin_cli.a
+if ENABLE_WALLET
+noinst_LIBRARIES += libbitcoin_wallet.a
+endif
 
 bin_PROGRAMS = bitcoind bitcoin-cli
 
@@ -33,14 +36,37 @@ obj/build.h: FORCE
 	  $(abs_top_srcdir)
 version.o: obj/build.h
 
-libbitcoin_server_a_SOURCES = addrman.cpp alert.cpp \
+libbitcoin_server_a_SOURCES = \
+  addrman.cpp \
+  alert.cpp \
+  crypter.cpp \
   rpcserver.cpp \
   bloom.cpp \
-  chainparams.cpp checkpoints.cpp coins.cpp crypter.cpp db.cpp \
-  init.cpp keystore.cpp leveldbwrapper.cpp main.cpp miner.cpp \
-  net.cpp noui.cpp rpcblockchain.cpp rpcdump.cpp \
-  rpcmining.cpp rpcnet.cpp rpcrawtransaction.cpp rpcwallet.cpp \
-  txdb.cpp txmempool.cpp wallet.cpp walletdb.cpp $(JSON_H) \
+  chainparams.cpp \
+  checkpoints.cpp \
+  coins.cpp \
+  init.cpp \
+  keystore.cpp \
+  leveldbwrapper.cpp \
+  main.cpp \
+  net.cpp \
+  noui.cpp \
+  rpcblockchain.cpp \
+  rpcnet.cpp \
+  rpcrawtransaction.cpp \
+  txdb.cpp \
+  txmempool.cpp \
+  $(JSON_H) \
+  $(BITCOIN_CORE_H)
+
+libbitcoin_wallet_a_SOURCES = \
+  db.cpp \
+  miner.cpp \
+  rpcdump.cpp \
+  rpcmining.cpp \
+  rpcwallet.cpp \
+  wallet.cpp \
+  walletdb.cpp \
   $(BITCOIN_CORE_H)
 
 libbitcoin_common_a_SOURCES = \
@@ -68,6 +94,9 @@ nodist_libbitcoin_common_a_SOURCES = $(top_srcdir)/src/obj/build.h
 # bitcoind binary #
 bitcoind_LDADD = libbitcoin_server.a libbitcoin_cli.a libbitcoin_common.a leveldb/libleveldb.a leveldb/libmemenv.a \
   $(BOOST_LIBS)
+if ENABLE_WALLET
+bitcoind_LDADD += libbitcoin_wallet.a
+endif
 bitcoind_SOURCES = bitcoind.cpp
 #
 
diff --git a/src/Makefile.include b/src/Makefile.include
index 2e96a6b7dc..13cffd29bc 100644
--- a/src/Makefile.include
+++ b/src/Makefile.include
@@ -6,6 +6,7 @@ AM_CPPFLAGS =  $(INCLUDES) \
 AM_LDFLAGS = $(PTHREAD_CFLAGS)
 
 LIBBITCOIN_SERVER=$(top_builddir)/src/libbitcoin_server.a
+LIBBITCOIN_WALLET=$(top_builddir)/src/libbitcoin_wallet.a
 LIBBITCOIN_COMMON=$(top_builddir)/src/libbitcoin_common.a
 LIBBITCOIN_CLI=$(top_builddir)/src/libbitcoin_cli.a
 LIBLEVELDB=$(top_builddir)/src/leveldb/libleveldb.a
diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am
index e302adc89f..08846604ea 100644
--- a/src/qt/Makefile.am
+++ b/src/qt/Makefile.am
@@ -197,7 +197,7 @@ endif
 bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
   -I$(top_srcdir)/src/qt/forms
 bitcoin_qt_SOURCES = bitcoin.cpp
-bitcoin_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \
+bitcoin_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN_SERVER) $(LIBBITCOIN_WALLET) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \
   $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)
 
 # forms/foo.h -> forms/ui_foo.h
diff --git a/src/qt/test/Makefile.am b/src/qt/test/Makefile.am
index 29247a79a1..cb6874700e 100644
--- a/src/qt/test/Makefile.am
+++ b/src/qt/test/Makefile.am
@@ -17,7 +17,7 @@ BUILT_SOURCES = $(TEST_QT_MOC_CPP)
 test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) $(QT_TEST_INCLUDES)
 test_bitcoin_qt_SOURCES = test_main.cpp uritests.cpp paymentservertests.cpp $(TEST_QT_H)
 nodist_test_bitcoin_qt_SOURCES = $(TEST_QT_MOC_CPP)
-test_bitcoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) \
+test_bitcoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER) $(LIBBITCOIN_WALLET) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) \
   $(LIBMEMENV) $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) \
   $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)
 
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 39f2c6a385..715020a981 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -21,16 +21,25 @@ BUILT_SOURCES = $(JSON_TEST_FILES:.json=.json.h) $(RAW_TEST_FILES:.raw=.raw.h)
 # test_bitcoin binary #
 test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(TESTDEFS)
 test_bitcoin_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \
-  $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(BDB_LIBS)
-test_bitcoin_SOURCES = accounting_tests.cpp alert_tests.cpp \
+  $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
+if ENABLE_WALLET
+test_bitcoin_LDADD += $(LIBBITCOIN_WALLET)
+endif
+test_bitcoin_LDADD += $(BDB_LIBS)
+
+test_bitcoin_SOURCES = alert_tests.cpp \
   allocator_tests.cpp base32_tests.cpp base58_tests.cpp base64_tests.cpp \
   bignum_tests.cpp bloom_tests.cpp canonical_tests.cpp checkblock_tests.cpp \
   Checkpoints_tests.cpp compress_tests.cpp DoS_tests.cpp getarg_tests.cpp \
-  key_tests.cpp miner_tests.cpp mruset_tests.cpp multisig_tests.cpp \
+  key_tests.cpp mruset_tests.cpp multisig_tests.cpp \
   netbase_tests.cpp pmt_tests.cpp rpc_tests.cpp script_P2SH_tests.cpp \
   script_tests.cpp serialize_tests.cpp sigopcount_tests.cpp test_bitcoin.cpp \
   transaction_tests.cpp uint160_tests.cpp uint256_tests.cpp util_tests.cpp \
-  wallet_tests.cpp sighash_tests.cpp $(JSON_TEST_FILES) $(RAW_TEST_FILES)
+  sighash_tests.cpp $(JSON_TEST_FILES) $(RAW_TEST_FILES)
+
+if ENABLE_WALLET
+test_bitcoin_SOURCES += accounting_tests.cpp wallet_tests.cpp miner_tests.cpp
+endif
 
 nodist_test_bitcoin_SOURCES = $(BUILT_SOURCES)