From 9282e0adff231eb8d05342e8442ecb84d7738d1e Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@ncsa.illinois.edu>
Date: Wed, 9 Mar 2011 11:48:00 -0600
Subject: [PATCH] Add explicit CMake check for compiler

---
 CMakeLists.txt | 10 +++++++++-
 INSTALL        |  4 +++-
 aux/binpac     |  2 +-
 aux/bro-aux    |  2 +-
 aux/broccoli   |  2 +-
 aux/broctl     |  2 +-
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c3cd05d96..1face2ce95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,12 @@
-project(Bro)
+project(Bro C CXX)
+
+if (NOT CMAKE_C_COMPILER)
+    message(FATAL_ERROR "Could not find prerequisite C compiler")
+endif ()
+
+if (NOT CMAKE_CXX_COMPILER)
+    message(FATAL_ERROR "Could not find prerequisite C++ compiler")
+endif ()
 
 ########################################################################
 ## CMake Configuration
diff --git a/INSTALL b/INSTALL
index 1220d720ad..f0c59d79fb 100644
--- a/INSTALL
+++ b/INSTALL
@@ -9,6 +9,8 @@ Prerequisites
 Bro relies on the following libraries and tools, which need to be installed
 before you begin:
 
+    * A C/C++ compiler
+
     * Libpcap headers and libraries
        Network traffic capture library
 
@@ -35,7 +37,7 @@ before you begin:
         though some platforms may require installation of a 'devel' package
          for the headers.
 
-    * CMake 2.8 or greater
+    * CMake 2.6 or greater
        CMake is a cross-platform, open-source build system, typically
        not installed by default.  See http://www.cmake.org for more
        information regarding CMake and the installation steps below for
diff --git a/aux/binpac b/aux/binpac
index 26d02716f9..6f7b080181 160000
--- a/aux/binpac
+++ b/aux/binpac
@@ -1 +1 @@
-Subproject commit 26d02716f9090651f319a4bfdf8ede49b3a7b53a
+Subproject commit 6f7b080181d2e1e363c7d0806a5c2a1e4704f7da
diff --git a/aux/bro-aux b/aux/bro-aux
index 7e50bac938..bf913bd851 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit 7e50bac938af1831ecf9660159145a3c2e77e13d
+Subproject commit bf913bd8514f4bfbfc3c87eb80b968d3b3689da4
diff --git a/aux/broccoli b/aux/broccoli
index 9332ab3467..dfb55c5f25 160000
--- a/aux/broccoli
+++ b/aux/broccoli
@@ -1 +1 @@
-Subproject commit 9332ab3467191ac22be09d6941ebd469e7a334d0
+Subproject commit dfb55c5f250660c846245f13c8dd87dd503e17a7
diff --git a/aux/broctl b/aux/broctl
index 06b74a0f23..2e2b8197d9 160000
--- a/aux/broctl
+++ b/aux/broctl
@@ -1 +1 @@
-Subproject commit 06b74a0f23767c8345ed146657120aba812f6764
+Subproject commit 2e2b8197d9b105e10f07021004cd99c5aec5adaf