Merge pull request #1132 from x4FF3/master

[netdata.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1c0dfda1d1b2203a87e8c1c1ccd10edfe0354f4d..8d554db3e02478a033491a6f973877423c7f4c08 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 AC_PREREQ(2.60)
 
 define([VERSION_MAJOR], [1])
-define([VERSION_MINOR], [3])
+define([VERSION_MINOR], [4])
 define([VERSION_FIX], [1])
 define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX)
 define([VERSION_SUFFIX], [_master])
@@ -85,13 +85,18 @@ CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
 CC="${PTHREAD_CC}"
 
 TS_CHECK_JEMALLOC
-if test "$has_jemalloc" = "0"; then
+if test "$has_jemalloc" = "1"; then
+       AC_DEFINE([ENABLE_JEMALLOC], [1], [compile and link with jemalloc])
+else
        TS_CHECK_TCMALLOC
+       if test "$has_tcmalloc" = "1"; then
+               AC_DEFINE([ENABLE_TCMALLOC], [1], [compile and link with tcmalloc])
+       else
+               AC_C_MALLOPT
+               AC_C_MALLINFO
+       fi
 fi
-if test "$has_jemalloc$has_tcmalloc" = "00"; then
-       AC_C_MALLOPT
-       AC_C_MALLINFO
-fi
+
 AC_TYPE_UINT8_T
 AC_TYPE_UINT16_T
 AC_TYPE_UINT32_T