CDRIVER-2037 Fix static linking when compression is enabled

Author: bjori

CMakeLists.txt

@@ -745,14 +745,14 @@ set(VERSION "${MONGOC_VERSION}")
 set(prefix "${CMAKE_INSTALL_PREFIX}")
 set(libdir "\${prefix}/lib")
 
-foreach(FLAG ${SASL_LIBS} ${SSL_LIBS} ${SHM_LIB} ${THREAD_LIB})
+foreach(FLAG ${SASL_LIBS} ${SSL_LIBS} ${SHM_LIB} ${THREAD_LIB} ${ZLIB_LIBS} ${SNAPPY_LIBS})
    if ( IS_ABSOLUTE "${FLAG}" )
       get_filename_component(FLAG_DIR "${FLAG}" DIRECTORY)
       get_filename_component(FLAG_FILE "${FLAG}" NAME_WE)
       STRING(REGEX REPLACE "^lib" "" FLAG_FILE "${FLAG_FILE}")
-      set(pkg_config_libs "${pkg_config_libs} -L${FLAG_DIR} -l${FLAG_FILE}")
+      set(MONGOC_LIBS "${MONGOC_LIBS} -L${FLAG_DIR} -l${FLAG_FILE}")
    else ()
-      set(pkg_config_libs "${pkg_config_libs} ${FLAG}")
+      set(MONGOC_LIBS "${MONGOC_LIBS} ${FLAG}")
    endif ()
 endforeach()
 

build/cmake/libmongoc-static-1.0-config.cmake.in

@@ -45,7 +45,7 @@ set (MONGOC_STATIC_LIBRARIES ${MONGOC_STATIC_LIBRARY} ${BSON_STATIC_LIBRARIES})
 # "-framework CoreFoundation -framework Security". Split into a CMake array
 # like "-framework CoreFoundation;-framework Security".
 set (IS_FRAMEWORK_VAR 0)
-foreach (LIB @SASL_LIBS@ @SSL_LIBS@ @SHM_LIB@)
+foreach (LIB @SASL_LIBS@ @SSL_LIBS@ @SHM_LIB@ @ZLIB_LIBS@ @SNAPPY_LIBS@)
    if (LIB STREQUAL "-framework")
       set (IS_FRAMEWORK_VAR 1)
       continue ()

configure.ac

@@ -69,7 +69,7 @@ AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
 m4_include([build/autotools/SetupAutomake.m4])
 
 # Substitute our dependencies into the pkg-config files.
-AC_SUBST(pkg_config_libs, "${SASL_LIBS} ${SSL_LIBS} ${SHM_LIB}")
+AC_SUBST(MONGOC_LIBS, "${SASL_LIBS} ${SSL_LIBS} ${SHM_LIB} ${ZLIB_LIBS} ${SNAPPY_LIBS}")
 
 AC_CONFIG_FILES([
     Makefile

src/libmongoc-1.0.pc.in

@@ -7,5 +7,5 @@ Name: libmongoc
 Description: The libmongoc MongoDB client library.
 Version: @VERSION@
 Requires: libbson-1.0
-Libs: -L${libdir} -lmongoc-1.0 @pkg_config_libs@
+Libs: -L${libdir} -lmongoc-1.0 @MONGOC_LIBS@
 Cflags: -I${includedir}/libmongoc-@MONGOC_API_VERSION@

src/libmongoc-static-1.0.pc.in

@@ -7,5 +7,5 @@ Name: libmongoc
 Description: The libmongoc MongoDB client library.
 Version: @VERSION@
 Requires: libbson-static-1.0
-Libs: -L${libdir} -lmongoc-static-1.0 @pkg_config_libs@
+Libs: -L${libdir} -lmongoc-static-1.0 @MONGOC_LIBS@
 Cflags: -I${includedir}/libmongoc-@MONGOC_API_VERSION@ -DMONGOC_STATIC