Pull request #4190: kaizen: update enabling of Kaizen mock

Merge in SNORT/snort3 from ~YVELYKOZ/snort3:kaizen_mock_chg to master

Squashed commit of the following:

commit bbc1f110e6815c1672948b5319d09540e9d35f22
Author: Yehor Velykozhon <yvelykoz@cisco.com>
Date:   Wed Feb 14 14:50:05 2024 +0200

    kaizen: provide an option to enable Kaizen's mock

diff --git a/cmake/FindML.cmake b/cmake/FindML.cmake
index e5d7165c58e31b4a9996eeaffc42896b64c09ebd..a2856331a9a20ce2f2f00e735940df32ed1c4405 100644 (file)
--- a/cmake/FindML.cmake
+++ b/cmake/FindML.cmake
@@ -9,6 +9,6 @@ find_package_handle_standard_args(ML
     ML_INCLUDE_DIRS
 )
 
-if (ML_FOUND)
+if (ML_FOUND AND NOT ENABLE_KAIZEN_MOCK)
     set(HAVE_LIBML TRUE)
 endif()

diff --git a/configure_cmake.sh b/configure_cmake.sh
index ddabeab595f6a10d8f3e55bb75691de8e8ec8d2a..ad93cc69a4f4ba92a809538ea23308194df00996 100755 (executable)
--- a/configure_cmake.sh
+++ b/configure_cmake.sh
@@ -124,6 +124,7 @@ Optional Packages:
                             libml include directory
     --with-libml-libraries=DIR
                             libml library directory
+    --without-libml         build Kaizen ML with mock of LibML
 
 Some influential variable definitions:
     SIGNAL_SNORT_RELOAD=<int>
@@ -473,6 +474,9 @@ while [ $# -ne 0 ]; do
         --with-libml-libraries=*)
             append_cache_entry ML_LIBRARIES_DIR_HINT PATH $optarg
             ;;
+        --without-libml)
+            append_cache_entry ENABLE_KAIZEN_MOCK BOOL true
+            ;;
         SIGNAL_SNORT_RELOAD=*)
             append_cache_entry SIGNAL_SNORT_RELOAD STRING $optarg
             ;;