diff options
| author | Ramon Fernandez <ramon.fernandez@mongodb.com> | 2015-04-27 11:33:41 -0400 |
|---|---|---|
| committer | Ramon Fernandez <ramon.fernandez@mongodb.com> | 2015-04-27 11:33:47 -0400 |
| commit | 34b853ed0566a3bbffcd825191b9000de331bddc (patch) | |
| tree | 06f3f81436489f252da15900b2fef169e7ca1bde /src/third_party/wiredtiger/build_posix/aclocal | |
| parent | 076cd926ab476f872afdd89a0e5e7e733d26c3ae (diff) | |
| download | mongo-34b853ed0566a3bbffcd825191b9000de331bddc.tar.gz | |
SERVER-18199 Import wiredtiger-wiredtiger-2.5.3-371-g1f44c05.tar.gz from wiredtiger branch mongodb-3.2
Diffstat (limited to 'src/third_party/wiredtiger/build_posix/aclocal')
3 files changed, 24 insertions, 7 deletions
diff --git a/src/third_party/wiredtiger/build_posix/aclocal/options.m4 b/src/third_party/wiredtiger/build_posix/aclocal/options.m4 index a5ad50416ed..d2cdbf65dce 100644 --- a/src/third_party/wiredtiger/build_posix/aclocal/options.m4 +++ b/src/third_party/wiredtiger/build_posix/aclocal/options.m4 @@ -202,6 +202,25 @@ if test "$wt_cv_enable_lz4" = "yes"; then fi AM_CONDITIONAL([LZ4], [test "$wt_cv_enable_lz4" = "yes"]) +AC_MSG_CHECKING(if --enable-tcmalloc option specified) +AC_ARG_ENABLE(tcmalloc, + [AS_HELP_STRING([--enable-tcmalloc], + [Build WiredTiger with tcmalloc.])], r=$enableval, r=no) +case "$r" in +no) wt_cv_enable_tcmalloc=no;; +*) wt_cv_enable_tcmalloc=yes;; +esac +AC_MSG_RESULT($wt_cv_enable_tcmalloc) +if test "$wt_cv_enable_tcmalloc" = "yes"; then + AC_LANG_PUSH([C++]) + AC_CHECK_HEADER(gperftools/tcmalloc.h,, + [AC_MSG_ERROR([--enable-tcmalloc requires gperftools/tcmalloc.h])]) + AC_LANG_POP([C++]) + AC_CHECK_LIB(tcmalloc, tc_calloc,, + [AC_MSG_ERROR([--enable-tcmalloc requires tcmalloc library])]) +fi +AM_CONDITIONAL([TCMalloc], [test "$wt_cv_enable_tcmalloc" = "yes"]) + AH_TEMPLATE(SPINLOCK_TYPE, [Spinlock type from mutex.h.]) AC_MSG_CHECKING(if --with-spinlock option specified) AC_ARG_WITH(spinlock, @@ -215,8 +234,6 @@ pthread|pthreads) AC_DEFINE(SPINLOCK_TYPE, SPINLOCK_PTHREAD_MUTEX);; pthread_adaptive|pthreads_adaptive) AC_DEFINE(SPINLOCK_TYPE, SPINLOCK_PTHREAD_MUTEX_ADAPTIVE);; -pthread_logging|pthreads_logging) - AC_DEFINE(SPINLOCK_TYPE, SPINLOCK_PTHREAD_MUTEX_LOGGING);; *) AC_MSG_ERROR([Unknown spinlock type "$with_spinlock"]);; esac AC_MSG_RESULT($with_spinlock) diff --git a/src/third_party/wiredtiger/build_posix/aclocal/version-set.m4 b/src/third_party/wiredtiger/build_posix/aclocal/version-set.m4 index b19418fc29d..af888b66468 100644 --- a/src/third_party/wiredtiger/build_posix/aclocal/version-set.m4 +++ b/src/third_party/wiredtiger/build_posix/aclocal/version-set.m4 @@ -1,14 +1,14 @@ dnl build by dist/s_version VERSION_MAJOR=2 -VERSION_MINOR=5 -VERSION_PATCH=3 -VERSION_STRING='"WiredTiger 2.5.3: (March 26, 2015)"' +VERSION_MINOR=6 +VERSION_PATCH=0 +VERSION_STRING='"WiredTiger 2.6.0: (April 22, 2015)"' AC_SUBST(VERSION_MAJOR) AC_SUBST(VERSION_MINOR) AC_SUBST(VERSION_PATCH) AC_SUBST(VERSION_STRING) -VERSION_NOPATCH=2.5 +VERSION_NOPATCH=2.6 AC_SUBST(VERSION_NOPATCH) diff --git a/src/third_party/wiredtiger/build_posix/aclocal/version.m4 b/src/third_party/wiredtiger/build_posix/aclocal/version.m4 index 94a84e72955..773cd0742cb 100644 --- a/src/third_party/wiredtiger/build_posix/aclocal/version.m4 +++ b/src/third_party/wiredtiger/build_posix/aclocal/version.m4 @@ -1,2 +1,2 @@ dnl WiredTiger product version for AC_INIT. Maintained by dist/s_version -2.5.3 +2.6.0 |