From f8b8401d84f0913334aa2a4b5ad169bce7cda215 Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Thu, 2 Dec 2021 12:37:02 -0800 Subject: [PATCH] Alphabetically sort configure's enable/disable/with options --- configure | 151 ++++++++++++++++++++++++++---------------------------- 1 file changed, 74 insertions(+), 77 deletions(-) diff --git a/configure b/configure index 5756c3448f..9db0899dc7 100755 --- a/configure +++ b/configure @@ -54,51 +54,51 @@ Usage: $0 [OPTION]... [VAR=VALUE]... install --home [PATH/lib/python] Optional Features: - --enable-debug compile in debugging mode (like --build-type=Debug) --enable-coverage compile with code coverage support (implies debugging mode) + --enable-cpp-tests build Zeek's C++ unit tests + --enable-debug compile in debugging mode (like --build-type=Debug) --enable-fuzzers build fuzzer targets + --enable-jemalloc link against jemalloc --enable-mobile-ipv6 analyze mobile IPv6 features defined by RFC 6275 --enable-perftools enable use of Google perftools (use tcmalloc) --enable-perftools-debug use Google's perftools for debugging - --enable-jemalloc link against jemalloc - --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-cpp-tests build Zeek's C++ unit tests + --enable-static-broker build Broker statically (ignored if --with-broker is specified) --enable-zeek-client install the Zeek cluster management client (experimental) - --disable-zeekctl don't install ZeekControl - --disable-auxtools don't build or install auxiliary tools --disable-archiver don't build or install zeek-archiver tool + --disable-auxtools don't build or install auxiliary tools + --disable-broker-tests don't try to build Broker unit tests --disable-btest don't install BTest --disable-btest-pcaps don't install Zeek's BTest input pcaps --disable-python don't try to build python bindings for Broker - --disable-broker-tests don't try to build Broker unit tests + --disable-zeekctl don't install ZeekControl --disable-zkg don't install zkg Required Packages in Non-Standard Locations: - --with-openssl=PATH path to OpenSSL install root - --with-bind=PATH path to BIND install root - --with-pcap=PATH path to libpcap install root - --with-binpac=PATH path to BinPAC executable - (useful for cross-compiling) --with-bifcl=PATH path to Zeek BIF compiler executable (useful for cross-compiling) - --with-flex=PATH path to flex executable + --with-bind=PATH path to BIND install root + --with-binpac=PATH path to BinPAC executable + (useful for cross-compiling) --with-bison=PATH path to bison executable - --with-python=PATH path to Python executable --with-broker=PATH path to Broker install root (Zeek uses an embedded version by default) --with-caf=PATH path to C++ Actor Framework install root (a Broker dependency that is embedded by default) + --with-flex=PATH path to flex executable --with-libkqueue=PATH path to libkqueue install root (Zeek uses an embedded version by default) + --with-openssl=PATH path to OpenSSL install root + --with-pcap=PATH path to libpcap install root + --with-python=PATH path to Python executable Optional Packages in Non-Standard Locations: --with-geoip=PATH path to the libmaxminddb install root + --with-jemalloc=PATH path to jemalloc install root --with-krb5=PATH path to krb5 install root --with-perftools=PATH path to Google Perftools install root - --with-jemalloc=PATH path to jemalloc install root - --with-python-lib=PATH path to libpython --with-python-inc=PATH path to Python headers + --with-python-lib=PATH path to libpython --with-swig=PATH path to SWIG executable Packaging Options (for developers): @@ -260,12 +260,18 @@ while [ $# -ne 0 ]; do append_cache_entry ENABLE_COVERAGE BOOL true append_cache_entry ENABLE_DEBUG BOOL true ;; - --enable-fuzzers) - append_cache_entry ZEEK_ENABLE_FUZZERS BOOL true + --enable-cpp-tests) + append_cache_entry ENABLE_ZEEK_UNIT_TESTS BOOL true ;; --enable-debug) append_cache_entry ENABLE_DEBUG BOOL true ;; + --enable-fuzzers) + append_cache_entry ZEEK_ENABLE_FUZZERS BOOL true + ;; + --enable-jemalloc) + append_cache_entry ENABLE_JEMALLOC BOOL true + ;; --enable-mobile-ipv6) has_enable_mobile_ipv6=1 ;; @@ -276,32 +282,24 @@ while [ $# -ne 0 ]; do append_cache_entry ENABLE_PERFTOOLS BOOL true append_cache_entry ENABLE_PERFTOOLS_DEBUG BOOL true ;; - --sanitizers=*) - append_cache_entry ZEEK_SANITIZERS STRING $optarg - ;; - --enable-jemalloc) - append_cache_entry ENABLE_JEMALLOC BOOL true + --enable-static-binpac) + append_cache_entry BUILD_STATIC_BINPAC BOOL true ;; --enable-static-broker) append_cache_entry BUILD_STATIC_BROKER BOOL true ;; - --enable-static-binpac) - append_cache_entry BUILD_STATIC_BINPAC BOOL true - ;; - --enable-cpp-tests) - append_cache_entry ENABLE_ZEEK_UNIT_TESTS BOOL true - ;; --enable-zeek-client) append_cache_entry INSTALL_ZEEK_CLIENT BOOL true ;; - --disable-zeekctl) - append_cache_entry INSTALL_ZEEKCTL BOOL false + --disable-archiver) + append_cache_entry INSTALL_ZEEK_ARCHIVER BOOL false ;; --disable-auxtools) append_cache_entry INSTALL_AUX_TOOLS BOOL false ;; - --disable-archiver) - append_cache_entry INSTALL_ZEEK_ARCHIVER BOOL false + --disable-broker-tests) + append_cache_entry BROKER_DISABLE_TESTS BOOL true + append_cache_entry BROKER_DISABLE_DOC_EXAMPLES BOOL true ;; --disable-btest) append_cache_entry INSTALL_BTEST BOOL false @@ -312,69 +310,68 @@ while [ $# -ne 0 ]; do --disable-python) append_cache_entry DISABLE_PYTHON_BINDINGS BOOL true ;; - --disable-broker-tests) - append_cache_entry BROKER_DISABLE_TESTS BOOL true - append_cache_entry BROKER_DISABLE_DOC_EXAMPLES BOOL true - ;; --disable-zkg) append_cache_entry INSTALL_ZKG BOOL false ;; - --with-openssl=*) - append_cache_entry OPENSSL_ROOT_DIR PATH $optarg - ;; - --with-bind=*) - append_cache_entry BIND_ROOT_DIR PATH $optarg - ;; - --with-pcap=*) - append_cache_entry PCAP_ROOT_DIR PATH $optarg - ;; - --with-binpac=*) - append_cache_entry BINPAC_EXE_PATH PATH $optarg - ;; --with-bifcl=*) append_cache_entry BIFCL_EXE_PATH PATH $optarg ;; - --with-flex=*) - append_cache_entry FLEX_EXECUTABLE PATH $optarg + --with-bind=*) + append_cache_entry BIND_ROOT_DIR PATH $optarg + ;; + --with-binpac=*) + append_cache_entry BINPAC_EXE_PATH PATH $optarg ;; --with-bison=*) append_cache_entry BISON_EXECUTABLE PATH $optarg ;; - --with-geoip=*) - append_cache_entry LibMMDB_ROOT_DIR PATH $optarg - ;; - --with-krb5=*) - append_cache_entry LibKrb5_ROOT_DIR PATH $optarg - ;; - --with-perftools=*) - append_cache_entry GooglePerftools_ROOT_DIR PATH $optarg - ;; - --with-jemalloc=*) - append_cache_entry JEMALLOC_ROOT_DIR PATH $optarg - append_cache_entry ENABLE_JEMALLOC BOOL true - ;; - --with-python=*) - append_cache_entry PYTHON_EXECUTABLE PATH $optarg - ;; - --with-python-lib=*) - append_cache_entry PYTHON_LIBRARY PATH $optarg - ;; - --with-python-inc=*) - append_cache_entry PYTHON_INCLUDE_DIR PATH $optarg - append_cache_entry PYTHON_INCLUDE_PATH PATH $optarg - ;; - --with-swig=*) - append_cache_entry SWIG_EXECUTABLE PATH $optarg - ;; --with-broker=*) append_cache_entry BROKER_ROOT_DIR PATH $optarg ;; --with-caf=*) append_cache_entry CAF_ROOT PATH $optarg ;; + --with-flex=*) + append_cache_entry FLEX_EXECUTABLE PATH $optarg + ;; + --with-geoip=*) + append_cache_entry LibMMDB_ROOT_DIR PATH $optarg + ;; + --with-jemalloc=*) + append_cache_entry JEMALLOC_ROOT_DIR PATH $optarg + append_cache_entry ENABLE_JEMALLOC BOOL true + ;; + --with-krb5=*) + append_cache_entry LibKrb5_ROOT_DIR PATH $optarg + ;; --with-libkqueue=*) append_cache_entry LIBKQUEUE_ROOT_DIR PATH $optarg ;; + --with-pcap=*) + append_cache_entry PCAP_ROOT_DIR PATH $optarg + ;; + --with-perftools=*) + append_cache_entry GooglePerftools_ROOT_DIR PATH $optarg + ;; + --with-openssl=*) + append_cache_entry OPENSSL_ROOT_DIR PATH $optarg + ;; + --with-python=*) + append_cache_entry PYTHON_EXECUTABLE PATH $optarg + ;; + --with-python-inc=*) + append_cache_entry PYTHON_INCLUDE_DIR PATH $optarg + append_cache_entry PYTHON_INCLUDE_PATH PATH $optarg + ;; + --with-python-lib=*) + append_cache_entry PYTHON_LIBRARY PATH $optarg + ;; + --with-swig=*) + append_cache_entry SWIG_EXECUTABLE PATH $optarg + ;; + --sanitizers=*) + append_cache_entry ZEEK_SANITIZERS STRING $optarg + ;; --binary-package) append_cache_entry BINARY_PACKAGING_MODE BOOL true ;;