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

Use correct variable to pass existing Spicy root to spicy-plugin.

Browse source 
spicy-plugin can find Spicy in paths given by `SPICY_ROOT_DIR` while
`./configure` instead set `SPICY_ROOT`. With this patch we now set the
correct variable.

We also adjust variations of the previous variable name with different
capitalization which caused us to not properly configure spicy-plugin
(which triggers finding Spicy in its given prefix).

Closes #2363.
This commit is contained in:
Benjamin Bannier 2022-08-23 09:02:39 +02:00
parent bd1190bfeb
commit 13d011da66
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -402,7 +402,7 @@ else ()
endif () endif ()
if ( NOT DISABLE_SPICY ) if ( NOT DISABLE_SPICY )
if ( NOT Spicy_ROOT ) if ( NOT SPICY_ROOT_DIR )
add_subdirectory(auxil/spicy) add_subdirectory(auxil/spicy)
# Set variables used by the spicy-plugin build since we are building Spicy # Set variables used by the spicy-plugin build since we are building Spicy
@ -703,7 +703,7 @@ CheckOptionalBuildSources(auxil/zeek-archiver ZeekArchiver INSTALL_ZEEK_ARCHIVER
CheckOptionalBuildSources(auxil/zeek-client ZeekClient INSTALL_ZEEK_CLIENT) CheckOptionalBuildSources(auxil/zeek-client ZeekClient INSTALL_ZEEK_CLIENT)
if ( NOT DISABLE_SPICY ) if ( NOT DISABLE_SPICY )
if ( NOT Spicy_ROOT ) if ( NOT SPICY_ROOT_DIR )
list(APPEND _spicy_rt_libs spicy-rt hilti-rt) list(APPEND _spicy_rt_libs spicy-rt hilti-rt)
# Use the debug runtime libraries if we are building a debug Zeek. # Use the debug runtime libraries if we are building a debug Zeek.

2
configure vendored
View file

@ -379,7 +379,7 @@ while [ $# -ne 0 ]; do
append_cache_entry PYTHON_LIBRARY PATH $optarg append_cache_entry PYTHON_LIBRARY PATH $optarg
;; ;;
--with-spicy=*) --with-spicy=*)
append_cache_entry SPICY_ROOT PATH $optarg append_cache_entry SPICY_ROOT_DIR PATH $optarg
;; ;;
--with-spicy-plugin=*) --with-spicy-plugin=*)
append_cache_entry SPICY_PLUGIN_PATH PATH $optarg append_cache_entry SPICY_PLUGIN_PATH PATH $optarg