diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-06-20 13:38:55 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-06-20 13:38:55 +1000 |
| commit | 6a04cc3f7891af257e2d580858c59d6922c74499 (patch) | |
| tree | 80c4ea1010104fffadb2997c28d64bbfa6f23348 /ext | |
| parent | 125cc016e905579c484c445f3f2f1b9bb71f92db (diff) | |
| download | mongo-6a04cc3f7891af257e2d580858c59d6922c74499.tar.gz | |
Fix zlib builtin build, simplify parsing the list of builtins, don't list "./Makefile" as a generated file.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/compressors/zlib/Makefile.am | 2 | ||||
| -rw-r--r-- | ext/compressors/zlib/zlib_compress.c | 22 |
2 files changed, 14 insertions, 10 deletions
diff --git a/ext/compressors/zlib/Makefile.am b/ext/compressors/zlib/Makefile.am index 373277c92c2..dcafe161f04 100644 --- a/ext/compressors/zlib/Makefile.am +++ b/ext/compressors/zlib/Makefile.am @@ -2,5 +2,7 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/src/include lib_LTLIBRARIES = libwiredtiger_zlib.la libwiredtiger_zlib_la_SOURCES = zlib_compress.c +if !HAVE_BUILTIN_EXTENSION_ZLIB libwiredtiger_zlib_la_LDFLAGS = -avoid-version -module +endif libwiredtiger_zlib_la_LIBADD = -lz diff --git a/ext/compressors/zlib/zlib_compress.c b/ext/compressors/zlib/zlib_compress.c index 0cd81e1a939..b87999c3736 100644 --- a/ext/compressors/zlib/zlib_compress.c +++ b/ext/compressors/zlib/zlib_compress.c @@ -369,16 +369,7 @@ zlib_add_compressor(WT_CONNECTION *connection, int raw, const char *name) connection, name, &zlib_compressor->compressor, NULL)); } -/* - * wiredtiger_extension_init -- - * WiredTiger zlib compression extension. - */ -int -wiredtiger_extension_init( - WT_CONNECTION *connection, WT_CONFIG_ARG *config) -{ - return (zlib_extension_init(connection, config)); -} +extern int zlib_extension_init(WT_CONNECTION *, WT_CONFIG_ARG *); /* * zlib_extension_init -- @@ -400,3 +391,14 @@ zlib_extension_init( return (ret); return (0); } + +/* + * wiredtiger_extension_init -- + * WiredTiger zlib compression extension. + */ +int +wiredtiger_extension_init( + WT_CONNECTION *connection, WT_CONFIG_ARG *config) +{ + return (zlib_extension_init(connection, config)); +} |