scottk/nDPId
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/nDPId.git synced 2025-10-29 09:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Workaround for libpap (<1.9.0) on Ubuntu-18.04

Browse Source 
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni Uhlig
2023-11-20 12:40:43 +01:00
parent d5266b7f44
commit b0c343a795
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@@ -95,7 +95,7 @@ jobs:
upload: false upload: false
ndpi_min_version: "4.8" ndpi_min_version: "4.8"
- compiler: "gcc-10" - compiler: "gcc-10"
os: "ubuntu-latest" os: "ubuntu-18.04"
ndpi_build: "-DBUILD_NDPI=ON" ndpi_build: "-DBUILD_NDPI=ON"
ndpid_examples: "-DBUILD_EXAMPLES=ON" ndpid_examples: "-DBUILD_EXAMPLES=ON"
ndpid_gcrypt: "-DNDPI_WITH_GCRYPT=OFF" ndpid_gcrypt: "-DNDPI_WITH_GCRYPT=OFF"

5
CMakeLists.txt
View File

@@ -325,7 +325,10 @@ else()
set(DEFAULT_NDPI_INCLUDE ${NDPI_INCLUDE_DIRS}) set(DEFAULT_NDPI_INCLUDE ${NDPI_INCLUDE_DIRS})
endif() endif()
pkg_check_modules(PCAP REQUIRED libpcap>=1.9.0) # no *.pc file before 1.9.0 pkg_check_modules(PCAP libpcap>=1.9.0) # no *.pc file before 1.9.0
if(NOT pkgcfg_lib_PCAP_pcap)
pkg_check_modules(PCAP libpcap>=1.8.1) # seems like some distributions provide their own *.pc file for 1.8.1 (e.g. Ubuntu-18.04)
endif()
if(NOT pkgcfg_lib_PCAP_pcap) if(NOT pkgcfg_lib_PCAP_pcap)
find_package(PCAP "1.9.0" REQUIRED) find_package(PCAP "1.9.0" REQUIRED)
endif() endif()