diff --git a/CMakeLists.txt b/CMakeLists.txt index e8f9dcd6cd..17ba34ab3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -120,7 +120,8 @@ find_package(Lintel) find_package(DataSeries) find_package(LibXML2) -if (LINTEL_FOUND AND DATASERIES_FOUND AND LIBXML2_FOUND) +if (NOT DISABLE_DATASERIES AND + LINTEL_FOUND AND DATASERIES_FOUND AND LIBXML2_FOUND) set(USE_DATASERIES true) include_directories(BEFORE ${Lintel_INCLUDE_DIR}) include_directories(BEFORE ${DataSeries_INCLUDE_DIR}) @@ -134,7 +135,7 @@ set(USE_ELASTICSEARCH false) set(USE_CURL false) find_package(LibCURL) -if (LIBCURL_FOUND) +if (NOT DISABLE_ELASTICSEARCH AND LIBCURL_FOUND) set(USE_ELASTICSEARCH true) set(USE_CURL true) include_directories(BEFORE ${LibCURL_INCLUDE_DIR}) diff --git a/configure b/configure index c67c02f76d..6c557a22d0 100755 --- a/configure +++ b/configure @@ -38,6 +38,8 @@ Usage: $0 [OPTION]... [VAR=VALUE]... --disable-perftools don't try to build with Google Perftools --disable-python don't try to build python bindings for broccoli --disable-ruby don't try to build ruby bindings for broccoli + --disable-dataseries don't use the optional DataSeries log writer + --disable-elasticsearch don't use the optional ElasticSearch log writer Required Packages in Non-Standard Locations: --with-openssl=PATH path to OpenSSL install root @@ -175,6 +177,12 @@ while [ $# -ne 0 ]; do --disable-ruby) append_cache_entry DISABLE_RUBY_BINDINGS BOOL true ;; + --disable-dataseries) + append_cache_entry DISABLE_DATASERIES BOOL true + ;; + --disable-elasticsearch) + append_cache_entry DISABLE_ELASTICSEARCH BOOL true + ;; --with-openssl=*) append_cache_entry OpenSSL_ROOT_DIR PATH $optarg ;;