adding ENABLE_SHELL variable

diff --git a/cmake/configure_options.cmake b/cmake/configure_options.cmake
index e02cf66785148b11f55e5699784c4174e0a8417e..64176bfefd93e99cd8ee3c920530f660798136f8 100644 (file)
--- a/cmake/configure_options.cmake
+++ b/cmake/configure_options.cmake
@@ -39,6 +39,8 @@ set_if_false (ENABLE_COREFILES NOCOREFILE)
 set_if_true (ENABLE_INTEL_SOFT_CPM INTEL_SOFT_CPM)
 set_if_true (BUILD_UNIT_TESTS UNIT_TEST)
 set_if_true (ENABLE_PROFILE PROFILE)
+set_if_true (ENABLE_SHELL BUILD_SHELL)
+
 
 
 if(LINUX AND BUILD_CONTROL_SOCKET)

diff --git a/cmake/create_options.cmake b/cmake/create_options.cmake
index fb4f510435c8dd0aa4353e64fa4883dcc778fb43..6202ea1f8e25ea37a952cf7c23199d916c6977b3 100644 (file)
--- a/cmake/create_options.cmake
+++ b/cmake/create_options.cmake
@@ -24,7 +24,7 @@ option (ENABLE_DEBUG_MSGS "Enable debug printing options (bugreports and develop
 option (ENABLE_DEBUG "Enable debugging options (bugreports and developers only)" ON)
 option (ENABLE_GDB "Enable gdb debugging information" ON)
 option (ENABLE_PROFILE "Enable profiling options (developers only)" OFF)
-option (ENABLE_SOURCEFIRE "Enable Sourcefire specific build options, encompasing ENABLE_PERFPROFILING and ENABLE_PPM" ON)
+option (ENABLE_SHELL "enable shell support" OFF)
 option (ENABLE_COREFILES "Prevent Snort from generating core files" ON)
 option (BUILD_HA "Enable high-availability state sharing" OFF)
 option (ENABLE_INTEL_SOFT_CPM "Enable Intel Soft CPM support" OFF)

diff --git a/config.cmake.h.in b/config.cmake.h.in
index be973639a22cfe5b638ed3fa8d10cd28383316d6..4af5cabdf33f2de2d53450d76c99e56cc0b2b0ae 100644 (file)
--- a/config.cmake.h.in
+++ b/config.cmake.h.in
@@ -106,6 +106,9 @@
 /* Set by user */
 #cmakedefine SIGNAL_SNORT_ROTATE_STATS @SIGNAL_SNORT_ROTATE_STATS@
 
+/* enable ha capable build */
+#cmakedefine BUILD_SHELL 1
+
 
 
 /* platforms */

diff --git a/configure_cmake.sh b/configure_cmake.sh
index 503328cbaab7aa75ea2df4152b9ff22ebac5e734..6a0b0c609fda98d9bcc99314763dad49b43d8b41 100755 (executable)
--- a/configure_cmake.sh
+++ b/configure_cmake.sh
@@ -43,6 +43,8 @@ Optional Features:
     --enable-unit-tests      Build unit tests
     --enable-large-pcap      Enable support for pcaps larger than 2 GB
     --disable-static-daq     Link static DAQ modules.
+    --enable-shell           enable command line shell support
+
 
     Optional Packages:
     --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -269,6 +271,12 @@ while [ $# -ne 0 ]; do
         --enable-intel-soft-cpm)
             append_cache_entry ENABLE_INTEL_SOFT_CPM    BOOL   true
             ;;
+        --enable-shell)
+            append_cache_entry ENABLE_SHELL    BOOL   true
+            ;;
+        --disable-shell)
+            append_cache_entry ENABLE_SHELL    BOOL   false
+            ;;
         --disable-side-channel)
             append_cache_entry BUILD_SIDE_CHANNEL    BOOL   false
             ;;

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 02a66a870440b2e76deb01857c6f063b19f01eb4..63b2784f4d47f2a979c8ed17a672e2f7a717844f 100644 (file)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -55,6 +55,8 @@ set (UNBUILT_SOURCES
     snort_manual.txt
     overview.txt
     errors.txt
+    enviro.txt
+    features.txt
     differences.txt
     extending.txt
     reference.txt

diff --git a/doc/Makefile.am b/doc/Makefile.am
index d0ffcb0cfa2ac2f35bbf986df0aefab2dd145aab..9faa1cf8d079d3a1dc46ebfaaf4f22246ae7735a 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -30,6 +30,8 @@ snort_manual.txt \
 overview.txt \
 config_changes.txt \
 errors.txt \
+enviro.txt \
+features.txt \
 differences.txt \
 extending.txt \
 reference.txt \
@@ -39,6 +41,8 @@ style.txt \
 terms.txt \
 images/snort.png
 
+
+
 all_sources = \
 $(unbuilt_sources) \
 $(BUILT_SOURCES)