Update Makefile.am and change installer to not build node and chain extras.

Author: evoskuil

Makefile.am

@@ -8,21 +8,42 @@ doc_DATA = README INSTALL COPYING
 #
 pkgconfig_DATA = libbitcoin-server.pc
 
+# look for macros in the m4 subdirectory
+ACLOCAL_AMFLAGS = -I m4
+
 #
-# bash completion
+# console application
 #
+#if WITH_CONSOLE
+
+# bash completion
 if BASH_COMPLETION_DIR
     bashcompletiondir = ${bash_completion_dir}
     dist_bashcompletion_DATA = data/bitcoin_server
 endif
 
-# look for macros in the m4 subdirectory
-ACLOCAL_AMFLAGS = -I m4
-
-#
-# console application
+# configuration file
 #
-bin_PROGRAMS = bitcoin_server
+# TODO: coordinate this dir and file name with source code to keep in sync.
+# Note that in a prefix install this file is placed relative to the prefix but
+# execution of the server will default to reading in the system-wide directory.
+confdir="${sysconfdir}/libbitcoin"
+conf_DATA = data/server.cfg
+
+bin_PROGRAMS = \
+    bitcoin_server
+
+bitcoin_server_CPPFLAGS = \
+    -I${srcdir}/include \
+    ${sodium_CFLAGS} \
+    ${czmq___CFLAGS} \
+    ${bitcoin_node_CFLAGS} \
+    -DSYSCONFDIR=\"${sysconfdir}\"
+
+bitcoin_server_LDADD = \
+    ${sodium_LIBS} \
+    ${czmq___LIBS} \
+    ${bitcoin_node_LIBS}
 
 bitcoin_server_SOURCES = \
     src/message.cpp \
@@ -43,24 +64,4 @@ bitcoin_server_SOURCES = \
     src/service/protocol.cpp \
     src/service/transaction_pool.cpp
 
-bitcoin_server_CPPFLAGS = \
-    -I${srcdir}/include \
-    ${sodium_CFLAGS} \
-    ${czmq___CFLAGS} \
-    ${bitcoin_node_CFLAGS} \
-    -DSYSCONFDIR=\"${sysconfdir}\"
-
-bitcoin_server_LDADD = \
-    ${sodium_LIBS} \
-    ${czmq___LIBS} \
-    ${bitcoin_node_LIBS}
-
-#
-# configuration file
-#
-# TODO: coordinate this dir and file name with source code to keep in sync.
-# Note that in a prefix install this file is placed relative to the prefix but
-# execution of the server will default to reading in the system-wide directory.
-confdir="${sysconfdir}/libbitcoin"
-conf_DATA = data/server.cfg
-
+#endif

install.sh

@@ -244,13 +244,15 @@ BITCOIN_OPTIONS=\
 #------------------------------------------------------------------------------
 BITCOIN_BLOCKCHAIN_OPTIONS=\
 "--without-tests "\
+"--without-tools "\
 "${with_boost} "\
 "${with_pkgconfigdir} "
 
 # Define bitcoin-node options.
 #------------------------------------------------------------------------------
 BITCOIN_NODE_OPTIONS=\
 "--without-tests "\
+"--without-console "\
 "${with_boost} "\
 "${with_pkgconfigdir} "