Skip to content

Commit

Permalink
configure: Internal changes to make building bitcoind and bitcoin-cli…
Browse files Browse the repository at this point in the history
… optional
  • Loading branch information
luke-jr committed Jan 18, 2014
1 parent 4a290b5 commit f930341
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
10 changes: 10 additions & 0 deletions configure.ac
Expand Up @@ -446,6 +446,8 @@ if test x$boost_sleep != xyes; then
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)
fi

build_bitcoind=yes
build_bitcoin_cli=yes
BITCOIN_QT_INIT

if test x$use_pkgconfig = xyes; then
Expand Down Expand Up @@ -482,6 +484,14 @@ fi

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

AC_MSG_CHECKING([if bitcoind should be enabled])
AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
AC_MSG_RESULT($build_bitcoind)

AC_MSG_CHECKING([if bitcoin-cli should be enabled])
AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes])
AC_MSG_RESULT($build_bitcoin_cli)

dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4])

Expand Down
10 changes: 9 additions & 1 deletion src/Makefile.am
Expand Up @@ -10,7 +10,15 @@ if ENABLE_WALLET
noinst_LIBRARIES += libbitcoin_wallet.a
endif

bin_PROGRAMS = bitcoind bitcoin-cli
bin_PROGRAMS =

if BUILD_BITCOIND
bin_PROGRAMS += bitcoind
endif

if BUILD_BITCOIN_CLI
bin_PROGRAMS += bitcoin-cli
endif

SUBDIRS = . $(BUILD_QT) $(BUILD_TEST)
DIST_SUBDIRS = . qt test
Expand Down

0 comments on commit f930341

Please sign in to comment.