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 /ext | |
| parent | 424bab13a64057baf87adf8152b18ef6bfa9beff (diff) | |
| download | mongo-125cc016e905579c484c445f3f2f1b9bb71f92db.tar.gz | |
Link builtin extensions directly into libwiredtiger.la.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/compressors/snappy/Makefile.am | 2 | ||||
| -rw-r--r-- | ext/compressors/snappy/snappy_compress.c | 20 |
2 files changed, 13 insertions, 9 deletions
diff --git a/ext/compressors/snappy/Makefile.am b/ext/compressors/snappy/Makefile.am index 6d7882308de..306935be61d 100644 --- a/ext/compressors/snappy/Makefile.am +++ b/ext/compressors/snappy/Makefile.am @@ -2,5 +2,7 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/src/include lib_LTLIBRARIES = libwiredtiger_snappy.la libwiredtiger_snappy_la_SOURCES = snappy_compress.c +if !HAVE_BUILTIN_EXTENSION_SNAPPY libwiredtiger_snappy_la_LDFLAGS = -avoid-version -module +endif libwiredtiger_snappy_la_LIBADD = -lsnappy diff --git a/ext/compressors/snappy/snappy_compress.c b/ext/compressors/snappy/snappy_compress.c index 9c0c6bfb2c8..f580e1b97ac 100644 --- a/ext/compressors/snappy/snappy_compress.c +++ b/ext/compressors/snappy/snappy_compress.c @@ -188,15 +188,7 @@ wt_snappy_terminate(WT_COMPRESSOR *compressor, WT_SESSION *session) return (0); } -/* - * wiredtiger_extension_init -- - * WiredTiger snappy compression extension. - */ -int -wiredtiger_extension_init(WT_CONNECTION *connection, WT_CONFIG_ARG *config) -{ - return snappy_extension_init(connection, config); -} +extern int snappy_extension_init(WT_CONNECTION *, WT_CONFIG_ARG *); /* * snappy_extension_init -- @@ -225,3 +217,13 @@ snappy_extension_init(WT_CONNECTION *connection, WT_CONFIG_ARG *config) return (connection->add_compressor( connection, "snappy", (WT_COMPRESSOR *)snappy_compressor, NULL)); } + +/* + * wiredtiger_extension_init -- + * WiredTiger snappy compression extension. + */ +int +wiredtiger_extension_init(WT_CONNECTION *connection, WT_CONFIG_ARG *config) +{ + return snappy_extension_init(connection, config); +} |