2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index edf9afec7b..512f321a91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun  5 03:45:28 2014  Eric Wong  <[email protected]>
+
+	* configure.in: add --with-jemalloc option
+	  [ruby-core:62912]
+
 Wed Jun  4 22:28:14 2014  Koichi Sasada  <[email protected]>
 
 	* gc.c: introduce RZombie to manage zombie objects.
diff --git a/configure.in b/configure.in
index 790b3dfe0f..90219af803 100644
--- a/configure.in
+++ b/configure.in
@@ -1173,6 +1173,13 @@ AS_IF([test "x$with_gmp" != xno],
    with_gmp="$ac_cv_lib_gmp___gmpz_init"
    AS_IF([test -z "$with_gmp"], [with_gmp=no])])
 
+AC_ARG_WITH([jemalloc],
+  [AS_HELP_STRING([--with-jemalloc],[use jemalloc allocator])],
+  [with_jemalloc=yes], [with_jemalloc=no])
+AS_IF([test "x$with_jemalloc" = xyes],[
+  AC_CHECK_LIB([jemalloc],[malloc_conf],[LIBS="-ljemalloc $LIBS"],
+    [AC_MSG_ERROR([jemalloc requested but not found])])])
+
 dnl check for large file stuff
 mv confdefs.h confdefs1.h
 : > confdefs.h