[or-cvs] r8316: correct includes for net/if.h and net/pfvar.h on openbsd (fr (tor/trunk)

[nickm at seul.org]

Author: nickm
Date: 2006-09-02 01:33:11 -0400 (Sat, 02 Sep 2006)
New Revision: 8316

Modified:
   tor/trunk/
   tor/trunk/configure.in
Log:
 r8704 at Kushana:  nickm | 2006-09-02 01:32:34 -0400
 correct includes for net/if.h and net/pfvar.h on openbsd (from Tup)



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r8704] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/configure.in
===================================================================
--- tor/trunk/configure.in	2006-08-31 23:52:41 UTC (rev 8315)
+++ tor/trunk/configure.in	2006-09-02 05:33:11 UTC (rev 8316)
@@ -368,12 +368,21 @@
 AC_CHECK_HEADERS(stdint.h sys/types.h inttypes.h sys/param.h sys/wait.h limits.h sys/limits.h netinet/in.h arpa/inet.h machine/limits.h syslog.h sys/time.h sys/resource.h stddef.h inttypes.h utime.h sys/utime.h sys/mman.h alloca.h)
 
 AC_CHECK_HEADERS(net/if.h, [net_if_found=1], [net_if_found=0],
-[#ifdef HAVE_SYS_SOCKET_H
+[#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif])
 AC_CHECK_HEADERS(net/pfvar.h, [net_pfvar_found=1], [net_pfvar_found=0],
-[#ifdef HAVE_SYS_SOCKET_H
+[#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_NET_IF_H
+#include <net/if.h>
 #endif])
 AC_CHECK_HEADERS(linux/netfilter_ipv4.h,
         [linux_netfilter_ipv4=1], [linux_netfilter_ipv4=0],