LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

build: Add --with-utils (bitcoin-cli and bitcoin-tx, default=yes).

Browse source 
Help string consistency tweaks. Target sanity check fix.
This commit is contained in:
randy-waterhouse 2014-08-16 16:48:24 +12:00
parent b3ec053082
commit c101c76907
3 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
configure.ac
View file

@ -579,15 +579,15 @@ 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
AC_ARG_WITH([cli], AC_ARG_WITH([utils],
[AS_HELP_STRING([--with-cli], [AS_HELP_STRING([--with-utils],
[with CLI (default is yes)])], [build bitcoin-cli bitcoin-tx (default=yes)])],
[build_bitcoin_cli=$withval], [build_bitcoin_utils=$withval],
[build_bitcoin_cli=yes]) [build_bitcoin_utils=yes])
AC_ARG_WITH([daemon], AC_ARG_WITH([daemon],
[AS_HELP_STRING([--with-daemon], [AS_HELP_STRING([--with-daemon],
[with daemon (default is yes)])], [build bitcoind daemon (default=yes)])],
[build_bitcoind=$withval], [build_bitcoind=$withval],
[build_bitcoind=yes]) [build_bitcoind=yes])
@ -631,9 +631,9 @@ AC_MSG_CHECKING([whether to build bitcoind])
AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
AC_MSG_RESULT($build_bitcoind) AC_MSG_RESULT($build_bitcoind)
AC_MSG_CHECKING([whether to build bitcoin-cli]) AC_MSG_CHECKING([whether to build utils (bitcoin-cli bitcoin-tx)])
AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes]) AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes])
AC_MSG_RESULT($build_bitcoin_cli) AC_MSG_RESULT($build_bitcoin_utils)
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])
@ -748,8 +748,8 @@ else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
if test "x$use_tests$build_bitcoind$use_qt" = "xnonono"; then if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests = xnononono; then
AC_MSG_ERROR([No targets! Please specify at least one of: --enable-cli --enable-daemon --enable-gui or --enable-tests]) AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-daemon --with-gui or --enable-tests])
fi fi
AM_CONDITIONAL([TARGET_DARWIN], [test x$TARGET_OS = xdarwin]) AM_CONDITIONAL([TARGET_DARWIN], [test x$TARGET_OS = xdarwin])

6
src/Makefile.am
View file

@ -55,12 +55,10 @@ if BUILD_BITCOIND
bin_PROGRAMS += bitcoind bin_PROGRAMS += bitcoind
endif endif
if BUILD_BITCOIN_CLI if BUILD_BITCOIN_UTILS
bin_PROGRAMS += bitcoin-cli bin_PROGRAMS += bitcoin-cli bitcoin-tx
endif endif
bin_PROGRAMS += bitcoin-tx
.PHONY: FORCE .PHONY: FORCE
# bitcoin core # # bitcoin core #
BITCOIN_CORE_H = \ BITCOIN_CORE_H = \

4
src/m4/bitcoin_qt.m4
View file

@ -48,8 +48,8 @@ dnl CAUTION: Do not use this inside of a conditional.
AC_DEFUN([BITCOIN_QT_INIT],[ AC_DEFUN([BITCOIN_QT_INIT],[
dnl enable qt support dnl enable qt support
AC_ARG_WITH([gui], AC_ARG_WITH([gui],
[AS_HELP_STRING([--with-gui], [AS_HELP_STRING([--with-gui@<:@=no|qt4|qt5|auto@:>@],
[with GUI (no|qt4|qt5|auto. default is auto, qt4 tried first.)])], [build bitcoin-qt GUI (default=auto, qt4 tried first)])],
[ [
bitcoin_qt_want_version=$withval bitcoin_qt_want_version=$withval
if test x$bitcoin_qt_want_version = xyes; then if test x$bitcoin_qt_want_version = xyes; then