From a45f484a9d89184d88e7cedd5ffdbdf334c14491 Mon Sep 17 00:00:00 2001 From: Somnath Roy Date: Tue, 26 Jan 2016 19:05:40 -0500 Subject: [PATCH] Build: Allow jemalloc enabled build with rocksdb-static Presently, we can't do jemalloc enabled OSD build along with rocksdb-static.Rocksdb is now mandatory with Bluestore and that's why jemalloc builds are failing. Sometimes back the following commit fd7a35731854528dde10deb3444a82ae4c1a9206 is introduced to build rocksdb with jemalloc as well, so, we can allow jemalloc build along with rocksdb-static now. Removing the redundant check from configure.ac. Signed-off-by: Somnath Roy --- configure.ac | 8 -------- 1 file changed, 8 deletions(-) diff --git a/configure.ac b/configure.ac index b79f6ff3ce7..8b694911147 100644 --- a/configure.ac +++ b/configure.ac @@ -826,14 +826,6 @@ AS_IF([test "x$with_librocksdb_static" = "xyes"], [ AM_CONDITIONAL(HAVE_BZLIB, [test "x$have_bzlib" = "xyes"]) AM_CONDITIONAL(HAVE_LZ4, [test "x$have_lz4" = "xyes"]) -# error out if --with-jemalloc and --with-librocksdb_static as rocksdb uses tcmalloc -if test "x$with_jemalloc" = "xyes"; then - if test "x$with_librocksdb_static" != "xno"; then - AC_MSG_FAILURE([--with-jemalloc called with --with-librocksdb_static, turn off - --with-librocksdb-static or --with-jemalloc]) - fi -fi - # needs libcurl and libxml2 if test "x$with_rest_bench" = xyes && test "x$with_system_libs3" = xno; then AC_CHECK_LIB([curl], [curl_easy_init], [], AC_MSG_ERROR([libcurl not found]))