diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2023-11-20 12:40:43 +0100 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2023-11-20 12:41:24 +0100 |
| commit | b0c343a7958570bc656cf980301bcf73dc62b3b6 (patch) | |
| tree | 160c50b521bb6f78e4a2b2479f65890fb020d29a | |
| parent | d5266b7f44e0b9c02ef1fc3166ba59431ab43230 (diff) | |
Workaround for libpap (<1.9.0) on Ubuntu-18.04
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 291d86fd2..c59771315 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -95,7 +95,7 @@ jobs: upload: false ndpi_min_version: "4.8" - compiler: "gcc-10" - os: "ubuntu-latest" + os: "ubuntu-18.04" ndpi_build: "-DBUILD_NDPI=ON" ndpid_examples: "-DBUILD_EXAMPLES=ON" ndpid_gcrypt: "-DNDPI_WITH_GCRYPT=OFF" diff --git a/CMakeLists.txt b/CMakeLists.txt index c456bd196..2085b543a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -325,7 +325,10 @@ else() set(DEFAULT_NDPI_INCLUDE ${NDPI_INCLUDE_DIRS}) 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) find_package(PCAP "1.9.0" REQUIRED) endif() |