diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-06-20 13:12:22 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-06-20 13:12:22 +1000 |
| commit | 125cc016e905579c484c445f3f2f1b9bb71f92db (patch) | |
| tree | 85c76906d77da7a79b6c22cc5d114e56184854e8 /build_posix | |
| parent | 424bab13a64057baf87adf8152b18ef6bfa9beff (diff) | |
| download | mongo-125cc016e905579c484c445f3f2f1b9bb71f92db.tar.gz | |
Link builtin extensions directly into libwiredtiger.la.
Diffstat (limited to 'build_posix')
| -rw-r--r-- | build_posix/Make.base | 8 | ||||
| -rw-r--r-- | build_posix/Make.subdirs | 7 | ||||
| -rw-r--r-- | build_posix/aclocal/options.m4 | 4 | ||||
| -rwxr-xr-x | build_posix/makemake | 2 |
4 files changed, 17 insertions, 4 deletions
diff --git a/build_posix/Make.base b/build_posix/Make.base index b8dc92d67e9..cdc12240bc3 100644 --- a/build_posix/Make.base +++ b/build_posix/Make.base @@ -59,3 +59,11 @@ $(srcdir)/docs/man/man3/wiredtiger.3: $(srcdir)/docs/index.html clean-local: rm -rf WT_TEST + +libwiredtiger_la_LIBADD = +if HAVE_BUILTIN_EXTENSION_SNAPPY +libwiredtiger_la_LIBADD += ext/compressors/snappy/libwiredtiger_snappy.la +endif +if HAVE_BUILTIN_EXTENSION_ZLIB +libwiredtiger_la_LIBADD += ext/compressors/snappy/libwiredtiger_zlib.la +endif diff --git a/build_posix/Make.subdirs b/build_posix/Make.subdirs index a25ef1362c0..d4295a5caa2 100644 --- a/build_posix/Make.subdirs +++ b/build_posix/Make.subdirs @@ -5,9 +5,6 @@ # # If the directory exists, it is added to AUTO_SUBDIRS. # If a condition is included, the subdir is made conditional via AM_CONDITIONAL -bench/tcbench -bench/wtperf -examples/c ext/collators/reverse ext/compressors/bzip2 BZIP2 ext/compressors/nop @@ -15,6 +12,10 @@ ext/compressors/snappy SNAPPY ext/compressors/zlib ZLIB ext/datasources/helium HAVE_HELIUM ext/test/kvs_bdb HAVE_BERKELEY_DB +. +bench/tcbench +bench/wtperf +examples/c lang/java JAVA lang/python PYTHON test/bloom diff --git a/build_posix/aclocal/options.m4 b/build_posix/aclocal/options.m4 index 28ec1a9c8db..880637eb002 100644 --- a/build_posix/aclocal/options.m4 +++ b/build_posix/aclocal/options.m4 @@ -37,6 +37,10 @@ for builtin_i in $builtin_list; do *) AC_MSG_ERROR([Unknown builtin extension "$builtin_i"]);; esac done +AM_CONDITIONAL([HAVE_BUILTIN_EXTENSION_SNAPPY], + [test $wt_cv_with_builtin_extension_snappy = yes]) +AM_CONDITIONAL([HAVE_BUILTIN_EXTENSION_ZLIB], + [test $wt_cv_with_builtin_extension_zlib = yes]) AC_MSG_RESULT($with_builtins) AC_MSG_CHECKING(if --enable-bzip2 option specified) diff --git a/build_posix/makemake b/build_posix/makemake index 44d5571e279..6623519f7e7 100755 --- a/build_posix/makemake +++ b/build_posix/makemake @@ -6,7 +6,7 @@ # (in release trees, some of the subdirs might be excluded). (sed -n '1,/BEGIN SUBDIRS/p' Make.base -echo "SUBDIRS = ." +echo "SUBDIRS =" sed -e 's/#.*$//' -e '/^$/d' Make.subdirs | (while read dir cond ; do test -d ../$dir || continue if test -n "$cond" ; then |