Merge remote-tracking branch 'origin/topic/bbannier/issue-2363'

* origin/topic/bbannier/issue-2363:
  Use correct variable to pass existing Spicy root to spicy-plugin.

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)

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.

VERSION

@@ -1 +1 @@
-5.1.0-dev.450
+5.1.0-dev.452

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