diff options
author | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2018-06-01 09:09:08 +0200 |
---|---|---|
committer | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2018-06-01 09:12:07 +0200 |
commit | 1bd9b61222f3a81ffe770fc00b70ded6e760c42b (patch) | |
tree | 0bf7d996cf0664796687c1be6d22958fcf6a8096 /drivers/net/pcap/meson.build | |
parent | bb4e158029645f37809fcf81a3acddd6fa11f88a (diff) |
New upstream version 18.05
Change-Id: Icd4170ddc4f63aeae5d0559490e5195b5349f9c2
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Diffstat (limited to 'drivers/net/pcap/meson.build')
-rw-r--r-- | drivers/net/pcap/meson.build | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/drivers/net/pcap/meson.build b/drivers/net/pcap/meson.build index 8b81214e..0c4e0201 100644 --- a/drivers/net/pcap/meson.build +++ b/drivers/net/pcap/meson.build @@ -1,22 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -if meson.is_cross_build() - pcap_dep = cc.find_library('pcap', required: false) - if pcap_dep.found() - ext_deps += pcap_dep - else - build = false - endif +pcap_dep = cc.find_library('pcap', required: false) +if pcap_dep.found() and cc.has_header('pcap.h', dependencies: pcap_dep) + build = true else - pcap_dep = dependency('pcap', required: false) - if pcap_dep.found() == true - ext_deps += pcap_dep - elif find_program('pcap-config', required: false).found() == true - ext_deps += cc.find_library('pcap') - else - build = false - endif + build = false endif sources = files('rte_eth_pcap.c') +ext_deps += pcap_dep pkgconfig_extra_libs += '-lpcap' |