Remove RocksDB configure script options

Fixes GH-1399
This commit is contained in:
Jon Siwek 2021-02-11 11:10:46 -08:00
parent 0717e01b6b
commit 3405b961b9
3 changed files with 5 additions and 11 deletions

View file

@ -1,4 +1,8 @@
4.1.0-dev.220 | 2021-02-11 11:10:46 -0800
* GH-1399: Remove RocksDB configure script options (Jon Siwek, Corelight)
4.1.0-dev.219 | 2021-02-11 10:56:16 -0800 4.1.0-dev.219 | 2021-02-11 10:56:16 -0800
* Add a script to cleanup the file listing before sending to Coveralls (Tim Wojtulewicz) * Add a script to cleanup the file listing before sending to Coveralls (Tim Wojtulewicz)

View file

@ -1 +1 @@
4.1.0-dev.219 4.1.0-dev.220

10
configure vendored
View file

@ -61,7 +61,6 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
--enable-static-broker build Broker statically (ignored if --with-broker is specified) --enable-static-broker build Broker statically (ignored if --with-broker is specified)
--enable-static-binpac build binpac statically (ignored if --with-binpac is specified) --enable-static-binpac build binpac statically (ignored if --with-binpac is specified)
--enable-cpp-tests build Zeek's C++ unit tests --enable-cpp-tests build Zeek's C++ unit tests
--enable-rocksdb try to find a RocksDB installation for use in Broker
--disable-zeekctl don't install ZeekControl --disable-zeekctl don't install ZeekControl
--disable-auxtools don't build or install auxiliary tools --disable-auxtools don't build or install auxiliary tools
--disable-archiver don't build or install zeek-archiver tool --disable-archiver don't build or install zeek-archiver tool
@ -96,8 +95,6 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
--with-python-lib=PATH path to libpython --with-python-lib=PATH path to libpython
--with-python-inc=PATH path to Python headers --with-python-inc=PATH path to Python headers
--with-swig=PATH path to SWIG executable --with-swig=PATH path to SWIG executable
--with-rocksdb=PATH path to RocksDB installation, implies --enable-rocksdb
(an optional Broker dependency)
Packaging Options (for developers): Packaging Options (for developers):
--binary-package toggle special logic for binary packaging --binary-package toggle special logic for binary packaging
@ -358,13 +355,6 @@ while [ $# -ne 0 ]; do
--with-libkqueue=*) --with-libkqueue=*)
append_cache_entry LIBKQUEUE_ROOT_DIR PATH $optarg append_cache_entry LIBKQUEUE_ROOT_DIR PATH $optarg
;; ;;
--enable-rocksdb)
append_cache_entry BROKER_ENABLE_ROCKSDB BOOL true
;;
--with-rocksdb=*)
append_cache_entry BROKER_ENABLE_ROCKSDB BOOL true
append_cache_entry ROCKSDB_ROOT_DIR PATH $optarg
;;
--binary-package) --binary-package)
append_cache_entry BINARY_PACKAGING_MODE BOOL true append_cache_entry BINARY_PACKAGING_MODE BOOL true
;; ;;