From 95ea468db1166eeb27aa4eab42ac9d0737153911 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Tue, 19 Aug 2025 15:53:20 -0700
Subject: [PATCH] Remove configure --with-gen-zam argument and the CMake
 summaries

---
 CMakeLists.txt | 7 +------
 configure      | 5 -----
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 497c7d188b..56b8ec4b9e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -911,9 +911,7 @@ add_executable(Zeek::BifCl ALIAS bifcl)
 set(BIFCL_EXE_PATH "${CMAKE_BINARY_DIR}/tools/bifcl/bifcl${CMAKE_EXECUTABLE_SUFFIX}")
 set(_bifcl_exe_path "included")
 
-if (NOT GEN_ZAM_EXE_PATH)
-    add_subdirectory(tools/gen-zam)
-endif ()
+add_subdirectory(tools/gen-zam)
 
 if (ENABLE_JEMALLOC)
     if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
@@ -1547,11 +1545,8 @@ message("")
 
 output_summary_bool("AF_PACKET" ${ZEEK_HAVE_AF_PACKET})
 output_summary_bool("Aux. Tools" ${INSTALL_AUX_TOOLS})
-output_summary_line("BifCL" ${_bifcl_exe_path})
-output_summary_line("BinPAC" ${_binpac_exe_path})
 output_summary_bool("BTest" ${INSTALL_BTEST})
 output_summary_line("BTest tooling" ${_install_btest_tools_msg})
-output_summary_line("Gen-ZAM" ${_gen_zam_exe_path})
 output_summary_bool("JavaScript" ${ZEEK_HAVE_JAVASCRIPT})
 output_summary_line("Spicy" ${_spicy})
 output_summary_bool("Spicy analyzers" ${USE_SPICY_ANALYZERS})
diff --git a/configure b/configure
index d407343ad0..751769992b 100755
--- a/configure
+++ b/configure
@@ -93,8 +93,6 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
     --with-bison=PATH      path to bison executable
     --with-broker=PATH     path to Broker install root
                            (Zeek uses an embedded version by default)
-    --with-gen-zam=PATH    path to Gen-ZAM code generator
-                           (Zeek uses an embedded version by default)
     --with-flex=PATH       path to flex executable
     --with-libkqueue=PATH  path to libkqueue install root
                            (Zeek uses an embedded version by default)
@@ -378,9 +376,6 @@ while [ $# -ne 0 ]; do
         --with-flex=*)
             append_cache_entry FLEX_EXECUTABLE PATH $optarg
             ;;
-        --with-gen-zam=*)
-            append_cache_entry GEN_ZAM_EXE_PATH PATH $optarg
-            ;;
         --with-geoip=*)
             append_cache_entry LibMMDB_ROOT_DIR PATH $optarg
             ;;