diff --git a/NEWS b/NEWS index 41b44de954..60af9ba97d 100644 --- a/NEWS +++ b/NEWS @@ -272,6 +272,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 `` instead of ``#include ``. 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 ========== diff --git a/auxil/zeek-aux b/auxil/zeek-aux index 919095f2ad..07509a08b6 160000 --- a/auxil/zeek-aux +++ b/auxil/zeek-aux @@ -1 +1 @@ -Subproject commit 919095f2ad3a99fd728eeeaab4b6e8f5fb12d202 +Subproject commit 07509a08b62fa6cf1e006689fc9fb89d76adb716 diff --git a/cmake b/cmake index 6cb83a5a4a..8961b95de7 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 6cb83a5a4a41adb7f7a5cc97661088caaa863180 +Subproject commit 8961b95de79fc72bede13550a79489b2542fcdd8 diff --git a/doc b/doc index 9958974168..1f5a0a47c5 160000 --- a/doc +++ b/doc @@ -1 +1 @@ -Subproject commit 9958974168016e84879af38410881022d1f1fd6d +Subproject commit 1f5a0a47c558b36ebfc2dec66f02cfafb752c250 diff --git a/src/zeek b/src/zeek new file mode 120000 index 0000000000..945c9b46d6 --- /dev/null +++ b/src/zeek @@ -0,0 +1 @@ +. \ No newline at end of file diff --git a/testing/btest/plugins/func-hook-plugin/src/Plugin.cc b/testing/btest/plugins/func-hook-plugin/src/Plugin.cc index 99348affe3..ecb8dc9c9c 100644 --- a/testing/btest/plugins/func-hook-plugin/src/Plugin.cc +++ b/testing/btest/plugins/func-hook-plugin/src/Plugin.cc @@ -1,12 +1,12 @@ #include "Plugin.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace plugin { namespace Demo_Hooks { Plugin plugin; } } diff --git a/testing/btest/plugins/func-hook-plugin/src/Plugin.h b/testing/btest/plugins/func-hook-plugin/src/Plugin.h index 19bccd4386..8255d251c4 100644 --- a/testing/btest/plugins/func-hook-plugin/src/Plugin.h +++ b/testing/btest/plugins/func-hook-plugin/src/Plugin.h @@ -1,7 +1,7 @@ #pragma once -#include +#include namespace plugin { namespace Demo_Hooks { diff --git a/zeek-config.in b/zeek-config.in index 50d99b6645..608e8f67f9 100755 --- a/zeek-config.in +++ b/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@