From 8650841bf553281bed7ea023354e83e8efea8970 Mon Sep 17 00:00:00 2001
From: Johanna Amann <johanna@icir.org>
Date: Thu, 24 Mar 2016 13:38:47 -0700
Subject: [PATCH] Only load openflow/netcontrol if compiled with broker.

---
 CHANGES                       | 6 ++++++
 VERSION                       | 2 +-
 scripts/base/init-default.bro | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index e90e85f125..a527dcbcc2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,10 @@
 
+2.4-424 | 2016-03-24 13:38:47 -0700
+
+  * Only load openflow/netcontrol if compiled with broker. (Johanna Amann)
+
+  * Adding canonifier to test. (Robin Sommer)
+
 2.4-422 | 2016-03-21 19:48:30 -0700
 
   * Adapt to recent change in CAF CMake script. (Matthias Vallentin)
diff --git a/VERSION b/VERSION
index 032d05a7ea..af797c6f72 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4-422
+2.4-424
diff --git a/scripts/base/init-default.bro b/scripts/base/init-default.bro
index 7fefe0111d..609ed7200c 100644
--- a/scripts/base/init-default.bro
+++ b/scripts/base/init-default.bro
@@ -37,8 +37,10 @@
 @load base/frameworks/reporter
 @load base/frameworks/sumstats
 @load base/frameworks/tunnels
+@ifdef ( BrokerComm::enable )
 @load base/frameworks/openflow
 @load base/frameworks/netcontrol
+@endif
 
 @load base/protocols/conn
 @load base/protocols/dhcp