]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "Revert "autoconf: Complain if tcmalloc is not found.""
authorSage Weil <sage@newdream.net>
Tue, 19 Apr 2011 19:05:36 +0000 (12:05 -0700)
committerSage Weil <sage@newdream.net>
Tue, 19 Apr 2011 19:05:36 +0000 (12:05 -0700)
This reverts commit 05c281bfa9e9d69ea3d0197590950c8e6845a13a.

This should be okay now.

configure.ac

index 338521e9d2685aee4b5f41d38f563443f2b0a8cf..49a224f8cdc85329fa91e43104a6d65de62dd3e9 100644 (file)
@@ -163,9 +163,9 @@ AM_CONDITIONAL(WITH_FUSE, [test "$HAVE_LIBFUSE" = "1"])
 
 # tcmalloc?
 AC_ARG_WITH([tcmalloc],
-           [AS_HELP_STRING([--with--tcmalloc], [use tcmalloc instead of ptmallc])],
+           [AS_HELP_STRING([--without-tcmalloc], [disable tcmalloc for memory allocations])],
            [],
-           [with_tcmalloc=check])
+           [with_tcmalloc=yes])
 TCMALLOC=
 AS_IF([test "x$with_tcmalloc" != xno],
            [AC_CHECK_LIB([tcmalloc], [malloc],
@@ -174,11 +174,8 @@ AS_IF([test "x$with_tcmalloc" != xno],
                         [Define if you have tcmalloc])
               HAVE_LIBTCMALLOC=1
             ],
-           [if test "x$with_tcmalloc" != xcheck; then
-               AC_MSG_FAILURE(
-                 [--with-tcmalloc was given but test failed])
-             fi
-           ])])
+           [AC_MSG_FAILURE(
+                 [no tcmalloc found (use --without-tcmalloc to disable)])])])
 AM_CONDITIONAL(WITH_TCMALLOC, [test "$HAVE_LIBTCMALLOC" = "1"])
 
 # jni?