diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-05-29 16:40:25 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-05-29 16:40:25 +1000 |
| commit | d2b2805fef14b288cec2c6149cb3bb7778f14180 (patch) | |
| tree | ae71b2c435fec653f3658a605c32dd98781ae978 /build_posix | |
| parent | eb4f751a864d4aaf882245de13d131cd61604dc2 (diff) | |
| parent | e73391458bd48ba6504c19a44ae7024dfc336f7e (diff) | |
| download | mongo-d2b2805fef14b288cec2c6149cb3bb7778f14180.tar.gz | |
Merge branch 'develop' into leveldb-api
Diffstat (limited to 'build_posix')
| -rw-r--r-- | build_posix/aclocal/version-set.m4 | 8 | ||||
| -rw-r--r-- | build_posix/aclocal/version.m4 | 2 | ||||
| -rw-r--r-- | build_posix/configure.ac.in | 12 |
3 files changed, 12 insertions, 10 deletions
diff --git a/build_posix/aclocal/version-set.m4 b/build_posix/aclocal/version-set.m4 index cca0873c93e..2f5ca0608cb 100644 --- a/build_posix/aclocal/version-set.m4 +++ b/build_posix/aclocal/version-set.m4 @@ -1,14 +1,14 @@ dnl build by dist/s_version VERSION_MAJOR=2 -VERSION_MINOR=1 -VERSION_PATCH=3 -VERSION_STRING='"WiredTiger 2.1.3: (March 28, 2014)"' +VERSION_MINOR=2 +VERSION_PATCH=1 +VERSION_STRING='"WiredTiger 2.2.1: (May 21, 2014)"' AC_SUBST(VERSION_MAJOR) AC_SUBST(VERSION_MINOR) AC_SUBST(VERSION_PATCH) AC_SUBST(VERSION_STRING) -VERSION_NOPATCH=2.1 +VERSION_NOPATCH=2.2 AC_SUBST(VERSION_NOPATCH) diff --git a/build_posix/aclocal/version.m4 b/build_posix/aclocal/version.m4 index 4f59697e5fb..e1fcc8e9cad 100644 --- a/build_posix/aclocal/version.m4 +++ b/build_posix/aclocal/version.m4 @@ -1,2 +1,2 @@ dnl WiredTiger product version for AC_INIT. Maintained by dist/s_version -2.1.3 +2.2.1 diff --git a/build_posix/configure.ac.in b/build_posix/configure.ac.in index 238a5c6debc..1a0e88e3fec 100644 --- a/build_posix/configure.ac.in +++ b/build_posix/configure.ac.in @@ -98,14 +98,16 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],[[ AC_C_BIGENDIAN -# Linux requires _GNU_SOURCE to be defined and buffers aligned to 4KB -# boundaries for O_DIRECT to work. +# Linux requires _GNU_SOURCE to be defined +case "$host_os" in +linux*) AM_CFLAGS="$AM_CFLAGS -D_GNU_SOURCE" ;; +esac + +# Linux requires buffers aligned to 4KB boundaries for O_DIRECT to work. BUFFER_ALIGNMENT=0 if test "$ac_cv_func_posix_memalign" = "yes" ; then case "$host_os" in - linux*) AM_CFLAGS="$AM_CFLAGS -D_GNU_SOURCE" - BUFFER_ALIGNMENT=4096 - ;; + linux*) BUFFER_ALIGNMENT=4096 ;; esac fi AC_DEFINE_UNQUOTED(WT_BUFFER_ALIGNMENT_DEFAULT, $BUFFER_ALIGNMENT, |