From: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: Sat, 8 Aug 2020 09:16:16 +0000 (+0400)
Subject: meson: fix BSD bridge management routines check
X-Git-Tag: v6.7.0-rc1~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=154ecac509da8889a81744d840d66d2f251fc602;p=thirdparty%2Flibvirt.git

meson: fix BSD bridge management routines check

Add missing prerequisite headers for checking BRDGSFD, BRDGADD,
BRDGDEL in net/if_bridgevar.h.

Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/meson.build b/meson.build
index a1a719111c..447b1f33ab 100644
--- a/meson.build
+++ b/meson.build
@@ -797,9 +797,12 @@ foreach symbol : symbols
 endforeach
 
 # Check for BSD approach for bridge management
-if (cc.has_header_symbol('net/if_bridgevar.h', 'BRDGSFD') and
-    cc.has_header_symbol('net/if_bridgevar.h', 'BRDGADD') and
-    cc.has_header_symbol('net/if_bridgevar.h', 'BRDGDEL'))
+brd_required_headers = '''#include <stdint.h>
+#include <net/if.h>
+#include <net/ethernet.h>'''
+if (cc.has_header_symbol('net/if_bridgevar.h', 'BRDGSFD', prefix: brd_required_headers) and
+    cc.has_header_symbol('net/if_bridgevar.h', 'BRDGADD', prefix: brd_required_headers) and
+    cc.has_header_symbol('net/if_bridgevar.h', 'BRDGDEL', prefix: brd_required_headers))
   conf.set('HAVE_BSD_BRIDGE_MGMT', 1)
 endif