diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-18 09:02:29 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-08-18 09:02:40 +0200 |
| commit | 405a98bd334b5a49d16f25af810252f649b84d3d (patch) | |
| tree | 65fc4507d0d9b10a31fed452b961a47a62c65c7a /src | |
| parent | b3ec053082c96233512c076eebc486b16a317b91 (diff) | |
| parent | c101c7690706c962944570fe5efe9975bf740a53 (diff) | |
Merge pull request #4711
c101c76 build: Add --with-utils (bitcoin-cli and bitcoin-tx, default=yes). Help string consistency tweaks. Target sanity check fix. (randy-waterhouse)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/m4/bitcoin_qt.m4 | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 2c00f8b572..1bb59bce7b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -55,12 +55,10 @@ if BUILD_BITCOIND bin_PROGRAMS += bitcoind endif -if BUILD_BITCOIN_CLI - bin_PROGRAMS += bitcoin-cli +if BUILD_BITCOIN_UTILS + bin_PROGRAMS += bitcoin-cli bitcoin-tx endif -bin_PROGRAMS += bitcoin-tx - .PHONY: FORCE # bitcoin core # BITCOIN_CORE_H = \ diff --git a/src/m4/bitcoin_qt.m4 b/src/m4/bitcoin_qt.m4 index 4c1d40c394..27000ecbac 100644 --- a/src/m4/bitcoin_qt.m4 +++ b/src/m4/bitcoin_qt.m4 @@ -48,8 +48,8 @@ dnl CAUTION: Do not use this inside of a conditional. AC_DEFUN([BITCOIN_QT_INIT],[ dnl enable qt support AC_ARG_WITH([gui], - [AS_HELP_STRING([--with-gui], - [with GUI (no|qt4|qt5|auto. default is auto, qt4 tried first.)])], + [AS_HELP_STRING([--with-gui@<:@=no|qt4|qt5|auto@:>@], + [build bitcoin-qt GUI (default=auto, qt4 tried first)])], [ bitcoin_qt_want_version=$withval if test x$bitcoin_qt_want_version = xyes; then |