diff options
| author | Ramon Fernandez <ramon.fernandez@mongodb.com> | 2015-03-26 12:27:35 -0400 |
|---|---|---|
| committer | Ramon Fernandez <ramon.fernandez@mongodb.com> | 2015-03-26 12:27:35 -0400 |
| commit | 61d6d65a8b6c18f38465e2379b9897cab8f3f5e8 (patch) | |
| tree | 89911163de7a4e1a1fcfe9deaa966d6d93840b5f /src/third_party/wiredtiger/build_posix | |
| parent | 06b58e9c7c349ce81504cf6ce2823082205ab0f7 (diff) | |
| download | mongo-61d6d65a8b6c18f38465e2379b9897cab8f3f5e8.tar.gz | |
Import wiredtiger-wiredtiger-2.5.2-293-g3e37e1f.tar.gz from wiredtiger branch mongodb-3.0
Diffstat (limited to 'src/third_party/wiredtiger/build_posix')
5 files changed, 42 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/build_posix/Make.base b/src/third_party/wiredtiger/build_posix/Make.base index 51a8e77cebe..3037d70528a 100644 --- a/src/third_party/wiredtiger/build_posix/Make.base +++ b/src/third_party/wiredtiger/build_posix/Make.base @@ -67,6 +67,9 @@ $(srcdir)/docs/man/man1/wt.1: $(srcdir)/docs/index.html $(srcdir)/docs/man/man3/wiredtiger.3: $(srcdir)/docs/index.html libwiredtiger_la_LIBADD = +if HAVE_BUILTIN_EXTENSION_LZ4 +libwiredtiger_la_LIBADD += ext/compressors/lz4/libwiredtiger_lz4.la +endif if HAVE_BUILTIN_EXTENSION_SNAPPY libwiredtiger_la_LIBADD += ext/compressors/snappy/libwiredtiger_snappy.la endif diff --git a/src/third_party/wiredtiger/build_posix/Make.subdirs b/src/third_party/wiredtiger/build_posix/Make.subdirs index 82feee58aa1..8f8614a7016 100644 --- a/src/third_party/wiredtiger/build_posix/Make.subdirs +++ b/src/third_party/wiredtiger/build_posix/Make.subdirs @@ -7,6 +7,7 @@ # If a condition is included, the subdir is made conditional via AM_CONDITIONAL ext/collators/reverse ext/compressors/bzip2 BZIP2 +ext/compressors/lz4 LZ4 ext/compressors/nop ext/compressors/snappy SNAPPY ext/compressors/zlib ZLIB diff --git a/src/third_party/wiredtiger/build_posix/aclocal/options.m4 b/src/third_party/wiredtiger/build_posix/aclocal/options.m4 index 2682c8ea82c..a5ad50416ed 100644 --- a/src/third_party/wiredtiger/build_posix/aclocal/options.m4 +++ b/src/third_party/wiredtiger/build_posix/aclocal/options.m4 @@ -13,6 +13,8 @@ no) wt_cv_enable_attach=no;; esac AC_MSG_RESULT($wt_cv_enable_attach) +AH_TEMPLATE(HAVE_BUILTIN_EXTENSION_LZ4, + [LZ4 support automatically loaded.]) AH_TEMPLATE(HAVE_BUILTIN_EXTENSION_SNAPPY, [Snappy support automatically loaded.]) AH_TEMPLATE(HAVE_BUILTIN_EXTENSION_ZLIB, @@ -20,7 +22,7 @@ AH_TEMPLATE(HAVE_BUILTIN_EXTENSION_ZLIB, AC_MSG_CHECKING(if --with-builtins option specified) AC_ARG_WITH(builtins, [AS_HELP_STRING([--with-builtins], - [builtin extension names (snappy, zlib).])], + [builtin extension names (lz4, snappy, zlib).])], [with_builtins=$withval], [with_builtins=]) @@ -28,6 +30,8 @@ AC_ARG_WITH(builtins, builtin_list=`echo "$with_builtins"|tr -s , ' '` for builtin_i in $builtin_list; do case "$builtin_i" in + lz4) AC_DEFINE(HAVE_BUILTIN_EXTENSION_LZ4) + wt_cv_with_builtin_extension_lz4=yes;; snappy) AC_DEFINE(HAVE_BUILTIN_EXTENSION_SNAPPY) wt_cv_with_builtin_extension_snappy=yes;; zlib) AC_DEFINE(HAVE_BUILTIN_EXTENSION_ZLIB) @@ -35,6 +39,8 @@ for builtin_i in $builtin_list; do *) AC_MSG_ERROR([Unknown builtin extension "$builtin_i"]);; esac done +AM_CONDITIONAL([HAVE_BUILTIN_EXTENSION_LZ4], + [test "$wt_cv_with_builtin_extension_lz4" = "yes"]) AM_CONDITIONAL([HAVE_BUILTIN_EXTENSION_SNAPPY], [test "$wt_cv_with_builtin_extension_snappy" = "yes"]) AM_CONDITIONAL([HAVE_BUILTIN_EXTENSION_ZLIB], @@ -168,6 +174,34 @@ if test "$wt_cv_enable_snappy" = "yes"; then fi AM_CONDITIONAL([SNAPPY], [test "$wt_cv_enable_snappy" = "yes"]) +AC_MSG_CHECKING(if --enable-lz4 option specified) +AC_ARG_ENABLE(lz4, + [AS_HELP_STRING([--enable-lz4], + [Build the lz4 compressor extension.])], r=$enableval, r=no) +case "$r" in +no) if test "$wt_cv_with_builtin_extension_lz4" = "yes"; then + wt_cv_enable_lz4=yes + else + wt_cv_enable_lz4=no + fi + ;; +*) if test "$wt_cv_with_builtin_extension_lz4" = "yes"; then + AC_MSG_ERROR( + [Only one of --enable-lz4 --with-builtins=lz4 allowed]) + fi + wt_cv_enable_lz4=yes;; +esac +AC_MSG_RESULT($wt_cv_enable_lz4) +if test "$wt_cv_enable_lz4" = "yes"; then + AC_LANG_PUSH([C++]) + AC_CHECK_HEADER(lz4.h,, + [AC_MSG_ERROR([--enable-lz4 requires lz4.h])]) + AC_LANG_POP([C++]) + AC_CHECK_LIB(lz4, LZ4_compress,, + [AC_MSG_ERROR([--enable-lz4 requires lz4 library])]) +fi +AM_CONDITIONAL([LZ4], [test "$wt_cv_enable_lz4" = "yes"]) + AH_TEMPLATE(SPINLOCK_TYPE, [Spinlock type from mutex.h.]) AC_MSG_CHECKING(if --with-spinlock option specified) AC_ARG_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 cbd389ea40d..b19418fc29d 100644 --- a/src/third_party/wiredtiger/build_posix/aclocal/version-set.m4 +++ b/src/third_party/wiredtiger/build_posix/aclocal/version-set.m4 @@ -2,8 +2,8 @@ dnl build by dist/s_version VERSION_MAJOR=2 VERSION_MINOR=5 -VERSION_PATCH=2 -VERSION_STRING='"WiredTiger 2.5.2: (March 9, 2015)"' +VERSION_PATCH=3 +VERSION_STRING='"WiredTiger 2.5.3: (March 26, 2015)"' AC_SUBST(VERSION_MAJOR) AC_SUBST(VERSION_MINOR) diff --git a/src/third_party/wiredtiger/build_posix/aclocal/version.m4 b/src/third_party/wiredtiger/build_posix/aclocal/version.m4 index 340f77e5474..94a84e72955 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.2 +2.5.3 |