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

Add broker/binpac/caf dirs to bro-config script

Browse source
This commit is contained in:
Jon Siwek 2018-07-24 16:39:34 -05:00
parent 3ed59249ba
commit 026f78e5a3
7 changed files with 37 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,4 +1,10 @@
2.5-775 | 2018-07-24 16:39:34 -0500
* Add broker/binpac/caf dirs to bro-config script (Jon Siwek, Corelight)
* Exclude CMakeFiles from header installation path (Jon Siwek, Corelight)
2.5-773 | 2018-07-24 15:04:41 +0000 2.5-773 | 2018-07-24 15:04:41 +0000
* BIT-1950: Support PPPoE over QinQ (Jon Siwek, Corelight) * BIT-1950: Support PPPoE over QinQ (Jon Siwek, Corelight)

14
CMakeLists.txt
View file

@ -238,6 +238,20 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bro-config.h.in
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/bro-config.h DESTINATION include/bro) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/bro-config.h DESTINATION include/bro)
if ( CAF_ROOT_DIR )
set(BRO_CONFIG_CAF_ROOT_DIR ${CAF_ROOT_DIR})
else ()
set(BRO_CONFIG_CAF_ROOT_DIR ${BRO_ROOT_DIR})
endif ()
if ( BinPAC_ROOT_DIR )
set(BRO_CONFIG_BINPAC_ROOT_DIR ${BinPAC_ROOT_DIR})
else ()
set(BRO_CONFIG_BINPAC_ROOT_DIR ${BRO_ROOT_DIR})
endif ()
set(BRO_CONFIG_BROKER_ROOT_DIR ${BRO_ROOT_DIR})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bro-config.in configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bro-config.in
${CMAKE_CURRENT_BINARY_DIR}/bro-config @ONLY) ${CMAKE_CURRENT_BINARY_DIR}/bro-config @ONLY)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bro-config DESTINATION bin) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bro-config DESTINATION bin)

2
VERSION
View file

@ -1 +1 @@
2.5-773 2.5-775

2
aux/binpac

@ -1 +1 @@
Subproject commit bfdb7a8194a84a6298f8776d7ac7132313742715 Subproject commit 6c0bf00a5f1f63c2d8c35f9193d12a72eb0c0c79

2
aux/bro-aux

@ -1 +1 @@
Subproject commit 0c60d51cf7faac478397bde72e7ead536365aa2d Subproject commit ee71fe58d392812f09c3d08ec2c69bc9b757c086

14
bro-config.in
View file

@ -11,9 +11,12 @@ cmake_dir=@CMAKE_INSTALL_PREFIX@/share/bro/cmake
include_dir=@CMAKE_INSTALL_PREFIX@/include/bro include_dir=@CMAKE_INSTALL_PREFIX@/include/bro
bropath=@DEFAULT_BROPATH@ bropath=@DEFAULT_BROPATH@
bro_dist=@BRO_DIST@ bro_dist=@BRO_DIST@
binpac_root=@BRO_CONFIG_BINPAC_ROOT_DIR@
caf_root=@BRO_CONFIG_CAF_ROOT_DIR@
broker_root=@BRO_CONFIG_BROKER_ROOT_DIR@
usage="\ usage="\
Usage: bro-config [--version] [--prefix] [--script_dir] [--site_dir] [--plugin_dir] [--config_dir] [--python_dir] [--include_dir] [--cmake_dir] [--bropath] [--bro_dist]" Usage: bro-config [--version] [--prefix] [--script_dir] [--site_dir] [--plugin_dir] [--config_dir] [--python_dir] [--include_dir] [--cmake_dir] [--bropath] [--bro_dist] [--binpac_root] [--caf_root] [--broker_root]"
if [ $# -eq 0 ] ; then if [ $# -eq 0 ] ; then
echo "${usage}" 1>&2 echo "${usage}" 1>&2
@ -60,6 +63,15 @@ while [ $# -ne 0 ]; do
--bro_dist) --bro_dist)
echo $bro_dist echo $bro_dist
;; ;;
--binpac_root)
echo $binpac_root
;;
--caf_root)
echo $caf_root
;;
--broker_root)
echo $broker_root
;;
*) *)
echo "${usage}" 1>&2 echo "${usage}" 1>&2
exit 1 exit 1

2
cmake

@ -1 +1 @@
Subproject commit b4906b02b4a9a4ceeecd17f2a61e7ce87f784b2a Subproject commit c4c2d6eeb7609836255abb054b91c4039bb7e276