From 0878e9b8f14d11a253172f8833a7dadf2f9a9429 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@ncsa.illinois.edu>
Date: Fri, 19 Nov 2010 11:28:43 -0600
Subject: [PATCH] Configure wrapper fixes for Broctl

Made order of --enable-broctl and --enable-cluster not matter.

--enable-cluster always enables Broctl in cluster configuration even if
the other option is used.

--enable-broctl will enable Broctl in standalone configuration only if
--enable-cluster isn't present.
---
 CMakeLists.txt | 12 +++++++++++-
 configure      |  7 +++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 20bfbe2179..2ad183635b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -224,6 +224,16 @@ if (CMAKE_BUILD_TYPE)
     string(TOUPPER ${CMAKE_BUILD_TYPE} BuildType)
 endif ()
 
+if (INSTALL_BROCTL)
+    if (STANDALONE)
+        set(BROCTL_INSTALL_MODE "standalone")
+    else ()
+        set(BROCTL_INSTALL_MODE "cluster")
+    endif ()
+else ()
+    set(BROCTL_INSTALL_MODE "false")
+endif ()
+
 message(
     "\n====================|  Bro Build Summary  |====================="
     "\n"
@@ -238,7 +248,7 @@ message(
     "\nCPP:               ${CMAKE_CXX_COMPILER}"
     "\n"
     "\nBroccoli:          ${INSTALL_BROCCOLI}"
-    "\nBroctl:            ${INSTALL_BROCTL}"
+    "\nBroctl:            ${BROCTL_INSTALL_MODE}"
     "\nGeoIP:             ${USE_GEOIP}"
     "\nlibz:              ${HAVE_LIBZ}"
     "\nlibmagic:          ${HAVE_LIBMAGIC}"
diff --git a/configure b/configure
index c3bc86b96a..9ba6ebc1c9 100755
--- a/configure
+++ b/configure
@@ -120,12 +120,15 @@ while [ $# -ne 0 ]; do
             append_cache_entry INSTALL_BROCCOLI BOOL true
             ;;
         --enable-broctl)
-            append_cache_entry INSTALL_BROCTL BOOL true
-            append_cache_entry STANDALONE     BOOL true
+            if [ "$user_set_broctl_cluster" != "true" ]; then
+                append_cache_entry INSTALL_BROCTL BOOL true
+                append_cache_entry STANDALONE     BOOL true
+            fi
             ;;
         --enable-cluster)
             append_cache_entry INSTALL_BROCTL BOOL true
             append_cache_entry STANDALONE     BOOL false
+            user_set_broctl_cluster="true"
             ;;
         --enable-auxtools)
             append_cache_entry INSTALL_AUX_TOOLS BOOL true