From 02b7439d44fd2e517ba074b1e514eae38acb3dba Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Fri, 5 May 2023 21:04:11 +0200
Subject: [PATCH] Revert "Skip version.h by default for Zeek sources"

This reverts commit 8246baf25c692b658e7a39527f6652e37f5b5095.

Actually fails the include_plugins CI test and I had just
opened another related issue.
---
 CHANGES        | 9 +++++++++
 CMakeLists.txt | 5 -----
 VERSION        | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 32dd03a153..577290eb12 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+6.0.0-dev.511 | 2023-05-05 21:04:11 +0200
+
+  * Revert "Skip version.h by default for Zeek sources" (Arne Welzel, Corelight)
+
+    This reverts commit 8246baf25c692b658e7a39527f6652e37f5b5095.
+
+    Actually fails the include_plugins CI test and I had just
+    opened another related issue.
+
 6.0.0-dev.510 | 2023-05-05 20:14:21 +0200
 
   * Skip version.h by default for Zeek sources (Dominik Charousset, Corelight)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 628987568f..43952dc00d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,11 +192,6 @@ set_target_properties(zeek_internal PROPERTIES EXPORT_NAME Internal)
 install(TARGETS zeek_internal EXPORT ZeekTargets)
 target_compile_features(zeek_internal INTERFACE ${ZEEK_CXX_STD})
 
-# Skip including the version.h header from the zeek-config.h header. This is
-# mainly to optimize build times on CI by making sure the compiler cache remains
-# valid for longer.
-target_compile_definitions(zeek_internal INTERFACE ZEEK_CONFIG_SKIP_VERSION_H)
-
 # Target for bundling the creation of auto-generated files.
 add_custom_target(zeek_autogen_files)
 
diff --git a/VERSION b/VERSION
index 8dc59a172a..d43d6dba63 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.0-dev.510
+6.0.0-dev.511