mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 13:45:38 +00:00
meson: Use built-in pcap detection
Meson already knows how to look for pcap using pkg-config first, and falling back to pcap-config if that didn't work. https://mesonbuild.com/Dependencies.html#pcap Signed-off-by: Andrea Bolognani <abologna@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
parent
c32c5ca29a
commit
70670d4af7
14
meson.build
14
meson.build
@ -978,19 +978,7 @@ endif
|
|||||||
|
|
||||||
libpcap_version = '1.5.0'
|
libpcap_version = '1.5.0'
|
||||||
if not get_option('libpcap').disabled()
|
if not get_option('libpcap').disabled()
|
||||||
libpcap_dep = dependency('libpcap', version: '>=' + libpcap_version, required: false)
|
libpcap_dep = dependency('pcap', version: '>=' + libpcap_version, required: get_option('libpcap'))
|
||||||
|
|
||||||
if not libpcap_dep.found()
|
|
||||||
pcap_config_prog = find_program('pcap-config', required: get_option('libpcap'))
|
|
||||||
if pcap_config_prog.found()
|
|
||||||
pcap_args = run_command(pcap_config_prog, '--cflags').stdout().strip().split()
|
|
||||||
pcap_libs = run_command(pcap_config_prog, '--libs').stdout().strip().split()
|
|
||||||
libpcap_dep = declare_dependency(
|
|
||||||
compile_args: pcap_args,
|
|
||||||
link_args: pcap_libs,
|
|
||||||
)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
else
|
else
|
||||||
libpcap_dep = dependency('', required: false)
|
libpcap_dep = dependency('', required: false)
|
||||||
endif
|
endif
|
||||||
|
Loading…
Reference in New Issue
Block a user