From a6b0fde65ff9803200f59520bfe8a8cc595838f2 Mon Sep 17 00:00:00 2001
From: Christian Kreibich <christian@corelight.com>
Date: Tue, 6 Jul 2021 17:47:46 -0700
Subject: [PATCH] Add zeek-client via new submodule

The new module resides in auxil/zeek-client. It does not get installed unless
one configures with --enable-zeek-client.
---
 .gitmodules       | 3 +++
 CMakeLists.txt    | 3 ++-
 auxil/zeek-client | 1 +
 configure         | 4 ++++
 4 files changed, 10 insertions(+), 1 deletion(-)
 create mode 160000 auxil/zeek-client

diff --git a/.gitmodules b/.gitmodules
index 326d21d7e1..4318212fe0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -46,3 +46,6 @@
 [submodule "auxil/package-manager"]
 	path = auxil/package-manager
 	url = https://github.com/zeek/package-manager
+[submodule "auxil/zeek-client"]
+	path = auxil/zeek-client
+	url = https://github.com/zeek/zeek-client
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 775bbecce0..b15b8cc050 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -616,11 +616,12 @@ CheckOptionalBuildSources(auxil/package-manager ZKG INSTALL_ZKG)
 CheckOptionalBuildSources(auxil/zeekctl   ZeekControl INSTALL_ZEEKCTL)
 CheckOptionalBuildSources(auxil/zeek-aux  Zeek-Aux  INSTALL_AUX_TOOLS)
 CheckOptionalBuildSources(auxil/zeek-archiver ZeekArchiver INSTALL_ZEEK_ARCHIVER)
+CheckOptionalBuildSources(auxil/zeek-client ZeekClient INSTALL_ZEEK_CLIENT)
 
 ########################################################################
 ## Packaging Setup
 
-if ( INSTALL_ZEEKCTL OR INSTALL_ZKG )
+if ( INSTALL_ZEEKCTL OR INSTALL_ZKG OR INSTALL_ZEEK_CLIENT )
     # CPack RPM Generator may not automatically detect this
     set(CPACK_RPM_PACKAGE_REQUIRES "python >= ${ZEEK_PYTHON_MIN}")
 endif ()
diff --git a/auxil/zeek-client b/auxil/zeek-client
new file mode 160000
index 0000000000..afe253c775
--- /dev/null
+++ b/auxil/zeek-client
@@ -0,0 +1 @@
+Subproject commit afe253c77591e87b2a6cf6d5682cd02caa78e9d2
diff --git a/configure b/configure
index 6db1dcfc8d..f40846bc43 100755
--- a/configure
+++ b/configure
@@ -64,6 +64,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
     --enable-static-broker build Broker statically (ignored if --with-broker is specified)
     --enable-static-binpac build binpac statically (ignored if --with-binpac is specified)
     --enable-cpp-tests     build Zeek's C++ unit tests
+    --enable-zeek-client   install the Zeek cluster management client (experimental)
     --disable-zeekctl      don't install ZeekControl
     --disable-auxtools     don't build or install auxiliary tools
     --disable-archiver     don't build or install zeek-archiver tool
@@ -290,6 +291,9 @@ while [ $# -ne 0 ]; do
         --enable-cpp-tests)
             append_cache_entry ENABLE_ZEEK_UNIT_TESTS BOOL    true
             ;;
+        --enable-zeek-client)
+            append_cache_entry INSTALL_ZEEK_CLIENT    BOOL    true
+            ;;
         --disable-zeekctl)
             append_cache_entry INSTALL_ZEEKCTL       BOOL   false
             ;;