]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Revert "build: fix configure detection of if_bridge.h on RHEL 6"
authorDaniel P. Berrange <berrange@redhat.com>
Wed, 7 Aug 2013 10:23:54 +0000 (11:23 +0100)
committerDoug Goldstein <cardoe@cardoe.com>
Mon, 12 Aug 2013 01:14:06 +0000 (20:14 -0500)
This reverts commit 2df8d99138dc8396c7d46c3cceca8ce2e93b605a.

The change breaks configure on any recent Fedora platform
(cherry picked from commit 43cee32ff59faf3f2ba21f27676c0bc3e5513c83)

configure.ac

index df11f2307c6bed5eb153b664ab9b61a8cf8518b5..35a5d76f10296050a45ac46ecefbdf21263982d1 100644 (file)
@@ -997,14 +997,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])],
-      [[/* The kernel folks broke their headers when used with particular
-         * glibc versions; although the structs are ABI compatible, the
-         * C type system doesn't like struct redefinitions.  We work around
-         * the problem here in the same manner as in virnetdevbridge.c.  */
-        #include <netinet/in.h>
-        #define in6_addr in6_addr_
-        #define sockaddr_in6 sockaddr_in6_
-        #define ipv6_mreq ipv6_mreq_
+      [[#include <netinet/in.h>
       ]])
   fi
 fi