configure: Internal changes to make building bitcoind and bitcoin-cli optional

This commit is contained in:
Luke Dashjr 2013-09-08 02:44:12 +00:00
parent 4a290b526c
commit f930341d81
2 changed files with 19 additions and 1 deletions

View File

@ -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) 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 fi
build_bitcoind=yes
build_bitcoin_cli=yes
BITCOIN_QT_INIT BITCOIN_QT_INIT
if test x$use_pkgconfig = xyes; then if test x$use_pkgconfig = xyes; then
@ -482,6 +484,14 @@ fi
BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path) 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 dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4]) BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4])

View File

@ -10,7 +10,15 @@ if ENABLE_WALLET
noinst_LIBRARIES += libbitcoin_wallet.a noinst_LIBRARIES += libbitcoin_wallet.a
endif 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) SUBDIRS = . $(BUILD_QT) $(BUILD_TEST)
DIST_SUBDIRS = . qt test DIST_SUBDIRS = . qt test