build: further fixes for broken if_bridge.h

Commit c308a9ae was incomplete; it resolved the configure failure,
but not a later build failure.

* src/util/virnetdevbridge.c: Include pre-req header.
* configure.ac (AC_CHECK_HEADERS): Prefer standard in.h over
non-standard ip6.h.
(cherry picked from commit 1bf661caf4e926efcad6e85151a587cea5fd29f4)
(cherry picked from commit 2c7638fdb4e13987cc2229d547531d2c4383ba24)

Conflicts:
	src/util/virnetdevbridge.c

diff --git a/configure.ac b/configure.ac
index 94395d770489280b16de51acd876fbf9f11b8996..9e7deba8179083e5a013cbbbf496f8fe9feec75b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -859,7 +859,7 @@ if test "$with_linux" = "yes"; then
   if test "$with_qemu" = "yes" || test "$with_lxc" = "yes" ; then
     AC_CHECK_HEADERS([linux/param.h linux/sockios.h linux/if_bridge.h linux/if_tun.h],,
       [AC_MSG_ERROR([You must install kernel-headers in order to compile libvirt with QEMU or LXC support])],
-      [[#include <netinet/ip6.h>
+      [[#include <netinet/in.h>
       ]])
   fi
 fi

diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c
index 59e57399bbc4da0123bb0a39342a6cec848b9ea9..1347202f6459a76884fb50c933f177955c89b51e 100644 (file)
--- a/src/util/virnetdevbridge.c
+++ b/src/util/virnetdevbridge.c
@@ -30,9 +30,8 @@
 #include "intprops.h"
 
 #include <sys/ioctl.h>
-#ifdef HAVE_NET_IF_H
-# include <net/if.h>
-#endif
+#include <sys/socket.h>
+#include <net/if.h>
 #include <netinet/in.h>
 
 #ifdef __linux__