From 5bb8d60a67e4684ead4aac2044a91c3fd3b73724 Mon Sep 17 00:00:00 2001
From: XTZGZoReX <xtzgzorex@gmail.com>
Date: Wed, 11 Nov 2009 22:20:07 +0100
Subject: [PATCH] Allow disabling tbbmalloc on Unix by using: --with-std-malloc

---
 configure.ac | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/configure.ac b/configure.ac
index e8638b2b9..e380dfb24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,6 +151,26 @@ else
 AC_MSG_RESULT($DO_MYSQL)
 fi
 
+## Check for memory allocator
+#  Use libc-malloc or libtbb-malloc?
+AC_MSG_CHECKING(whether to use libc malloc)
+MANGOSD_STD_MALLOC=no
+AC_ARG_WITH(std-malloc,
+[
+Memory allocation options:
+
+  --with-std-malloc       Use standard malloc],
+[
+    if test "$withval" = "yes" ; then
+        CFLAGS="-DUSE_STANDARD_MALLOC $CFLAGS"
+        CXXFLAGS="-DUSE_STANDARD_MALLOC $CXXFLAGS"
+        MANGOSD_STD_MALLOC=yes
+    elif test "$withval" != "no" ; then
+        AC_MSG_ERROR(Please choose yes or no)
+    fi
+])
+AC_MSG_RESULT($MANGOSD_STD_MALLOC)
+
 ## Check for options
 #  Include debug info in library?
 AC_MSG_CHECKING(whether to include debug info in library)