use FindZLIB and fix syslog

baresip · Aug 26, 2022 · 030f035 · 030f035
1 parent 31e4a47
commit 030f035
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -413,7 +413,7 @@ elseif(UNIX)
   endif()
 endif()
 
-if(NOT HAVE_ZLIB_H)
+if(NOT ZLIB_FOUND)
   list(APPEND SRCS
     src/crc32/crc32.c
   )
@@ -488,6 +488,7 @@ else()
     ${OPENSSL_LIBRARIES}
     ${Backtrace_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}
+    ${ZLIB_LIBRARIES}
   )
 endif()
 

diff --git a/cmake/re.cmake b/cmake/re.cmake
@@ -1,6 +1,7 @@
 find_package(Backtrace)
 find_package(Threads REQUIRED)
 find_package(OpenSSL)
+find_package(ZLIB)
 
 option(USE_OPENSSL "Enable OpenSSL" ${OPENSSL_FOUND})
 
@@ -38,12 +39,11 @@ if(HAVE_ARC4RANDOM)
   add_definitions(-DHAVE_ARC4RANDOM)
 endif()
 
-check_include_file(zlib.h HAVE_ZLIB_H)
-if(HAVE_ZLIB_H)
+if(ZLIB_FOUND)
   add_definitions(-DUSE_ZLIB)
 endif()
 
-check_include_file(getopt.h HAVE_SYSLOG_H)
+check_include_file(syslog.h HAVE_SYSLOG_H)
 if(HAVE_SYSLOG_H)
   add_definitions(-DHAVE_SYSLOG)
 endif()