Skip to content

Commit f930341

Browse files
committed
configure: Internal changes to make building bitcoind and bitcoin-cli optional
1 parent 4a290b5 commit f930341

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

configure.ac

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,8 @@ if test x$boost_sleep != xyes; then
446446
AC_MSG_ERROR(No working boost sleep implementation found. If on ubuntu 13.10 with libboost1.54-all-dev remove libboost.1.54-all-dev and use libboost1.53-all-dev)
447447
fi
448448

449+
build_bitcoind=yes
450+
build_bitcoin_cli=yes
449451
BITCOIN_QT_INIT
450452

451453
if test x$use_pkgconfig = xyes; then
@@ -482,6 +484,14 @@ fi
482484

483485
BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path)
484486

487+
AC_MSG_CHECKING([if bitcoind should be enabled])
488+
AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
489+
AC_MSG_RESULT($build_bitcoind)
490+
491+
AC_MSG_CHECKING([if bitcoin-cli should be enabled])
492+
AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes])
493+
AC_MSG_RESULT($build_bitcoin_cli)
494+
485495
dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
486496
BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4])
487497

src/Makefile.am

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,15 @@ if ENABLE_WALLET
1010
noinst_LIBRARIES += libbitcoin_wallet.a
1111
endif
1212

13-
bin_PROGRAMS = bitcoind bitcoin-cli
13+
bin_PROGRAMS =
14+
15+
if BUILD_BITCOIND
16+
bin_PROGRAMS += bitcoind
17+
endif
18+
19+
if BUILD_BITCOIN_CLI
20+
bin_PROGRAMS += bitcoin-cli
21+
endif
1422

1523
SUBDIRS = . $(BUILD_QT) $(BUILD_TEST)
1624
DIST_SUBDIRS = . qt test

0 commit comments

Comments
 (0)