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

Enable broccoli, broctl, aux tools by default

Browse source 
The configure wrapper now only provides --disable options for each
aux. package.
This commit is contained in:
Jon Siwek 2010-11-22 19:42:37 -06:00
parent 426b940b4c
commit 8901b30236
2 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -265,6 +265,8 @@ message(
"\n" "\n"
"\nBroccoli: ${INSTALL_BROCCOLI}" "\nBroccoli: ${INSTALL_BROCCOLI}"
"\nBroctl: ${BROCTL_INSTALL_MODE}" "\nBroctl: ${BROCTL_INSTALL_MODE}"
"\nAux. Tools: ${INSTALL_AUX_TOOLS}"
"\n"
"\nGeoIP: ${USE_GEOIP}" "\nGeoIP: ${USE_GEOIP}"
"\nlibz: ${HAVE_LIBZ}" "\nlibz: ${HAVE_LIBZ}"
"\nlibmagic: ${HAVE_LIBMAGIC}" "\nlibmagic: ${HAVE_LIBMAGIC}"

36
configure vendored
View file

@ -26,11 +26,11 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
--enable-debug compile in debugging mode --enable-debug compile in debugging mode
--enable-brov6 enable IPv6 processing --enable-brov6 enable IPv6 processing
--enable-perftools use Google's perftools --enable-perftools use Google's perftools
--enable-broccoli build/install the Broccoli library
--enable-broctl install Broctl configured in standalone mode
--enable-cluster install Broctl configured for cluster operation --enable-cluster install Broctl configured for cluster operation
--enable-auxtools build and install auxilliary tools located (overridden by --disable-broctl)
in 'aux/bro-aux' subdirectory --disable-broccoli don't build or install the Broccoli library
--disable-broctl don't install Broctl
--disable-auxtools don't build or install auxilliary tools
Required Packages in Non-Standard Locations: Required Packages in Non-Standard Locations:
--with-openssl=PATH path to OpenSSL install root --with-openssl=PATH path to OpenSSL install root
@ -77,8 +77,10 @@ append_cache_entry BROv6 BOOL false
append_cache_entry ENABLE_PERFTOOLS BOOL false append_cache_entry ENABLE_PERFTOOLS BOOL false
append_cache_entry BinPAC_SKIP_INSTALL BOOL true append_cache_entry BinPAC_SKIP_INSTALL BOOL true
append_cache_entry BUILD_SHARED_LIBS BOOL true append_cache_entry BUILD_SHARED_LIBS BOOL true
append_cache_entry INSTALL_BROCCOLI BOOL false append_cache_entry INSTALL_AUX_TOOLS BOOL true
append_cache_entry INSTALL_BROCTL BOOL false append_cache_entry INSTALL_BROCCOLI BOOL true
append_cache_entry INSTALL_BROCTL BOOL true
append_cache_entry STANDALONE BOOL true
# parse arguments # parse arguments
while [ $# -ne 0 ]; do while [ $# -ne 0 ]; do
@ -116,22 +118,20 @@ while [ $# -ne 0 ]; do
--enable-perftools) --enable-perftools)
append_cache_entry ENABLE_PERFTOOLS BOOL true append_cache_entry ENABLE_PERFTOOLS BOOL true
;; ;;
--enable-broccoli) --disable-broccoli)
append_cache_entry INSTALL_BROCCOLI BOOL true append_cache_entry INSTALL_BROCCOLI BOOL false
;; ;;
--enable-broctl) --disable-broctl)
if [ "$user_set_broctl_cluster" != "true" ]; then append_cache_entry INSTALL_BROCTL BOOL false
append_cache_entry INSTALL_BROCTL BOOL true user_disabled_broctl="true"
append_cache_entry STANDALONE BOOL true
fi
;; ;;
--enable-cluster) --enable-cluster)
append_cache_entry INSTALL_BROCTL BOOL true if [ "$user_disabled_broctl" != "true" ]; then
append_cache_entry STANDALONE BOOL false append_cache_entry STANDALONE BOOL false
user_set_broctl_cluster="true" fi
;; ;;
--enable-auxtools) --disable-auxtools)
append_cache_entry INSTALL_AUX_TOOLS BOOL true append_cache_entry INSTALL_AUX_TOOLS BOOL false
;; ;;
--with-openssl=*) --with-openssl=*)
append_cache_entry OpenSSL_ROOT_DIR PATH $optarg append_cache_entry OpenSSL_ROOT_DIR PATH $optarg