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

Fix --with-binpac configure option

Browse source
This commit is contained in:
Jon Siwek 2018-08-01 11:25:27 -05:00
parent 4243a5d5b0
commit 08a1480fd9
5 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,4 +1,10 @@
2.5-790 | 2018-08-01 11:25:27 -0500
* Fix --with-binpac configure option (Jon Siwek, Corelight)
* Update CAF-finding logic (Jon Siwek, Corelight)
2.5-787 | 2018-07-31 16:50:55 -0500
* Add Cisco FabricPath support (Damani Wade, Corelight)

2
CMakeLists.txt
View file

@ -103,7 +103,7 @@ if (CAF_FOUND)
include_directories(BEFORE ${CAF_INCLUDE_DIRS})
endif ()
if (NOT BinPAC_ROOT_DIR AND
if (NOT BINPAC_EXE_PATH AND
EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/aux/binpac/CMakeLists.txt)
add_subdirectory(aux/binpac)
endif ()

2
VERSION
View file

@ -1 +1 @@
2.5-787
2.5-790

2
aux/binpac

@ -1 +1 @@
Subproject commit 5e098fe60180ceb38182a5ff530609d9765caef8
Subproject commit 7e6b47ee90c5b6ab80b0e6f93d5cf835fd86ce4e

1
configure vendored
View file

@ -241,6 +241,7 @@ while [ $# -ne 0 ]; do
;;
--with-binpac=*)
append_cache_entry BINPAC_EXE_PATH PATH $optarg
append_cache_entry BinPAC_ROOT_DIR PATH "$(dirname $optarg)/.."
;;
--with-bifcl=*)
append_cache_entry BIFCL_EXE_PATH PATH $optarg