Add --with-broker configure option

CHANGES

@@ -1,4 +1,8 @@
 
+2.5-888 | 2018-08-21 15:54:56 -0500
+
+  * Add --with-broker configure option (Jon Siwek, Corelight)
+
 2.5-887 | 2018-08-21 14:54:12 -0500
 
   * Change default snaplen to 9216 bytes to better accommodate jumbo frames

CMakeLists.txt

@@ -95,14 +95,6 @@ FindRequiredPackage(OpenSSL)
 FindRequiredPackage(BIND)
 FindRequiredPackage(ZLIB)
 
-find_package(CAF COMPONENTS core io openssl)
-if (CAF_FOUND)
-    # e.g. if not using embedded CAF, then need to know where to look
-    # for CAF headers since that may differ from where Broker headers
-    # are found (and including a Broker header may pull in CAF headers).
-	include_directories(BEFORE ${CAF_INCLUDE_DIRS})
-endif ()
-
 if (NOT BINPAC_EXE_PATH AND
     EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/aux/binpac/CMakeLists.txt)
     add_subdirectory(aux/binpac)
@@ -255,7 +247,11 @@ else ()
   set(BRO_CONFIG_BINPAC_ROOT_DIR ${BRO_ROOT_DIR})
 endif ()
 
-set(BRO_CONFIG_BROKER_ROOT_DIR ${BRO_ROOT_DIR})
+if ( BROKER_ROOT_DIR )
+  set(BRO_CONFIG_BROKER_ROOT_DIR ${BROKER_ROOT_DIR})
+else ()
+  set(BRO_CONFIG_BROKER_ROOT_DIR ${BRO_ROOT_DIR})
+endif ()
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bro-config.in
                ${CMAKE_CURRENT_BINARY_DIR}/bro-config @ONLY)
@@ -267,10 +263,22 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake DESTINATION share/bro
 ########################################################################
 ## Recurse on sub-directories
 
-add_subdirectory(aux/broker)
-set(brodeps ${brodeps} broker)
-include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/aux/broker
-                           ${CMAKE_CURRENT_BINARY_DIR}/aux/broker)
+if ( BROKER_ROOT_DIR )
+  find_package(Broker REQUIRED)
+  find_package(CAF COMPONENTS core io openssl REQUIRED)
+
+  set(brodeps ${brodeps} ${BROKER_LIBRARY} ${CAF_LIBRARIES})
+  include_directories(BEFORE ${BROKER_INCLUDE_DIR})
+else ()
+  add_subdirectory(aux/broker)
+
+  set(brodeps ${brodeps} broker)
+  include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/aux/broker
+                             ${CMAKE_CURRENT_BINARY_DIR}/aux/broker)
+endif ()
+
+# CAF headers aren't necessarily in same location as Broker headers and
+# inclusion of a Broker header may pull in CAF headers.
 include_directories(BEFORE ${CAF_INCLUDE_DIR_CORE})
 include_directories(BEFORE ${CAF_INCLUDE_DIR_IO})
 include_directories(BEFORE ${CAF_INCLUDE_DIR_OPENSSL})

VERSION

@@ -1 +1 @@
-2.5-887
+2.5-888

configure

@@ -69,8 +69,10 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
     --with-flex=PATH       path to flex executable
     --with-bison=PATH      path to bison executable
     --with-python=PATH     path to Python executable
-    --with-caf=PATH        path to C++ Actor Framework installation for using external version
-                           (a required Broker dependency)
+    --with-broker=PATH     path to Broker install root
+                           (Bro uses an embedded version by default)
+    --with-caf=PATH        path to C++ Actor Framework install root
+                           (a Broker dependency that is embedded by default)
 
   Optional Packages in Non-Standard Locations:
     --with-geoip=PATH      path to the libmaxminddb install root
@@ -285,6 +287,9 @@ while [ $# -ne 0 ]; do
         --with-swig=*)
             append_cache_entry SWIG_EXECUTABLE      PATH    $optarg
             ;;
+        --with-broker=*)
+            append_cache_entry BROKER_ROOT_DIR      PATH   $optarg
+            ;;
         --with-caf=*)
             append_cache_entry CAF_ROOT_DIR      PATH   $optarg
             ;;