From 1c1a6e60b072a7089644e7b28e4bbe76a9c4932d Mon Sep 17 00:00:00 2001 From: Daniel Thayer Date: Sat, 9 Jul 2016 15:55:28 -0500 Subject: [PATCH] Disable broker by default Replaced the --disable-broker configure option with --enable-broker, and changed the install docs to show CAF as an optional dependency. --- configure | 20 ++++++++++---------- doc/install/install.rst | 8 +++----- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/configure b/configure index 1df97334c9..b6dae8f6e7 100755 --- a/configure +++ b/configure @@ -41,7 +41,8 @@ Usage: $0 [OPTION]... [VAR=VALUE]... --enable-perftools-debug use Google's perftools for debugging --enable-jemalloc link against jemalloc --enable-ruby build ruby bindings for broccoli (deprecated) - --disable-broker disable use of the Broker communication library + --enable-broker enable use of the Broker communication library + (requires C++ Actor Framework) --disable-broccoli don't build or install the Broccoli library --disable-broctl don't install Broctl --disable-auxtools don't build or install auxiliary tools @@ -57,10 +58,10 @@ Usage: $0 [OPTION]... [VAR=VALUE]... --with-flex=PATH path to flex executable --with-bison=PATH path to bison executable --with-python=PATH path to Python executable - --with-caf=PATH path to C++ Actor Framework installation - (a required Broker dependency) Optional Packages in Non-Standard Locations: + --with-caf=PATH path to C++ Actor Framework installation + (a required Broker dependency) --with-geoip=PATH path to the libGeoIP install root --with-perftools=PATH path to Google Perftools install root --with-jemalloc=PATH path to jemalloc install root @@ -121,13 +122,12 @@ append_cache_entry BRO_ROOT_DIR PATH $prefix append_cache_entry PY_MOD_INSTALL_DIR PATH $prefix/lib/broctl append_cache_entry BRO_SCRIPT_INSTALL_PATH STRING $prefix/share/bro append_cache_entry BRO_ETC_INSTALL_DIR PATH $prefix/etc -append_cache_entry BROKER_PYTHON_HOME PATH $prefix append_cache_entry BROKER_PYTHON_BINDINGS BOOL false append_cache_entry ENABLE_DEBUG BOOL false append_cache_entry ENABLE_PERFTOOLS BOOL false append_cache_entry ENABLE_PERFTOOLS_DEBUG BOOL false append_cache_entry ENABLE_JEMALLOC BOOL false -append_cache_entry ENABLE_BROKER BOOL true +append_cache_entry ENABLE_BROKER BOOL false append_cache_entry BinPAC_SKIP_INSTALL BOOL true append_cache_entry BUILD_SHARED_LIBS BOOL true append_cache_entry INSTALL_AUX_TOOLS BOOL true @@ -162,7 +162,7 @@ while [ $# -ne 0 ]; do append_cache_entry BRO_ROOT_DIR PATH $optarg append_cache_entry PY_MOD_INSTALL_DIR PATH $optarg/lib/broctl - if [ -z "$user_disabled_broker" ]; then + if [ -n "$user_enabled_broker" ]; then append_cache_entry BROKER_PYTHON_HOME PATH $optarg fi ;; @@ -199,10 +199,10 @@ while [ $# -ne 0 ]; do --enable-jemalloc) append_cache_entry ENABLE_JEMALLOC BOOL true ;; - --disable-broker) - append_cache_entry ENABLE_BROKER BOOL false - remove_cache_entry BROKER_PYTHON_HOME - user_disabled_broker="true" + --enable-broker) + append_cache_entry ENABLE_BROKER BOOL true + append_cache_entry BROKER_PYTHON_HOME PATH $prefix + user_enabled_broker="true" ;; --disable-broccoli) append_cache_entry INSTALL_BROCCOLI BOOL false diff --git a/doc/install/install.rst b/doc/install/install.rst index 60c7cf27d1..4b1f408202 100644 --- a/doc/install/install.rst +++ b/doc/install/install.rst @@ -32,7 +32,6 @@ before you begin: * Libz * Bash (for BroControl) * Python (for BroControl) - * C++ Actor Framework (CAF) version 0.14 (http://actor-framework.org) To build Bro from source, the following additional dependencies are required: @@ -47,8 +46,6 @@ To build Bro from source, the following additional dependencies are required: * zlib headers * Python -To install CAF, first download the source code of the required version from: https://github.com/actor-framework/actor-framework/releases - To install the required dependencies, you can use: * RPM/RedHat-based Linux: @@ -98,12 +95,12 @@ To install the required dependencies, you can use: component). OS X comes with all required dependencies except for CMake_, SWIG_, - OpenSSL, and CAF. (OpenSSL used to be part of OS X versions 10.10 + and OpenSSL. (OpenSSL used to be part of OS X versions 10.10 and older, for which it does not need to be installed manually. It was removed in OS X 10.11). Distributions of these dependencies can likely be obtained from your preferred Mac OS X package management system (e.g. Homebrew_, MacPorts_, or Fink_). Specifically for - Homebrew, the ``cmake``, ``swig``, ``openssl`` and ``caf`` packages + Homebrew, the ``cmake``, ``swig``, and ``openssl`` packages provide the required dependencies. @@ -113,6 +110,7 @@ Optional Dependencies Bro can make use of some optional libraries and tools if they are found at build time: + * C++ Actor Framework (CAF) version 0.14 (http://actor-framework.org) * LibGeoIP (for geolocating IP addresses) * sendmail (enables Bro and BroControl to send mail) * curl (used by a Bro script that implements active HTTP)