From e4d12ea1d36a9f029815c199399d68951025714e Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@ncsa.illinois.edu>
Date: Thu, 18 Nov 2010 11:34:29 -0600
Subject: [PATCH] Changed default CMAKE_BUILD_TYPE to RelWithDebInfo

The --enable-debug option of the configure wrapper changes it to Debug.
Removed --enable-release option of the configure wrapper.
Updated submodules
---
 CMakeLists.txt | 12 +++---------
 aux/binpac     |  2 +-
 aux/bro-aux    |  2 +-
 aux/broccoli   |  2 +-
 aux/broctl     |  2 +-
 configure      |  7 +------
 6 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 496d300d15..23a3225a8a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,18 +22,13 @@ endif ()
 
 file(STRINGS "${CMAKE_SOURCE_DIR}/VERSION" VERSION LIMIT_COUNT 1)
 
-if (ENABLE_DEBUG AND ENABLE_RELEASE)
-    set(CMAKE_BUILD_TYPE RelWithDebInfo)
-elseif (ENABLE_DEBUG AND NOT ENABLE_RELEASE)
-    set(CMAKE_BUILD_TYPE Debug)
-elseif (NOT ENABLE_DEBUG AND ENABLE_RELEASE)
-    set(CMAKE_BUILD_TYPE Release)
-endif ()
-
 set(EXTRA_COMPILE_FLAGS "-Wall -Wno-unused")
 
 if (ENABLE_DEBUG)
+    set(CMAKE_BUILD_TYPE Debug)
     set(EXTRA_COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} -DDEBUG")
+else ()
+    set(CMAKE_BUILD_TYPE RelWithDebInfo)
 endif ()
 
 # Compiler flags may already exist in CMake cache (e.g. when specifying
@@ -232,7 +227,6 @@ message(
     "\nInstall prefix:    ${CMAKE_INSTALL_PREFIX}"
     "\nPolicy dir:        ${POLICYDIR}"
     "\nDebug mode:        ${ENABLE_DEBUG}"
-    "\nRelease mode:      ${ENABLE_RELEASE}"
     "\n"
     "\nCC:                ${CMAKE_C_COMPILER}"
     "\nCFLAGS:            ${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${BuildType}}"
diff --git a/aux/binpac b/aux/binpac
index 87868e0fbe..9886b3d164 160000
--- a/aux/binpac
+++ b/aux/binpac
@@ -1 +1 @@
-Subproject commit 87868e0fbeba599c004dd8e9d489d30391fa4212
+Subproject commit 9886b3d16447bd7c8575b8b4a190767183a6d1a7
diff --git a/aux/bro-aux b/aux/bro-aux
index cb699479a2..ac747bc3c3 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit cb699479a2acf25f552847beaf53cdef239ef5ce
+Subproject commit ac747bc3c3d64fa963e4b2238df7441af4d513b5
diff --git a/aux/broccoli b/aux/broccoli
index 48b84f0e5a..7ec41e3af3 160000
--- a/aux/broccoli
+++ b/aux/broccoli
@@ -1 +1 @@
-Subproject commit 48b84f0e5a0208362417adee24e973360514faf2
+Subproject commit 7ec41e3af3009c468d70b22fda143ba4dc1c151c
diff --git a/aux/broctl b/aux/broctl
index 7e53d2668b..3477e6e881 160000
--- a/aux/broctl
+++ b/aux/broctl
@@ -1 +1 @@
-Subproject commit 7e53d2668b9b99d1e39776620e85e35360d46229
+Subproject commit 3477e6e88118f82bd483b156796f8e484267965c
diff --git a/configure b/configure
index 2963a9ca6c..c3bc86b96a 100755
--- a/configure
+++ b/configure
@@ -23,8 +23,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
                            [PREFIX/share/bro]
 
   Optional Features:
-    --enable-debug         compile with debugging symbols
-    --enable-release       compile with optimizations
+    --enable-debug         compile in debugging mode
     --enable-brov6         enable IPv6 processing
     --enable-perftools     use Google's perftools
     --enable-broccoli      build/install the Broccoli library
@@ -74,7 +73,6 @@ append_cache_entry BRO_ROOT_DIR         PATH   /usr/local/bro
 append_cache_entry PY_MOD_INSTALL_DIR   PATH   /usr/local/bro/lib/broctl
 append_cache_entry POLICYDIR            STRING /usr/local/bro/share/bro
 append_cache_entry ENABLE_DEBUG         BOOL   false
-append_cache_entry ENABLE_RELEASE       BOOL   false
 append_cache_entry BROv6                BOOL   false
 append_cache_entry ENABLE_PERFTOOLS     BOOL   false
 append_cache_entry BinPAC_SKIP_INSTALL  BOOL   true
@@ -112,9 +110,6 @@ while [ $# -ne 0 ]; do
         --enable-debug)
             append_cache_entry ENABLE_DEBUG         BOOL   true
             ;;
-        --enable-release)
-            append_cache_entry ENABLE_RELEASE       BOOL   true
-            ;;
         --enable-brov6)
             append_cache_entry BROv6                BOOL   true
             ;;