Merge remote-tracking branch 'origin/topic/jsiwek/gh-1068-zeek-include-dir'

* origin/topic/jsiwek/gh-1068-zeek-include-dir:
  GH-1068: Add zeek symlink to allow "zeek/Foo.h" include style

CHANGES

@@ -1,4 +1,12 @@
 
+3.2.0-dev.965 | 2020-07-23 08:31:41 -0700
+
+  * GH-1068: Add zeek symlink to allow "zeek/Foo.h" include style
+
+    Also changes `zeek-config --include_dir` to now output
+    `$prefix/include:$prefix/include/zeek` instead of only
+    `$prefix/include/zeek` (Jon Siwek, Corelight)
+
 3.2.0-dev.962 | 2020-07-21 12:39:34 -0700
 
   * Add zeek-archiver tool as submodule

NEWS

@@ -288,6 +288,13 @@ Deprecated Functionality
   fields since those are redundant with what's already available in
   the connection parameter.
 
+- External plugins should include Zeek header files like
+  ``#include <zeek/Foo.h>`` instead of ``#include <Foo.h>``.  The later
+  style is considered deprecated.  Reliance on ``zeek-config --include_dir``
+  to contain ``$prefix/include/zeek`` is also deprecated: its replacement
+  output is expected to be just ``$prefix/include``, with it currently
+  outputting both paths, delimited by a colon, during the deprecation period.
+
 Zeek 3.1.0
 ==========
 

VERSION

@@ -1 +1 @@
-3.2.0-dev.962
+3.2.0-dev.965

auxil/zeek-aux

@@ -1 +1 @@
-Subproject commit 919095f2ad3a99fd728eeeaab4b6e8f5fb12d202
+Subproject commit 07509a08b62fa6cf1e006689fc9fb89d76adb716

cmake

@@ -1 +1 @@
-Subproject commit 6cb83a5a4a41adb7f7a5cc97661088caaa863180
+Subproject commit 8961b95de79fc72bede13550a79489b2542fcdd8

doc

@@ -1 +1 @@
-Subproject commit 0ec41dce98a5a1693d3a241455b95d84bd116cbd
+Subproject commit 48d9a82760a1c06ba40fce4c27677d01f6c263f9

src/zeek

@@ -0,0 +1 @@
+.

testing/btest/plugins/func-hook-plugin/src/Plugin.cc

@@ -1,12 +1,12 @@
 
 #include "Plugin.h"
 
-#include <Val.h>
-#include <Func.h>
-#include <Event.h>
-#include <Conn.h>
-#include <Desc.h>
-#include <threading/Formatter.h>
+#include <zeek/Val.h>
+#include <zeek/Func.h>
+#include <zeek/Event.h>
+#include <zeek/Conn.h>
+#include <zeek/Desc.h>
+#include <zeek/threading/Formatter.h>
 
 namespace plugin { namespace Demo_Hooks { Plugin plugin; } }
 

testing/btest/plugins/func-hook-plugin/src/Plugin.h

@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include <plugin/Plugin.h>
+#include <zeek/plugin/Plugin.h>
 
 namespace plugin {
 namespace Demo_Hooks {

zeek-config.in

@@ -9,7 +9,8 @@ plugin_dir=@BRO_PLUGIN_INSTALL_PATH@
 config_dir=@ZEEK_ETC_INSTALL_DIR@
 python_dir=@PY_MOD_INSTALL_DIR@
 cmake_dir=@CMAKE_INSTALL_PREFIX@/share/zeek/cmake
-include_dir=@CMAKE_INSTALL_PREFIX@/include/zeek
+# Remove in v4.1: don't need @prefix@/include/zeek, just @prefix@/include
+include_dir=@CMAKE_INSTALL_PREFIX@/include:@CMAKE_INSTALL_PREFIX@/include/zeek
 zeekpath=@DEFAULT_ZEEKPATH@
 zeek_dist=@ZEEK_DIST@
 binpac_root=@ZEEK_CONFIG_BINPAC_ROOT_DIR@