diff --git a/CHANGES b/CHANGES index 40090519c5..28956fb2be 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +4.1.0-dev.162 | 2021-01-29 21:05:41 -0800 + + * GH-1377: Add missing zeek/ to header includes (Jon Siwek, Corelight) + 4.1.0-dev.158 | 2021-01-29 16:37:56 -0800 * Fix language.init-in-anon-function btest due to changes to log filter predicates (Tim Wojtulewicz, Corelight) diff --git a/CMakeLists.txt b/CMakeLists.txt index e1d89bb8cd..259a30672f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -493,6 +493,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zeek-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/zeek-config.h) include_directories(${CMAKE_CURRENT_BINARY_DIR}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zeek-config.h DESTINATION include/zeek) +execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink + "." + "${CMAKE_CURRENT_BINARY_DIR}/zeek") if ( CAF_ROOT ) set(ZEEK_CONFIG_CAF_ROOT_DIR ${CAF_ROOT}) diff --git a/VERSION b/VERSION index 0678325b39..7844a53edb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.0-dev.158 +4.1.0-dev.162 diff --git a/auxil/bifcl b/auxil/bifcl index a455278a0c..d356e4716e 160000 --- a/auxil/bifcl +++ b/auxil/bifcl @@ -1 +1 @@ -Subproject commit a455278a0c571e99c26e1a06afa55ee07e665371 +Subproject commit d356e4716ef22e6175fe5dd4f3c49b8c4c892214 diff --git a/src/Attr.cc b/src/Attr.cc index e90f090c55..6810ea976e 100644 --- a/src/Attr.cc +++ b/src/Attr.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Attr.h" #include "zeek/Expr.h" diff --git a/src/Base64.cc b/src/Base64.cc index f76ca6ef9f..a431cdfcc5 100644 --- a/src/Base64.cc +++ b/src/Base64.cc @@ -1,4 +1,4 @@ -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include diff --git a/src/Base64.h b/src/Base64.h index 029baa364f..270b3d7802 100644 --- a/src/Base64.h +++ b/src/Base64.h @@ -1,6 +1,6 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include namespace zeek { class String; } diff --git a/src/BifReturnVal.h b/src/BifReturnVal.h index 3a09603554..63ff0e957b 100644 --- a/src/BifReturnVal.h +++ b/src/BifReturnVal.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/IntrusivePtr.h" ZEEK_FORWARD_DECLARE_NAMESPACED(Val, zeek); diff --git a/src/CCL.cc b/src/CCL.cc index 46926434dd..530348a38a 100644 --- a/src/CCL.cc +++ b/src/CCL.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/CCL.h" #include diff --git a/src/CompHash.cc b/src/CompHash.cc index 5d94fba0cd..5a874241b4 100644 --- a/src/CompHash.cc +++ b/src/CompHash.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/CompHash.h" #include diff --git a/src/Conn.cc b/src/Conn.cc index 731465dcfc..fd158b5476 100644 --- a/src/Conn.cc +++ b/src/Conn.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Conn.h" #include diff --git a/src/DFA.cc b/src/DFA.cc index f70c0854bc..9f5f511239 100644 --- a/src/DFA.cc +++ b/src/DFA.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/DFA.h" #include "zeek/EquivClass.h" diff --git a/src/DNS_Mgr.cc b/src/DNS_Mgr.cc index 67c7b0e264..9a439f012a 100644 --- a/src/DNS_Mgr.cc +++ b/src/DNS_Mgr.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/DNS_Mgr.h" #include diff --git a/src/DbgBreakpoint.cc b/src/DbgBreakpoint.cc index 4f414806ae..614631aad5 100644 --- a/src/DbgBreakpoint.cc +++ b/src/DbgBreakpoint.cc @@ -1,6 +1,6 @@ // Implementation of breakpoints. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/DbgBreakpoint.h" diff --git a/src/DbgHelp.cc b/src/DbgHelp.cc index a9c54abd24..373f0c0613 100644 --- a/src/DbgHelp.cc +++ b/src/DbgHelp.cc @@ -1,5 +1,5 @@ // Bro Debugger Help -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Debug.h" diff --git a/src/DbgWatch.cc b/src/DbgWatch.cc index 113b556f6e..25b4f4c22e 100644 --- a/src/DbgWatch.cc +++ b/src/DbgWatch.cc @@ -1,6 +1,6 @@ // Implementation of watches -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/DbgWatch.h" #include "zeek/Debug.h" diff --git a/src/Debug.cc b/src/Debug.cc index fe4b863e26..5e34213a25 100644 --- a/src/Debug.cc +++ b/src/Debug.cc @@ -1,6 +1,6 @@ // Debugging support for Bro policy files. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Debug.h" diff --git a/src/DebugCmds.cc b/src/DebugCmds.cc index ce4c99a3d8..abd0a1b033 100644 --- a/src/DebugCmds.cc +++ b/src/DebugCmds.cc @@ -1,7 +1,7 @@ // Support routines to help deal with Bro debugging commands and // implementation of most commands. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/DebugCmds.h" #include diff --git a/src/DebugLogger.h b/src/DebugLogger.h index dd5d7e8ad1..6aaac3daef 100644 --- a/src/DebugLogger.h +++ b/src/DebugLogger.h @@ -5,7 +5,7 @@ #ifdef DEBUG -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include #include diff --git a/src/Desc.cc b/src/Desc.cc index dc8c39b848..3497f73680 100644 --- a/src/Desc.cc +++ b/src/Desc.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Desc.h" #include diff --git a/src/Dict.cc b/src/Dict.cc index 80402037f1..47e350c98d 100644 --- a/src/Dict.cc +++ b/src/Dict.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Dict.h" #ifdef HAVE_MEMORY_H diff --git a/src/Discard.cc b/src/Discard.cc index bdaa7b942e..06826e5cd3 100644 --- a/src/Discard.cc +++ b/src/Discard.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Discard.h" diff --git a/src/EquivClass.cc b/src/EquivClass.cc index af736d257c..aff187f0c3 100644 --- a/src/EquivClass.cc +++ b/src/EquivClass.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/EquivClass.h" #include "zeek/CCL.h" diff --git a/src/Event.cc b/src/Event.cc index f7e10db50d..8a8616d788 100644 --- a/src/Event.cc +++ b/src/Event.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Event.h" #include "zeek/Desc.h" diff --git a/src/EventRegistry.h b/src/EventRegistry.h index 2d7f49da10..70a0fedc2a 100644 --- a/src/EventRegistry.h +++ b/src/EventRegistry.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include #include diff --git a/src/Expr.cc b/src/Expr.cc index 3c73a40ff0..974e413c70 100644 --- a/src/Expr.cc +++ b/src/Expr.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Expr.h" #include "zeek/Event.h" diff --git a/src/File.cc b/src/File.cc index 7ab0137467..964c92da14 100644 --- a/src/File.cc +++ b/src/File.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/File.h" #include diff --git a/src/Frag.cc b/src/Frag.cc index 608b6041f2..d7bd2e04d8 100644 --- a/src/Frag.cc +++ b/src/Frag.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Frag.h" #include "zeek/Hash.h" diff --git a/src/Func.cc b/src/Func.cc index dfd3ec0110..319868395e 100644 --- a/src/Func.cc +++ b/src/Func.cc @@ -1,7 +1,7 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Func.h" #include diff --git a/src/Hash.cc b/src/Hash.cc index 1fcd320b2b..a056ce753d 100644 --- a/src/Hash.cc +++ b/src/Hash.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Hash.h" #include diff --git a/src/ID.cc b/src/ID.cc index 4b67cff16d..5ddeab457f 100644 --- a/src/ID.cc +++ b/src/ID.cc @@ -1,7 +1,7 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/ID.h" #include "zeek/Attr.h" diff --git a/src/IP.h b/src/IP.h index 117f82aa1d..b6ff27b9de 100644 --- a/src/IP.h +++ b/src/IP.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include // for u_char #include diff --git a/src/IntSet.cc b/src/IntSet.cc index 0079fdf7b4..d3fca2a36a 100644 --- a/src/IntSet.cc +++ b/src/IntSet.cc @@ -1,4 +1,4 @@ -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/IntSet.h" #ifdef HAVE_MEMORY_H diff --git a/src/NFA.cc b/src/NFA.cc index 6843a2cd4e..efa2870106 100644 --- a/src/NFA.cc +++ b/src/NFA.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/NFA.h" #include diff --git a/src/NetVar.cc b/src/NetVar.cc index 23a0ea5bd0..f2952277f2 100644 --- a/src/NetVar.cc +++ b/src/NetVar.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/NetVar.h" #include "zeek/Var.h" diff --git a/src/Obj.cc b/src/Obj.cc index a4e178b592..7b96d51ca7 100644 --- a/src/Obj.cc +++ b/src/Obj.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Obj.h" #include diff --git a/src/Obj.h b/src/Obj.h index bd9ad00cb8..b839e54d7d 100644 --- a/src/Obj.h +++ b/src/Obj.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include diff --git a/src/Options.cc b/src/Options.cc index 6ab5b5bb0c..1793129dbf 100644 --- a/src/Options.cc +++ b/src/Options.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Options.h" #include "zeek/script_opt/ScriptOpt.h" diff --git a/src/PolicyFile.cc b/src/PolicyFile.cc index d1b7dba5f5..0605f947c4 100644 --- a/src/PolicyFile.cc +++ b/src/PolicyFile.cc @@ -1,4 +1,4 @@ -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/PolicyFile.h" #include diff --git a/src/PriorityQueue.cc b/src/PriorityQueue.cc index 87b1e60e65..3a2dfac8ed 100644 --- a/src/PriorityQueue.cc +++ b/src/PriorityQueue.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/PriorityQueue.h" #include diff --git a/src/PriorityQueue.h b/src/PriorityQueue.h index 39283f7d66..d36933c165 100644 --- a/src/PriorityQueue.h +++ b/src/PriorityQueue.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include #include diff --git a/src/RE.cc b/src/RE.cc index 6f10873642..9639f8223c 100644 --- a/src/RE.cc +++ b/src/RE.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/RE.h" #include diff --git a/src/RandTest.h b/src/RandTest.h index e96ae0455b..da0ebc9838 100644 --- a/src/RandTest.h +++ b/src/RandTest.h @@ -1,6 +1,6 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include #define RT_MONTEN 6 /* Bytes used as Monte Carlo diff --git a/src/Reassem.cc b/src/Reassem.cc index 6e4abad3cb..1f26e868cb 100644 --- a/src/Reassem.cc +++ b/src/Reassem.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Reassem.h" #include diff --git a/src/Reporter.cc b/src/Reporter.cc index 947568e99f..209bf243ca 100644 --- a/src/Reporter.cc +++ b/src/Reporter.cc @@ -2,7 +2,7 @@ // See the file "COPYING" in the main distribution directory for copyright. // -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Reporter.h" #include diff --git a/src/Rule.cc b/src/Rule.cc index 925f12df99..08b229d8f4 100644 --- a/src/Rule.cc +++ b/src/Rule.cc @@ -1,4 +1,4 @@ -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Rule.h" #include "zeek/RuleAction.h" diff --git a/src/RuleAction.cc b/src/RuleAction.cc index 143c626ae7..f59926f17e 100644 --- a/src/RuleAction.cc +++ b/src/RuleAction.cc @@ -1,4 +1,4 @@ -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/RuleAction.h" #include diff --git a/src/RuleCondition.cc b/src/RuleCondition.cc index a9b33c0ebb..33de7f86fc 100644 --- a/src/RuleCondition.cc +++ b/src/RuleCondition.cc @@ -1,4 +1,4 @@ -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/RuleCondition.h" #include "zeek/RuleMatcher.h" diff --git a/src/RuleMatcher.cc b/src/RuleMatcher.cc index 5ebcbc6221..0dda936540 100644 --- a/src/RuleMatcher.cc +++ b/src/RuleMatcher.cc @@ -1,5 +1,5 @@ -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/RuleMatcher.h" #include diff --git a/src/RunState.cc b/src/RunState.cc index 71807cfaa4..7c868dce04 100644 --- a/src/RunState.cc +++ b/src/RunState.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/RunState.h" #include diff --git a/src/RunState.h b/src/RunState.h index 8e201c34fc..4a894d996e 100644 --- a/src/RunState.h +++ b/src/RunState.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include #include diff --git a/src/Scope.cc b/src/Scope.cc index 5886edbab3..2aea8086ea 100644 --- a/src/Scope.cc +++ b/src/Scope.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Scope.h" #include "zeek/Desc.h" diff --git a/src/SerializationFormat.h b/src/SerializationFormat.h index 4f50de1716..af36cbd4a0 100644 --- a/src/SerializationFormat.h +++ b/src/SerializationFormat.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include #include diff --git a/src/Sessions.cc b/src/Sessions.cc index 7cb82c9cf8..878bb21786 100644 --- a/src/Sessions.cc +++ b/src/Sessions.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Sessions.h" #include diff --git a/src/SmithWaterman.cc b/src/SmithWaterman.cc index 7ea2edcb0c..d23f3bac30 100644 --- a/src/SmithWaterman.cc +++ b/src/SmithWaterman.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include #include diff --git a/src/Stats.h b/src/Stats.h index 04f9641c0c..4c4165ce6a 100644 --- a/src/Stats.h +++ b/src/Stats.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include #include diff --git a/src/Stmt.cc b/src/Stmt.cc index 61c85d6411..fe3bf8090e 100644 --- a/src/Stmt.cc +++ b/src/Stmt.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Stmt.h" diff --git a/src/Tag.h b/src/Tag.h index 11dbdf0dab..4e6cbf913d 100644 --- a/src/Tag.h +++ b/src/Tag.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include #include diff --git a/src/Timer.cc b/src/Timer.cc index 6706f8adc2..e8f47cfbb4 100644 --- a/src/Timer.cc +++ b/src/Timer.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Timer.h" #include "zeek/util.h" diff --git a/src/TraverseTypes.h b/src/TraverseTypes.h index 239cdcc78d..797264a32d 100644 --- a/src/TraverseTypes.h +++ b/src/TraverseTypes.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" ZEEK_FORWARD_DECLARE_NAMESPACED(TraversalCallback, zeek::detail); diff --git a/src/TunnelEncapsulation.h b/src/TunnelEncapsulation.h index a994f4c0c4..ad7bb6f31d 100644 --- a/src/TunnelEncapsulation.h +++ b/src/TunnelEncapsulation.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include diff --git a/src/Type.cc b/src/Type.cc index ec3b68d63d..4aecb487f7 100644 --- a/src/Type.cc +++ b/src/Type.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Type.h" #include diff --git a/src/Val.cc b/src/Val.cc index 132d1261d6..e76a62d0f8 100644 --- a/src/Val.cc +++ b/src/Val.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Val.h" #include diff --git a/src/Var.cc b/src/Var.cc index bcaa32237e..7524952975 100644 --- a/src/Var.cc +++ b/src/Var.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Var.h" #include diff --git a/src/ZeekString.cc b/src/ZeekString.cc index fef930c1d1..8e08315ae8 100644 --- a/src/ZeekString.cc +++ b/src/ZeekString.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/ZeekString.h" #include diff --git a/src/ZeekString.h b/src/ZeekString.h index 792d5cef17..b1722bc415 100644 --- a/src/ZeekString.h +++ b/src/ZeekString.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include diff --git a/src/analyzer/Component.h b/src/analyzer/Component.h index 138dafb222..0ff02c5511 100644 --- a/src/analyzer/Component.h +++ b/src/analyzer/Component.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/Tag.h" #include "zeek/plugin/Component.h" diff --git a/src/analyzer/Tag.h b/src/analyzer/Tag.h index 59e74493e5..c0fb8b0bdf 100644 --- a/src/analyzer/Tag.h +++ b/src/analyzer/Tag.h @@ -3,7 +3,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Tag.h" ZEEK_FORWARD_DECLARE_NAMESPACED(EnumVal, zeek); diff --git a/src/analyzer/protocol/dce-rpc/DCE_RPC.cc b/src/analyzer/protocol/dce-rpc/DCE_RPC.cc index b9387932e8..413f1a1f0d 100644 --- a/src/analyzer/protocol/dce-rpc/DCE_RPC.cc +++ b/src/analyzer/protocol/dce-rpc/DCE_RPC.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/dce-rpc/DCE_RPC.h" #include diff --git a/src/analyzer/protocol/dns/DNS.cc b/src/analyzer/protocol/dns/DNS.cc index 93bb855917..c760020636 100644 --- a/src/analyzer/protocol/dns/DNS.cc +++ b/src/analyzer/protocol/dns/DNS.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/dns/DNS.h" #include diff --git a/src/analyzer/protocol/finger/Finger.cc b/src/analyzer/protocol/finger/Finger.cc index 6a4763a59a..fdcebb16bc 100644 --- a/src/analyzer/protocol/finger/Finger.cc +++ b/src/analyzer/protocol/finger/Finger.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/finger/Finger.h" #include diff --git a/src/analyzer/protocol/ftp/FTP.cc b/src/analyzer/protocol/ftp/FTP.cc index 71d645c18a..57cdb6e0a3 100644 --- a/src/analyzer/protocol/ftp/FTP.cc +++ b/src/analyzer/protocol/ftp/FTP.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/ftp/FTP.h" #include diff --git a/src/analyzer/protocol/gnutella/Gnutella.cc b/src/analyzer/protocol/gnutella/Gnutella.cc index 4ba8e86243..7c1193da00 100644 --- a/src/analyzer/protocol/gnutella/Gnutella.cc +++ b/src/analyzer/protocol/gnutella/Gnutella.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/gnutella/Gnutella.h" #include diff --git a/src/analyzer/protocol/http/HTTP.cc b/src/analyzer/protocol/http/HTTP.cc index 852581c2b6..3f902b79b7 100644 --- a/src/analyzer/protocol/http/HTTP.cc +++ b/src/analyzer/protocol/http/HTTP.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/http/HTTP.h" #include diff --git a/src/analyzer/protocol/icmp/ICMP.cc b/src/analyzer/protocol/icmp/ICMP.cc index d24c8d7853..fb77af1fc6 100644 --- a/src/analyzer/protocol/icmp/ICMP.cc +++ b/src/analyzer/protocol/icmp/ICMP.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/icmp/ICMP.h" #include diff --git a/src/analyzer/protocol/ident/Ident.cc b/src/analyzer/protocol/ident/Ident.cc index 8dbd42615e..146d2c9ccf 100644 --- a/src/analyzer/protocol/ident/Ident.cc +++ b/src/analyzer/protocol/ident/Ident.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/ident/Ident.h" #include diff --git a/src/analyzer/protocol/imap/imap.pac b/src/analyzer/protocol/imap/imap.pac index bd162f0e8e..d2381793ec 100644 --- a/src/analyzer/protocol/imap/imap.pac +++ b/src/analyzer/protocol/imap/imap.pac @@ -12,7 +12,7 @@ namespace zeek::analyzer::imap { class IMAP_Analyzer; } namespace binpac { namespace IMAP { class IMAP_Conn; } } using IMAPAnalyzer = zeek::analyzer::imap::IMAP_Analyzer*; -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Reporter.h" #include "zeek/analyzer/protocol/imap/IMAP.h" diff --git a/src/analyzer/protocol/krb/KRB.h b/src/analyzer/protocol/krb/KRB.h index c70d972d1e..d2a98c4e9a 100644 --- a/src/analyzer/protocol/krb/KRB.h +++ b/src/analyzer/protocol/krb/KRB.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include #ifdef USE_KRB5 diff --git a/src/analyzer/protocol/krb/krb.pac b/src/analyzer/protocol/krb/krb.pac index d8a2392506..f4631ac1ab 100644 --- a/src/analyzer/protocol/krb/krb.pac +++ b/src/analyzer/protocol/krb/krb.pac @@ -6,7 +6,7 @@ namespace zeek::analyzer::krb { class KRB_Analyzer; } namespace binpac { namespace KRB { class KRB_Conn; } } using KRBAnalyzer = zeek::analyzer::krb::KRB_Analyzer*; -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/krb/KRB.h" #include "analyzer/protocol/krb/types.bif.h" diff --git a/src/analyzer/protocol/krb/krb_TCP.pac b/src/analyzer/protocol/krb/krb_TCP.pac index d5c48395c8..0373f65cf2 100644 --- a/src/analyzer/protocol/krb/krb_TCP.pac +++ b/src/analyzer/protocol/krb/krb_TCP.pac @@ -6,7 +6,7 @@ namespace zeek::analyzer::krb_tcp { class KRB_Analyzer; } namespace binpac { namespace KRB_TCP { class KRB_Conn; } } using KRBTCPAnalyzer = zeek::analyzer::krb_tcp::KRB_Analyzer*; -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/krb/KRB_TCP.h" #include "analyzer/protocol/krb/types.bif.h" diff --git a/src/analyzer/protocol/login/Login.cc b/src/analyzer/protocol/login/Login.cc index d2e35960bf..2c23cb1ba4 100644 --- a/src/analyzer/protocol/login/Login.cc +++ b/src/analyzer/protocol/login/Login.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/login/Login.h" #include diff --git a/src/analyzer/protocol/login/NVT.cc b/src/analyzer/protocol/login/NVT.cc index f35790f583..1925ad8f58 100644 --- a/src/analyzer/protocol/login/NVT.cc +++ b/src/analyzer/protocol/login/NVT.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/login/NVT.h" #include diff --git a/src/analyzer/protocol/login/RSH.cc b/src/analyzer/protocol/login/RSH.cc index 0653497585..eaa227765f 100644 --- a/src/analyzer/protocol/login/RSH.cc +++ b/src/analyzer/protocol/login/RSH.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/login/RSH.h" #include "zeek/NetVar.h" diff --git a/src/analyzer/protocol/login/Rlogin.cc b/src/analyzer/protocol/login/Rlogin.cc index b943f04610..8a441f8625 100644 --- a/src/analyzer/protocol/login/Rlogin.cc +++ b/src/analyzer/protocol/login/Rlogin.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/login/Rlogin.h" #include "zeek/NetVar.h" diff --git a/src/analyzer/protocol/login/Telnet.cc b/src/analyzer/protocol/login/Telnet.cc index 2fe167ff68..5179843d6c 100644 --- a/src/analyzer/protocol/login/Telnet.cc +++ b/src/analyzer/protocol/login/Telnet.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/login/Telnet.h" #include "zeek/analyzer/protocol/login/NVT.h" diff --git a/src/analyzer/protocol/mime/MIME.cc b/src/analyzer/protocol/mime/MIME.cc index 6a28447ad7..84947312c2 100644 --- a/src/analyzer/protocol/mime/MIME.cc +++ b/src/analyzer/protocol/mime/MIME.cc @@ -1,4 +1,4 @@ -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/mime/MIME.h" #include "zeek/NetVar.h" diff --git a/src/analyzer/protocol/ncp/NCP.cc b/src/analyzer/protocol/ncp/NCP.cc index 7282015cfb..b1b13e935b 100644 --- a/src/analyzer/protocol/ncp/NCP.cc +++ b/src/analyzer/protocol/ncp/NCP.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/ncp/NCP.h" #include diff --git a/src/analyzer/protocol/netbios/NetbiosSSN.cc b/src/analyzer/protocol/netbios/NetbiosSSN.cc index da6c91bb36..4c731f444c 100644 --- a/src/analyzer/protocol/netbios/NetbiosSSN.cc +++ b/src/analyzer/protocol/netbios/NetbiosSSN.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/netbios/NetbiosSSN.h" #include diff --git a/src/analyzer/protocol/pop3/POP3.cc b/src/analyzer/protocol/pop3/POP3.cc index 8c5ff60203..3a43b6b60a 100644 --- a/src/analyzer/protocol/pop3/POP3.cc +++ b/src/analyzer/protocol/pop3/POP3.cc @@ -1,7 +1,7 @@ // This code contributed to Bro by Florian Schimandl, Hugh Dollman and // Robin Sommer. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/pop3/POP3.h" #include diff --git a/src/analyzer/protocol/rpc/MOUNT.cc b/src/analyzer/protocol/rpc/MOUNT.cc index 5a5f6a2503..2ff1e63a67 100644 --- a/src/analyzer/protocol/rpc/MOUNT.cc +++ b/src/analyzer/protocol/rpc/MOUNT.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/rpc/MOUNT.h" #include diff --git a/src/analyzer/protocol/rpc/NFS.cc b/src/analyzer/protocol/rpc/NFS.cc index 15a5f33821..d11a54ccff 100644 --- a/src/analyzer/protocol/rpc/NFS.cc +++ b/src/analyzer/protocol/rpc/NFS.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/rpc/NFS.h" #include diff --git a/src/analyzer/protocol/rpc/Portmap.cc b/src/analyzer/protocol/rpc/Portmap.cc index 6d5644c736..633084bf82 100644 --- a/src/analyzer/protocol/rpc/Portmap.cc +++ b/src/analyzer/protocol/rpc/Portmap.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/rpc/Portmap.h" #include "zeek/NetVar.h" diff --git a/src/analyzer/protocol/rpc/RPC.cc b/src/analyzer/protocol/rpc/RPC.cc index 61ee54b861..9a26b4034e 100644 --- a/src/analyzer/protocol/rpc/RPC.cc +++ b/src/analyzer/protocol/rpc/RPC.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/rpc/RPC.h" #include diff --git a/src/analyzer/protocol/rpc/XDR.cc b/src/analyzer/protocol/rpc/XDR.cc index 2cd417a8d9..0eff4ae885 100644 --- a/src/analyzer/protocol/rpc/XDR.cc +++ b/src/analyzer/protocol/rpc/XDR.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/rpc/XDR.h" #include diff --git a/src/analyzer/protocol/smtp/SMTP.cc b/src/analyzer/protocol/smtp/SMTP.cc index 22aaf7ec06..328a60c935 100644 --- a/src/analyzer/protocol/smtp/SMTP.cc +++ b/src/analyzer/protocol/smtp/SMTP.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/smtp/SMTP.h" #include diff --git a/src/analyzer/protocol/stepping-stone/SteppingStone.cc b/src/analyzer/protocol/stepping-stone/SteppingStone.cc index 191c67fdeb..cac857c5cb 100644 --- a/src/analyzer/protocol/stepping-stone/SteppingStone.cc +++ b/src/analyzer/protocol/stepping-stone/SteppingStone.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/stepping-stone/SteppingStone.h" #include diff --git a/src/analyzer/protocol/udp/UDP.cc b/src/analyzer/protocol/udp/UDP.cc index ae4e2c89af..b494ffcf0a 100644 --- a/src/analyzer/protocol/udp/UDP.cc +++ b/src/analyzer/protocol/udp/UDP.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/analyzer/protocol/udp/UDP.h" #include diff --git a/src/analyzer/protocol/zip/ZIP.h b/src/analyzer/protocol/zip/ZIP.h index bc9dafd252..8a3e10f7dc 100644 --- a/src/analyzer/protocol/zip/ZIP.h +++ b/src/analyzer/protocol/zip/ZIP.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include diff --git a/src/bsd-getopt-long.c b/src/bsd-getopt-long.c index dc880f87dd..6097010857 100644 --- a/src/bsd-getopt-long.c +++ b/src/bsd-getopt-long.c @@ -54,7 +54,7 @@ #define IN_GETOPT_LONG_C 1 -#include +#include #include #include #include diff --git a/src/file_analysis/Component.h b/src/file_analysis/Component.h index c1ba902405..0bbe167185 100644 --- a/src/file_analysis/Component.h +++ b/src/file_analysis/Component.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/file_analysis/Tag.h" #include "zeek/plugin/Component.h" diff --git a/src/file_analysis/Tag.h b/src/file_analysis/Tag.h index 963d823ee5..15d624113a 100644 --- a/src/file_analysis/Tag.h +++ b/src/file_analysis/Tag.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Tag.h" ZEEK_FORWARD_DECLARE_NAMESPACED(EnumVal, zeek); diff --git a/src/input/Tag.h b/src/input/Tag.h index fe4884ea42..b2f0c7ec8e 100644 --- a/src/input/Tag.h +++ b/src/input/Tag.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Tag.h" ZEEK_FORWARD_DECLARE_NAMESPACED(EnumVal, zeek); diff --git a/src/input/readers/sqlite/SQLite.cc b/src/input/readers/sqlite/SQLite.cc index 93578c32f6..9522fc3c70 100644 --- a/src/input/readers/sqlite/SQLite.cc +++ b/src/input/readers/sqlite/SQLite.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/input/readers/sqlite/SQLite.h" #include diff --git a/src/input/readers/sqlite/SQLite.h b/src/input/readers/sqlite/SQLite.h index 212e488a2c..cc9265696c 100644 --- a/src/input/readers/sqlite/SQLite.h +++ b/src/input/readers/sqlite/SQLite.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include #include diff --git a/src/iosource/BPF_Program.cc b/src/iosource/BPF_Program.cc index 65a47185b0..6fec12d08a 100644 --- a/src/iosource/BPF_Program.cc +++ b/src/iosource/BPF_Program.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/iosource/BPF_Program.h" #include diff --git a/src/iosource/Manager.h b/src/iosource/Manager.h index 2001643898..2bee5bfa27 100644 --- a/src/iosource/Manager.h +++ b/src/iosource/Manager.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include #include diff --git a/src/iosource/Packet.h b/src/iosource/Packet.h index fb8aa2e3e2..047b91f11d 100644 --- a/src/iosource/Packet.h +++ b/src/iosource/Packet.h @@ -1,6 +1,6 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include #include // for u_char diff --git a/src/iosource/PktDumper.cc b/src/iosource/PktDumper.cc index 952f1a279c..3c84973c41 100644 --- a/src/iosource/PktDumper.cc +++ b/src/iosource/PktDumper.cc @@ -1,7 +1,7 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/iosource/PktDumper.h" #include "zeek/DebugLogger.h" diff --git a/src/iosource/PktDumper.h b/src/iosource/PktDumper.h index f948b149ab..3eeff775b1 100644 --- a/src/iosource/PktDumper.h +++ b/src/iosource/PktDumper.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include ZEEK_FORWARD_DECLARE_NAMESPACED(Packet, zeek); diff --git a/src/iosource/PktSrc.cc b/src/iosource/PktSrc.cc index 5c182b8dc6..d74458b3b4 100644 --- a/src/iosource/PktSrc.cc +++ b/src/iosource/PktSrc.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/iosource/PktSrc.h" #include diff --git a/src/iosource/pcap/Source.cc b/src/iosource/pcap/Source.cc index 3f6fc9d777..c7401f15d3 100644 --- a/src/iosource/pcap/Source.cc +++ b/src/iosource/pcap/Source.cc @@ -1,6 +1,6 @@ // See the file in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/iosource/pcap/Source.h" #ifdef HAVE_PCAP_INT_H diff --git a/src/logging/Tag.h b/src/logging/Tag.h index 94b620349c..46ba599cf8 100644 --- a/src/logging/Tag.h +++ b/src/logging/Tag.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Tag.h" ZEEK_FORWARD_DECLARE_NAMESPACED(EnumVal, zeek); diff --git a/src/logging/writers/sqlite/SQLite.cc b/src/logging/writers/sqlite/SQLite.cc index e3977d32d8..e67f644660 100644 --- a/src/logging/writers/sqlite/SQLite.cc +++ b/src/logging/writers/sqlite/SQLite.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/logging/writers/sqlite/SQLite.h" #include diff --git a/src/logging/writers/sqlite/SQLite.h b/src/logging/writers/sqlite/SQLite.h index 130eba5a7b..49f9addc6f 100644 --- a/src/logging/writers/sqlite/SQLite.h +++ b/src/logging/writers/sqlite/SQLite.h @@ -4,7 +4,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/logging/WriterBackend.h" #include "zeek/threading/formatters/Ascii.h" diff --git a/src/main.cc b/src/main.cc index e96bfc9adf..9b3c25ce6b 100644 --- a/src/main.cc +++ b/src/main.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/zeek-setup.h" #include "zeek/iosource/Manager.h" diff --git a/src/nb_dns.c b/src/nb_dns.c index cb189e40f0..d02ed35be2 100644 --- a/src/nb_dns.c +++ b/src/nb_dns.c @@ -11,7 +11,7 @@ * crack reply buffers is private. */ -#include "zeek-config.h" /* must appear before first ifdef */ +#include "zeek/zeek-config.h" /* must appear before first ifdef */ #include "zeek/nb_dns.h" #include diff --git a/src/net_util.cc b/src/net_util.cc index 728a1408dd..33f756aa3f 100644 --- a/src/net_util.cc +++ b/src/net_util.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/net_util.h" #include diff --git a/src/net_util.h b/src/net_util.h index 758dbe8109..fb7e410d3a 100644 --- a/src/net_util.h +++ b/src/net_util.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" // Define first. typedef enum { diff --git a/src/packet_analysis/Component.h b/src/packet_analysis/Component.h index 2dc40d1cda..51b175c798 100644 --- a/src/packet_analysis/Component.h +++ b/src/packet_analysis/Component.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include diff --git a/src/packet_analysis/Tag.h b/src/packet_analysis/Tag.h index 36af26c3e9..9b115aaf3c 100644 --- a/src/packet_analysis/Tag.h +++ b/src/packet_analysis/Tag.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/Tag.h" namespace zeek::plugin { diff --git a/src/packet_analysis/protocol/arp/ARP.cc b/src/packet_analysis/protocol/arp/ARP.cc index f63d385ed1..5f1bb95e46 100644 --- a/src/packet_analysis/protocol/arp/ARP.cc +++ b/src/packet_analysis/protocol/arp/ARP.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/packet_analysis/protocol/arp/ARP.h" #ifdef HAVE_NET_ETHERNET_H diff --git a/src/plugin/Component.h b/src/plugin/Component.h index 9d0f424082..709565b6d1 100644 --- a/src/plugin/Component.h +++ b/src/plugin/Component.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include ZEEK_FORWARD_DECLARE_NAMESPACED(ODesc, zeek); diff --git a/src/plugin/Plugin.h b/src/plugin/Plugin.h index 5393cd0b40..49f7622427 100644 --- a/src/plugin/Plugin.h +++ b/src/plugin/Plugin.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include #include diff --git a/src/probabilistic/BloomFilter.h b/src/probabilistic/BloomFilter.h index 3272081d5d..75dfbdaf34 100644 --- a/src/probabilistic/BloomFilter.h +++ b/src/probabilistic/BloomFilter.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include #include diff --git a/src/probabilistic/CounterVector.h b/src/probabilistic/CounterVector.h index c5c7a2f8e2..430cfd83b7 100644 --- a/src/probabilistic/CounterVector.h +++ b/src/probabilistic/CounterVector.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include #include diff --git a/src/rule-parse.y b/src/rule-parse.y index d0ffa7c04e..1c51fc7334 100644 --- a/src/rule-parse.y +++ b/src/rule-parse.y @@ -1,5 +1,5 @@ %{ -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include #include #include diff --git a/src/setsignal.c b/src/setsignal.c index 90bb5fd291..d91b91f9e0 100644 --- a/src/setsignal.c +++ b/src/setsignal.c @@ -2,7 +2,7 @@ * See the file "COPYING" in the main distribution directory for copyright. */ -#include "zeek-config.h" /* must appear before first ifdef */ +#include "zeek/zeek-config.h" /* must appear before first ifdef */ #include diff --git a/src/strsep.c b/src/strsep.c index 0c65402441..ef0970bd40 100644 --- a/src/strsep.c +++ b/src/strsep.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -#include "zeek-config.h" +#include "zeek/zeek-config.h" #ifndef HAVE_STRSEP diff --git a/src/supervisor/Supervisor.cc b/src/supervisor/Supervisor.cc index 315be81e80..76b760835b 100644 --- a/src/supervisor/Supervisor.cc +++ b/src/supervisor/Supervisor.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/supervisor/Supervisor.h" #include diff --git a/src/threading/BasicThread.cc b/src/threading/BasicThread.cc index 46a0730ae4..c0dc7365e4 100644 --- a/src/threading/BasicThread.cc +++ b/src/threading/BasicThread.cc @@ -1,4 +1,4 @@ -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/threading/BasicThread.h" #include diff --git a/src/threading/BasicThread.h b/src/threading/BasicThread.h index 12190bdfde..e068d1fa0a 100644 --- a/src/threading/BasicThread.h +++ b/src/threading/BasicThread.h @@ -1,7 +1,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include diff --git a/src/threading/Formatter.cc b/src/threading/Formatter.cc index 688b2779c2..6694f894dc 100644 --- a/src/threading/Formatter.cc +++ b/src/threading/Formatter.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/threading/Formatter.h" #include diff --git a/src/threading/formatters/Ascii.cc b/src/threading/formatters/Ascii.cc index 61cd7846fa..ff43bfa27b 100644 --- a/src/threading/formatters/Ascii.cc +++ b/src/threading/formatters/Ascii.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "threading/formatters/Ascii.h" #include diff --git a/src/threading/formatters/JSON.cc b/src/threading/formatters/JSON.cc index 2c09963071..e2c459a588 100644 --- a/src/threading/formatters/JSON.cc +++ b/src/threading/formatters/JSON.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/threading/formatters/JSON.h" #ifndef __STDC_LIMIT_MACROS diff --git a/src/util.cc b/src/util.cc index d045dce92c..4b99b1b0fd 100644 --- a/src/util.cc +++ b/src/util.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "util-config.h" #include "zeek/util.h" diff --git a/src/util.h b/src/util.h index 6d74113fa8..f8bdedcadf 100644 --- a/src/util.h +++ b/src/util.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" // Expose C99 functionality from inttypes.h, which would otherwise not be // available in C++. diff --git a/src/version.c.in b/src/version.c.in index 1b7676bf3a..ef967f16aa 100644 --- a/src/version.c.in +++ b/src/version.c.in @@ -1,5 +1,5 @@ -#include "zeek-config.h" +#include "zeek/zeek-config.h" char version[] = "@VERSION@"; diff --git a/src/zeek-setup.cc b/src/zeek-setup.cc index 44f1dbc70e..0dc8335469 100644 --- a/src/zeek-setup.cc +++ b/src/zeek-setup.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include "zeek/zeek-setup.h" #include diff --git a/src/zeekygen/ScriptInfo.h b/src/zeekygen/ScriptInfo.h index 5a4a925be7..bf005c5924 100644 --- a/src/zeekygen/ScriptInfo.h +++ b/src/zeekygen/ScriptInfo.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include // for time_t #include diff --git a/src/zeekygen/Target.h b/src/zeekygen/Target.h index ac5dc05189..754d117b87 100644 --- a/src/zeekygen/Target.h +++ b/src/zeekygen/Target.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include #include diff --git a/src/zeekygen/utils.h b/src/zeekygen/utils.h index 4e1ef49809..0d59472270 100644 --- a/src/zeekygen/utils.h +++ b/src/zeekygen/utils.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek-config.h" +#include "zeek/zeek-config.h" #include // for time_t #include