]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
meson: Use built-in pcap detection
authorAndrea Bolognani <abologna@redhat.com>
Wed, 26 May 2021 16:20:04 +0000 (18:20 +0200)
committerAndrea Bolognani <abologna@redhat.com>
Tue, 1 Jun 2021 12:30:39 +0000 (14:30 +0200)
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>
meson.build

index 9e606775132209d201a23d7968cfc6ae7249d4a4..1c46e8b2a820ebe7783540e3f2e6a9010d2b3c64 100644 (file)
@@ -978,19 +978,7 @@ endif
 
 libpcap_version = '1.5.0'
 if not get_option('libpcap').disabled()
-  libpcap_dep = dependency('libpcap', version: '>=' + libpcap_version, required: false)
-
-  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
+  libpcap_dep = dependency('pcap', version: '>=' + libpcap_version, required: get_option('libpcap'))
 else
   libpcap_dep = dependency('', required: false)
 endif