diff --git a/CHANGES b/CHANGES index 9b1de51b11..5714e885f1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.5-892 | 2018-08-22 11:49:12 -0500 + + * Fix "unused CMake variable" configuration warnings (Jon Siwek, Corelight) + 2.5-890 | 2018-08-21 16:47:52 -0500 * Fix Travis CI script to checkout particular commits of external tests diff --git a/VERSION b/VERSION index b6236aaecd..2f39fe7562 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5-890 +2.5-892 diff --git a/cmake b/cmake index 4cc3e344cf..433676df0a 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 4cc3e344cf2698010a46684d32a2907a943430e3 +Subproject commit 433676df0af266540b8a3d9216cfd9dbc1361b09 diff --git a/configure b/configure index acd598c007..a26a4bc5a2 100755 --- a/configure +++ b/configure @@ -144,8 +144,6 @@ append_cache_entry INSTALL_BROCTL BOOL true append_cache_entry CPACK_SOURCE_IGNORE_FILES STRING append_cache_entry ENABLE_MOBILE_IPV6 BOOL false append_cache_entry DISABLE_PERFTOOLS BOOL false -append_cache_entry DISABLE_RUBY_BINDINGS BOOL true -append_cache_entry ENABLE_COVERAGE BOOL false # parse arguments while [ $# -ne 0 ]; do @@ -222,6 +220,7 @@ while [ $# -ne 0 ]; do append_cache_entry ENABLE_JEMALLOC BOOL true ;; --enable-broccoli) + append_cache_entry DISABLE_RUBY_BINDINGS BOOL true append_cache_entry INSTALL_BROCCOLI BOOL yes ;; --disable-broctl)