Merge pull request #20 from mmguero-dev/master

Cable-2-5 · web-flow · commit 83ab52c3d761 · 2023-09-13T17:40:26.000-04:00
fixes to make compatible with Zeek v6.0
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
 
 project(ZeekPluginGQUIC)
 
diff --git a/configure b/configure
@@ -25,7 +25,6 @@ Usage: $0 [OPTIONS]
     --install-root=DIR         Path where to install plugin into
     --with-binpac=DIR          Path to BinPAC installation root
     --with-broker=DIR          Path to Broker installation root
-    --with-caf=DIR             Path to CAF installation root
     --with-bifcl=PATH          Path to bifcl executable
     --enable-debug             Compile in debugging mode
 EOF
@@ -91,11 +90,6 @@ while [ $# -ne 0 ]; do
             broker_root=$optarg
             ;;
 
-        --with-caf=*)
-            append_cache_entry CAF_ROOT_DIR PATH $optarg
-            caf_root=$optarg
-            ;;
-
         --with-bifcl=*)
             append_cache_entry BifCl_EXE PATH $optarg
             ;;
@@ -160,9 +154,6 @@ if [ -z "$zeekdist" ]; then
                 append_cache_entry BROKER_ROOT_DIR PATH `${zeek_config} --broker_root`
             fi
 
-            if [ -z "$caf_root" ]; then
-                append_cache_entry CAF_ROOT_DIR PATH `${zeek_config} --caf_root`
-            fi
         else
             # Using legacy bro-config, so we must use the "--bro_dist" option.
             zeekdist=`${zeek_config} --bro_dist 2> /dev/null`

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`
`2`		`-cmake_minimum_required(VERSION 2.8)`
	`2`	`+cmake_minimum_required(VERSION 3.15 FATAL_ERROR)`
`3`	`3`
`4`	`4`	`project(ZeekPluginGQUIC)`
`5`	`5`