Merge branch 'master-jemalloc'

2 files changed, 18 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index bdeda7de..13fcfeff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ Version 8.1.2 [devel] 2013-11-??
   * queue.workerThreadMinimumMessage set to queue.size / num workers
   For queues with very low queue.maxSize (< 100), "emergency" defaults
   will be used.
+- support for jemalloc added via --enable-jemalloc
+  Note that build system is experiemental at this stage.
 - bugfix: disk queues created files in wrong working directory
   if the $WorkDirectory was changed multiple times, all queues only
   used the last value set.
diff --git a/configure.ac b/configure.ac
index 8f74ebc7..7417c571 100644
--- a/configure.ac
+++ b/configure.ac
@@ -379,6 +379,22 @@ if test "$enable_inet" = "yes"; then
         AC_DEFINE(SYSLOG_INET, 1, [network support is integrated.])
 fi
 
+# jemalloc
+AC_ARG_ENABLE(jemalloc,
+        [AS_HELP_STRING([--enable-jemalloc],[Enable jemalloc support @<:@default=no@:>@])],
+        [case "${enableval}" in
+         yes) enable_jemalloc="yes" ;;
+          no) enable_jemalloc="no" ;;
+           *) AC_MSG_ERROR(bad value ${enableval} for --enable-jemalloc) ;;
+         esac],
+        [enable_jemalloc="no"]
+)
+AM_CONDITIONAL(ENABLE_JEMALLOC, test x$enable_jemalloc = xyes)
+if test "$enable_jemalloc" = "yes"; then
+        AC_DEFINE(HAVE_JEMALLOC, 1, [jemalloc support is integrated.])
+	RT_LIBS="$RT_LIBS -ljemalloc"
+fi
+
 
 #
 # The following define determines whether the package adheres to the