diff --git a/CMakeLists.txt b/CMakeLists.txt index 20bfbe2179..2ad183635b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,6 +224,16 @@ if (CMAKE_BUILD_TYPE) string(TOUPPER ${CMAKE_BUILD_TYPE} BuildType) endif () +if (INSTALL_BROCTL) + if (STANDALONE) + set(BROCTL_INSTALL_MODE "standalone") + else () + set(BROCTL_INSTALL_MODE "cluster") + endif () +else () + set(BROCTL_INSTALL_MODE "false") +endif () + message( "\n====================| Bro Build Summary |=====================" "\n" @@ -238,7 +248,7 @@ message( "\nCPP: ${CMAKE_CXX_COMPILER}" "\n" "\nBroccoli: ${INSTALL_BROCCOLI}" - "\nBroctl: ${INSTALL_BROCTL}" + "\nBroctl: ${BROCTL_INSTALL_MODE}" "\nGeoIP: ${USE_GEOIP}" "\nlibz: ${HAVE_LIBZ}" "\nlibmagic: ${HAVE_LIBMAGIC}" diff --git a/configure b/configure index c3bc86b96a..9ba6ebc1c9 100755 --- a/configure +++ b/configure @@ -120,12 +120,15 @@ while [ $# -ne 0 ]; do append_cache_entry INSTALL_BROCCOLI BOOL true ;; --enable-broctl) - append_cache_entry INSTALL_BROCTL BOOL true - append_cache_entry STANDALONE BOOL true + if [ "$user_set_broctl_cluster" != "true" ]; then + append_cache_entry INSTALL_BROCTL BOOL true + append_cache_entry STANDALONE BOOL true + fi ;; --enable-cluster) append_cache_entry INSTALL_BROCTL BOOL true append_cache_entry STANDALONE BOOL false + user_set_broctl_cluster="true" ;; --enable-auxtools) append_cache_entry INSTALL_AUX_TOOLS BOOL true