diff --git a/CHANGES b/CHANGES index 0637912b35..158d07c6fe 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,17 @@ +5.1.0-dev.452 | 2022-08-24 09:33:58 -0700 + + * Use correct variable to pass existing Spicy root to spicy-plugin. (Benjamin Bannier, Corelight) + + 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. + 5.1.0-dev.450 | 2022-08-24 09:22:47 -0700 * Skip test based on preprocessor flag set by cmake (Simeon Miteff, Corelight) diff --git a/CMakeLists.txt b/CMakeLists.txt index 936fac8a50..cef07543a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -402,7 +402,7 @@ else () endif () if ( NOT DISABLE_SPICY ) - if ( NOT Spicy_ROOT ) + if ( NOT SPICY_ROOT_DIR ) add_subdirectory(auxil/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) if ( NOT DISABLE_SPICY ) - if ( NOT Spicy_ROOT ) + if ( NOT SPICY_ROOT_DIR ) list(APPEND _spicy_rt_libs spicy-rt hilti-rt) # Use the debug runtime libraries if we are building a debug Zeek. diff --git a/VERSION b/VERSION index bcc806b766..d6097563ae 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.1.0-dev.450 +5.1.0-dev.452 diff --git a/configure b/configure index 48323fef33..42d54d7a00 100755 --- a/configure +++ b/configure @@ -379,7 +379,7 @@ while [ $# -ne 0 ]; do append_cache_entry PYTHON_LIBRARY PATH $optarg ;; --with-spicy=*) - append_cache_entry SPICY_ROOT PATH $optarg + append_cache_entry SPICY_ROOT_DIR PATH $optarg ;; --with-spicy-plugin=*) append_cache_entry SPICY_PLUGIN_PATH PATH $optarg