Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Configure wrapper fixes for Broctl

Browse source 
Made order of --enable-broctl and --enable-cluster not matter.

--enable-cluster always enables Broctl in cluster configuration even if
the other option is used.

--enable-broctl will enable Broctl in standalone configuration only if
--enable-cluster isn't present.
This commit is contained in:
Jon Siwek 2010-11-19 11:28:43 -06:00
parent 552177c33a
commit 0878e9b8f1
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -224,6 +224,16 @@ if (CMAKE_BUILD_TYPE)
string(TOUPPER ${CMAKE_BUILD_TYPE} BuildType) string(TOUPPER ${CMAKE_BUILD_TYPE} BuildType)
endif () 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( message(
"\n====================| Bro Build Summary |=====================" "\n====================| Bro Build Summary |====================="
"\n" "\n"
@ -238,7 +248,7 @@ message(
"\nCPP: ${CMAKE_CXX_COMPILER}" "\nCPP: ${CMAKE_CXX_COMPILER}"
"\n" "\n"
"\nBroccoli: ${INSTALL_BROCCOLI}" "\nBroccoli: ${INSTALL_BROCCOLI}"
"\nBroctl: ${INSTALL_BROCTL}" "\nBroctl: ${BROCTL_INSTALL_MODE}"
"\nGeoIP: ${USE_GEOIP}" "\nGeoIP: ${USE_GEOIP}"
"\nlibz: ${HAVE_LIBZ}" "\nlibz: ${HAVE_LIBZ}"
"\nlibmagic: ${HAVE_LIBMAGIC}" "\nlibmagic: ${HAVE_LIBMAGIC}"

7
configure vendored
View file

@ -120,12 +120,15 @@ while [ $# -ne 0 ]; do
append_cache_entry INSTALL_BROCCOLI BOOL true append_cache_entry INSTALL_BROCCOLI BOOL true
;; ;;
--enable-broctl) --enable-broctl)
append_cache_entry INSTALL_BROCTL BOOL true if [ "$user_set_broctl_cluster" != "true" ]; then
append_cache_entry STANDALONE BOOL true append_cache_entry INSTALL_BROCTL BOOL true
append_cache_entry STANDALONE BOOL true
fi
;; ;;
--enable-cluster) --enable-cluster)
append_cache_entry INSTALL_BROCTL BOOL true append_cache_entry INSTALL_BROCTL BOOL true
append_cache_entry STANDALONE BOOL false append_cache_entry STANDALONE BOOL false
user_set_broctl_cluster="true"
;; ;;
--enable-auxtools) --enable-auxtools)
append_cache_entry INSTALL_AUX_TOOLS BOOL true append_cache_entry INSTALL_AUX_TOOLS BOOL true