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

Added configure option to build aux. tools.

Browse source 
Also updated submodules to fix small bug in CMake module path.
This commit is contained in:
Jon Siwek 2010-10-26 17:13:33 -05:00
parent 884d6c406f
commit 43cbe2a9fc
4 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -143,7 +143,10 @@ add_subdirectory(src)
add_subdirectory(policy) add_subdirectory(policy)
#add_subdirectory(scripts) #add_subdirectory(scripts)
#add_subdirectory(doc) #add_subdirectory(doc)
#add_subdirectory(aux)
if (INSTALL_AUXTOOLS)
add_subdirectory(aux)
endif ()
## ##
## Build Summary ## Build Summary

2
aux

@ -1 +1 @@
Subproject commit c0c62958b333762475baa17fd729500d90a3a98e Subproject commit 25a7ae58d8ba7b92bb05545b9c0a5a2832f011e1

2
binpac

@ -1 +1 @@
Subproject commit c1f3724df92ebb4e6a6f7f018cde472c5f2218a7 Subproject commit b2d36176cd627b9249ab747dc74a765d802bdc61

21
configure vendored
View file

@ -31,6 +31,8 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
'binpac' subdirectory 'binpac' subdirectory
--install-binpac if --build-binpac, this option adds --install-binpac if --build-binpac, this option adds
BinPAC build files to the install target BinPAC build files to the install target
--install-auxtools build and install auxilliary tools located
in 'aux' subdirectory
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
@ -66,6 +68,7 @@ use_IPv6=false
enable_perftools=false enable_perftools=false
build_binpac=false build_binpac=false
skip_binpac_install=true skip_binpac_install=true
install_auxtools=false
# parse arguments # parse arguments
while [ $# -ne 0 ]; do while [ $# -ne 0 ]; do
@ -116,6 +119,14 @@ while [ $# -ne 0 ]; do
--install-binpac) --install-binpac)
skip_binpac_install=false skip_binpac_install=false
;; ;;
--install-auxtools)
if [ -f $sourcedir/aux/CMakeLists.txt ]; then
install_auxtools=true
else
echo "Error: Bro-Aux source not found in $sourcedir/aux" >&2
exit 1
fi
;;
--with-openssl=*) --with-openssl=*)
openssl_root=$optarg openssl_root=$optarg
;; ;;
@ -185,14 +196,20 @@ set(ENABLE_PERFTOOLS $enable_perftools
CACHE STRING "use Google's perftools" FORCE) CACHE STRING "use Google's perftools" FORCE)
# If the following option is set to true, then instead of searching for # If the following option is set to true, then instead of searching for
# an installation of BinPac, it will be downloaded into the 'binpac' # an installation of BinPac, it will be built from source already
# subdirectory if necessary and then built # available in the 'binpac' subdirectory
set(BinPAC_PREFER_BUILD $build_binpac set(BinPAC_PREFER_BUILD $build_binpac
CACHE STRING "retrieve and build BinPAC dependency from source" FORCE) CACHE STRING "retrieve and build BinPAC dependency from source" FORCE)
set(BinPAC_SKIP_INSTALL $skip_binpac_install set(BinPAC_SKIP_INSTALL $skip_binpac_install
CACHE STRING "don't install BinPAC if built from source" FORCE) CACHE STRING "don't install BinPAC if built from source" FORCE)
# If the following option is set to true, then auxilliary tools will
# be installed alongside Bro if their source is located in the 'aux'
# subdirectory
set(INSTALL_AUXTOOLS $install_auxtools
CACHE STRING "install Bro auxilliary tools" FORCE)
####################################################################### #######################################################################
# Packages in Non-Standard Locations # Packages in Non-Standard Locations
# Uncomment/edit options below in order to aid the CMake # Uncomment/edit options below in order to aid the CMake