CDRIVER-2209 Improve bundling compressor libs

Author: bjori

Makefile.am

@@ -14,14 +14,6 @@ SUBDIRS =
 if WITH_LIBBSON
 SUBDIRS += src/libbson
 endif
-if WITH_SNAPPY
-include src/snappy-1.1.3/Makefile.am
-libmongoc_1_0_la_DEPENDENCIES += libsnappy.la
-endif
-if WITH_ZLIB
-include src/zlib-1.2.11/Makefile.am
-libmongoc_1_0_la_DEPENDENCIES += libzlib.la
-endif
 
 AM_CTAGSFLAGS = --fields=+l --languages=c
 

build/autotools/CheckSnappy.m4

@@ -81,7 +81,7 @@ AS_IF([test "x${with_snappy}" = xbundled],[
    fi
    /* end of vendored configure.ac checks from snappy */
 
-   SNAPPY_LIBS=libsnappy.la
+   SNAPPY_LIBS=
    SNAPPY_CFLAGS="-Isrc/snappy-1.1.3"
 ])
 

build/autotools/CheckZlib.m4

@@ -28,7 +28,7 @@ AS_IF([test "x${ZLIB_LIBS}" = "x" -a "x$with_zlib" = "xsystem"],
 AS_IF([test "x${with_zlib}" = xbundled],[
    AC_MSG_CHECKING(whether to enable bundled zlib)
    AC_MSG_RESULT(yes)
-   ZLIB_LIBS=libzlib.la
+   ZLIB_LIBS=
    ZLIB_CFLAGS="-Isrc/zlib-1.2.11"
 ])
 

src/Makefile.am

@@ -26,11 +26,6 @@ if ENABLE_STATIC
 endif
 
 
-if WITH_SNAPPY
-# Use c++ linker
-nodist_EXTRA_libmongoc_1_0_la_SOURCES = dummy.cxx
-nodist_EXTRA_libmongoc_priv_la_SOURCES = dummy.cxx
-endif
 EXTRA_DIST += \
 	src/libmongoc-1.0.pc.in \
 	src/libmongoc-ssl-1.0.pc.in \

src/mongoc/Makefile.am

@@ -318,5 +318,62 @@ if OS_WIN32
 libmongoc_la_LIBADD += -lws2_32
 endif
 
+if WITH_SNAPPY
+libmongoc_la_LIBADD += libsnappy.la
+lib_LTLIBRARIES += libsnappy.la
+libsnappy_la_CPPFLAGS = $(BSON_CFLAGS)
+libsnappy_la_SOURCES = \
+                        src/snappy-1.1.3/snappy.cc \
+                        src/snappy-1.1.3/snappy-sinksource.cc \
+                        src/snappy-1.1.3/snappy-stubs-internal.cc \
+                        src/snappy-1.1.3/snappy-c.cc
+
+noinst_HEADERS += \
+                  src/snappy-1.1.3/snappy-internal.h \
+                  src/snappy-1.1.3/snappy-stubs-internal.h \
+                  src/snappy-1.1.3/snappy-test.h \
+                  src/snappy-1.1.3/snappy.h \
+                  src/snappy-1.1.3/snappy-sinksource.h \
+                  src/snappy-1.1.3/snappy-stubs-public.h \
+                  src/snappy-1.1.3/snappy-c.h
+
+dist_doc_DATA = src/snappy-1.1.3/COPYING
+endif
+
+if WITH_ZLIB
+libmongoc_la_LIBADD += libzlib.la
+noinst_LTLIBRARIES += libzlib.la
+libzlib_la_CFLAGS  =
+libzlib_la_SOURCES = \
+                        src/zlib-1.2.11/adler32.c \
+                        src/zlib-1.2.11/crc32.c \
+                        src/zlib-1.2.11/deflate.c \
+                        src/zlib-1.2.11/infback.c \
+                        src/zlib-1.2.11/inffast.c \
+                        src/zlib-1.2.11/inflate.c \
+                        src/zlib-1.2.11/inftrees.c \
+                        src/zlib-1.2.11/trees.c \
+                        src/zlib-1.2.11/zutil.c \
+                        src/zlib-1.2.11/compress.c \
+                        src/zlib-1.2.11/uncompr.c \
+                        src/zlib-1.2.11/gzclose.c \
+                        src/zlib-1.2.11/gzlib.c \
+                        src/zlib-1.2.11/gzread.c \
+                        src/zlib-1.2.11/gzwrite.c
+
+noinst_HEADERS += \
+                  src/zlib-1.2.11/crc32.h \
+                  src/zlib-1.2.11/deflate.h \
+                  src/zlib-1.2.11/gzguts.h \
+                  src/zlib-1.2.11/inffast.h \
+                  src/zlib-1.2.11/inffixed.h \
+                  src/zlib-1.2.11/inflate.h \
+                  src/zlib-1.2.11/inftrees.h \
+                  src/zlib-1.2.11/trees.h \
+                  src/zlib-1.2.11/zconf.h \
+                  src/zlib-1.2.11/zlib.h \
+                  src/zlib-1.2.11/zutil.h
+endif
+
 EXTRA_DIST += $(MONGOC_DEF_FILES) $(NOINST_H_FILES)
 

tests/Makefile.am

@@ -50,31 +50,19 @@ if OS_WIN32
 TEST_LIBS += -lshlwapi
 endif
 
-if WITH_SNAPPY
-# Use c++ linker
-nodist_EXTRA_test_load_SOURCES = dummy.cxx
-endif
 test_load_SOURCES = \
 	tests/test-load.c \
 	tests/mongoc-tests.c
 test_load_CFLAGS = $(TEST_CFLAGS)
 test_load_LDADD = libmongoc-1.0.la $(TEST_LIBS)
 
 
-if WITH_SNAPPY
-# Use c++ linker
-nodist_EXTRA_test_secondary_SOURCES = dummy.cxx
-endif
 test_secondary_SOURCES = \
 	tests/test-secondary.c \
 	tests/mongoc-tests.c
 test_secondary_CFLAGS = $(TEST_CFLAGS)
 test_secondary_LDADD = libmongoc-1.0.la $(TEST_LIBS)
 
-if WITH_SNAPPY
-# Use c++ linker
-nodist_EXTRA_test_replica_set_SOURCES = dummy.cxx
-endif
 test_replica_set_SOURCES = \
 	tests/test-replica-set.c \
 	tests/ha-test.c \
@@ -84,10 +72,6 @@ test_replica_set_CFLAGS = $(TEST_CFLAGS)
 test_replica_set_LDADD = libmongoc.la $(TEST_LIBS)
 
 
-if WITH_SNAPPY
-# Use c++ linker
-nodist_EXTRA_test_replica_set_ssl_SOURCES = dummy.cxx
-endif
 test_replica_set_ssl_SOURCES = \
 	tests/test-replica-set-ssl.c \
 	tests/ha-test.c \
@@ -191,20 +175,12 @@ if ENABLE_SASL
 test_libmongoc_SOURCES += \
 	tests/test-cyrus.c
 endif
-if WITH_SNAPPY
-# Use c++ linker
-nodist_EXTRA_test_libmongoc_SOURCES = dummy.cxx
-endif
 test_libmongoc_CFLAGS = $(TEST_CFLAGS)
 test_libmongoc_LDADD = libmongoc.la $(TEST_LIBS)
 test_libmongoc_LDFLAGS = -no-undefined \
                          -rpath $(libdir)
 
 
-if WITH_SNAPPY
-# Use c++ linker
-nodist_EXTRA_test_sharded_cluster_SOURCES = dummy.cxx
-endif
 
 check: test