Underlinking fix (#787)

* CMakeLists.txt: Stop hardcoding the ZLIB string, it is automatically done via find_package(ZLIB) already
* Make sure dlt_daemon links zlib, this is because it uses internal symbols of zlib
dpkg-shlibdeps: warning: symbol gzfwrite used by debian/libdlt-dev/usr/lib/x86_64-linux-gnu/libdlt_daemon.so found in 
* Try harder to fix underlink, and use the dlt_daemon library if available to avoid code duplication
* Fix build when zlib is not installed

Author: LocutusOfBorg

CMakeLists.txt

@@ -130,10 +130,8 @@ set(LICENSE "Mozilla Public License Version 2.0")
 find_package(Threads REQUIRED)
 if(WITH_DLT_LOGSTORAGE_GZIP)
     find_package(ZLIB 1.2.9 REQUIRED)
-    set(ZLIB_LIBRARY "ZLIB::ZLIB")
 elseif(WITH_DLT_COREDUMPHANDLER OR WITH_DLT_FILETRANSFER)
     find_package(ZLIB REQUIRED)
-    set(ZLIB_LIBRARY "ZLIB::ZLIB")
 else()
     set(ZLIB_LIBRARY "")
 endif()

src/daemon/CMakeLists.txt

@@ -67,7 +67,7 @@ if (WITH_SYSTEMD_SOCKET_ACTIVATION)
     target_link_libraries(dlt-daemon systemd)
 endif()
 if (WITH_DLT_LOGSTORAGE_GZIP)
-	target_link_libraries(dlt-daemon ${ZLIB_LIBRARY})
+    target_link_libraries(dlt-daemon ${ZLIB_LIBRARY})
 endif()
 
 install(TARGETS dlt-daemon
@@ -87,12 +87,24 @@ if (WITH_DLT_UNIT_TESTS)
 
     add_library(dlt_daemon ${library_SRCS})
     target_link_libraries(dlt_daemon ${RT_LIBRARY} ${SOCKET_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+    if (WITH_DLT_LOGSTORAGE_GZIP)
+	target_link_libraries(dlt_daemon ${ZLIB_LIBRARY})
+    endif()
 
     install(TARGETS dlt_daemon
             RUNTIME DESTINATION bin
             LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/static
             COMPONENT base)
+
+    if(NOT WITH_LIB_NO_VERSION)
+        if(WITH_LIB_SHORT_VERSION)
+            set_target_properties(dlt_daemon PROPERTIES VERSION ${PROJECT_VERSION_MAJOR} SOVERSION ${PROJECT_VERSION_MAJOR})
+        else()
+            set_target_properties(dlt_daemon PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
+        endif()
+    endif()
+
 endif(WITH_DLT_UNIT_TESTS)
 
 INSTALL(FILES dlt.conf

src/offlinelogstorage/dlt_offline_logstorage.h

@@ -53,7 +53,9 @@
 
 #include <search.h>
 #include <stdbool.h>
+#ifdef DLT_LOGSTORAGE_USE_GZIP
 #include <zlib.h>
+#endif
 #include "dlt_common.h"
 #include "dlt-daemon_cfg.h"
 #include "dlt_config_file_parser.h"
@@ -214,7 +216,9 @@ struct DltLogStorageFilterConfig
                                int status);
     FILE *log;                      /* current open log file */
     int fd;                         /* The file descriptor for the active log file */
+#ifdef DLT_LOGSTORAGE_USE_GZIP
     gzFile *gzlog;                  /* current open gz log file */
+#endif
     void *cache;                    /* log data cache */
     unsigned int specific_size;     /* cache size used for specific_size sync strategy */
     unsigned int current_write_file_offset;    /* file offset for specific_size sync strategy */

src/offlinelogstorage/dlt_offline_logstorage_behavior.c

@@ -1108,11 +1108,15 @@ int dlt_logstorage_prepare_on_msg(DltLogStorageFilterConfig *config,
                 if ((config->sync == DLT_LOGSTORAGE_SYNC_ON_MSG) ||
                     (config->sync == DLT_LOGSTORAGE_SYNC_UNSET)) {
                     if (config->gzip_compression == DLT_LOGSTORAGE_GZIP_ON) {
+#ifdef DLT_LOGSTORAGE_USE_GZIP
                         if (fsync(fileno(config->gzlog)) != 0) {
                             if (errno != ENOSYS) {
                                 dlt_vlog(LOG_ERR, "%s: failed to sync gzip log file\n", __func__);
                             }
                         }
+#else
+                        dlt_vlog(LOG_ERR, "%s: dlt-daemon not compiled with logstorage gzip support\n", __func__);
+#endif
                     }
                     else {
                         if (fsync(fileno(config->log)) != 0) {

tests/CMakeLists.txt

@@ -98,7 +98,7 @@ foreach(target IN LISTS TARGET_LIST)
     endif()
 
     add_executable(${target} ${target_SRCS})
-    target_link_libraries(${target} ${DLT_LIBRARIES})
+    target_link_libraries(${target} ${DLT_LIBRARIES} ${ZLIB_LIBRARY})
     if(WITH_DLT_INSTALLED_TESTS)
         install(TARGETS ${target} RUNTIME DESTINATION ${DLT_TEST_DIR})
         if(EXISTS ${PROJECT_SOURCE_DIR}/tests/${target}.sh)