From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 8 Dec 2021 12:12:17 +0000 (+0100)
Subject: meson: Require XDR for wireshark
X-Git-Tag: v8.0.0-rc1~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a642cc648ce5af31ef92c10ed838a9cd24bfc3db;p=thirdparty%2Flibvirt.git

meson: Require XDR for wireshark

The way our wireshark dissector works is by providing decoders
for primitive types (like integers, string, double, etc.) and
then parsing virsomethingprotocol.x files and generating complex
decoders for RPC. This obviously means that XDR is required for
the dissector, but corresponding check was missing.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/meson.build b/meson.build
index cea8bbfa0c..c5f0ee7287 100644
--- a/meson.build
+++ b/meson.build
@@ -1310,6 +1310,16 @@ endif
 
 wireshark_version = '2.6.0'
 wireshark_dep = dependency('wireshark', version: '>=' + wireshark_version, required: get_option('wireshark_dissector'))
+if wireshark_dep.found()
+  if not xdr_dep.found()
+    if get_option('wireshark_dissector').enabled()
+      error('XDR is required for wireshark plugin')
+    else
+      wireshark_dep = dependency('', required: false)
+    endif
+  endif
+endif
+
 if wireshark_dep.found()
   wireshark_plugindir = get_option('wireshark_plugindir')
   if wireshark_plugindir == ''