[or-cvs] r7019: Add sys/socket.h prereq for net/if.h and net/pfvar.h (tor/trunk)

[nickm@xxxxxxxx]

Author: nickm
Date: 2006-08-11 03:09:09 -0400 (Fri, 11 Aug 2006)
New Revision: 7019

Modified:
   tor/trunk/
   tor/trunk/configure.in
Log:
 r7323@Kushana:  nickm | 2006-08-10 22:04:57 -0700
 Add sys/socket.h prereq for net/if.h and net/pfvar.h



Property changes on: tor/trunk
___________________________________________________________________
Name: svk:merge
   - 17f730b7-d419-0410-b50f-85ee4b70197a:/local/or/tor/trunk:8245
1f724f9b-111a-0410-b636-93f1a77c1813:/local/or/tor/trunk:8207
96637b51-b116-0410-a10e-9941ebb49b64:/tor/branches/spec:7005
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/eventdns:7014
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/mmap:7030
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/oo-connections:6950
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/trans-ap:7315
   + 17f730b7-d419-0410-b50f-85ee4b70197a:/local/or/tor/trunk:8245
1f724f9b-111a-0410-b636-93f1a77c1813:/local/or/tor/trunk:8207
96637b51-b116-0410-a10e-9941ebb49b64:/tor/branches/spec:7005
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/eventdns:7014
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/mmap:7030
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/oo-connections:6950
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/trans-ap:7315
c95137ef-5f19-0410-b913-86e773d04f59:/tor/trunk:7323

Modified: tor/trunk/configure.in
===================================================================
--- tor/trunk/configure.in	2006-08-10 19:56:10 UTC (rev 7018)
+++ tor/trunk/configure.in	2006-08-11 07:09:09 UTC (rev 7019)
@@ -367,8 +367,14 @@
 
 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])
-AC_CHECK_HEADERS(net/pfvar.h, [net_pfvar_found=1], [net_pfvar_found=0])
+AC_CHECK_HEADERS(net/if.h, [net_if_found=1], [net_if_found=0],
+[#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
+#include <sys/socket.h>
+#endif])
 AC_CHECK_HEADERS(linux/netfilter_ipv4.h,
         [linux_netfilter_ipv4=1], [linux_netfilter_ipv4=0],
 [#ifdef HAVE_SYS_SOCKET_H