Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Added support for optional libz.

Browse source
This commit is contained in:
Jon Siwek 2010-10-21 15:32:31 -05:00
parent 88c77fdc25
commit d043aba54d
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
BuildOptions.cmake
View file

@ -69,5 +69,4 @@ set(BinPAC_SKIP_INSTALL true)
# TODO: more dependencies: # TODO: more dependencies:
# LibGeoIP # LibGeoIP
# Libz
# Google perftools # Google perftools

8
CMakeLists.txt
View file

@ -99,8 +99,12 @@ if (LIBMAGIC_FOUND)
set(HAVE_LIBMAGIC true) set(HAVE_LIBMAGIC true)
endif () endif ()
find_package(ZLIB)
if (ZLIB_FOUND)
set(HAVE_LIBZ true)
endif ()
# TODO: optional libGeoIP # TODO: optional libGeoIP
# TODO: optional libz
# TODO: optional Google perftools # TODO: optional Google perftools
## ##
@ -155,7 +159,7 @@ message(
"\nBroccoli: ${use_broccoli}" "\nBroccoli: ${use_broccoli}"
"\nBroctl: ${use_broctl}" "\nBroctl: ${use_broctl}"
"\nGeoIP: ${use_geoip}" "\nGeoIP: ${use_geoip}"
"\nlibz: ${use_libz}" "\nlibz: ${HAVE_LIBZ}"
"\nlibmagic: ${HAVE_LIBMAGIC}" "\nlibmagic: ${HAVE_LIBMAGIC}"
"\nGoogle perftools: ${use_perftools}" "\nGoogle perftools: ${use_perftools}"
"\n" "\n"

4
config.h.in
View file

@ -23,8 +23,8 @@
/* Define if you have the `magic' library (-lmagic). */ /* Define if you have the `magic' library (-lmagic). */
#cmakedefine HAVE_LIBMAGIC #cmakedefine HAVE_LIBMAGIC
/* Define to 1 if you have the `z' library (-lz). */ /* Define if you have the `z' library (-lz). */
#undef HAVE_LIBZ #cmakedefine HAVE_LIBZ
/* We are on a Linux system */ /* We are on a Linux system */
#cmakedefine HAVE_LINUX #cmakedefine HAVE_LINUX

1
src/CMakeLists.txt
View file

@ -369,6 +369,7 @@ target_link_libraries(bro
${OPENSSL_LIBRARIES} ${OPENSSL_LIBRARIES}
${BIND_LIBRARY} ${BIND_LIBRARY}
${LibMagic_LIBRARY} ${LibMagic_LIBRARY}
${ZLIB_LIBRARIES}
) )
install(TARGETS bro DESTINATION bin) install(TARGETS bro DESTINATION bin)