[or-cvs] r7015: add missing "test" and missing include. (tor/trunk)

[nickm@xxxxxxxx]

Author: nickm
Date: 2006-08-10 05:30:25 -0400 (Thu, 10 Aug 2006)
New Revision: 7015

Modified:
   tor/trunk/
   tor/trunk/configure.in
Log:
 r7315@Kushana:  nickm | 2006-08-10 02:30:13 -0700
 add missing "test" and missing include.



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:7313
   + 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

Modified: tor/trunk/configure.in
===================================================================
--- tor/trunk/configure.in	2006-08-10 09:18:41 UTC (rev 7014)
+++ tor/trunk/configure.in	2006-08-10 09:30:25 UTC (rev 7015)
@@ -370,7 +370,10 @@
 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(linux/netfilter_ipv4.h,
-        [linux_netfilter_ipv4=1], [linux_netfilter_ipv4=0])
+        [linux_netfilter_ipv4=1], [linux_netfilter_ipv4=0],
+[#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif])
 
 AC_CHECK_FUNCS(gettimeofday ftime socketpair uname inet_aton strptime getrlimit setrlimit strlcat strlcpy strtoull getpwnam getpwuid ftello getaddrinfo localtime_r gmtime_r event_get_version event_get_method event_set_log_callback memmem mmap strtok_r)
 
@@ -387,7 +390,7 @@
    if test x$linux_netfilter_ipv4 = x1 ; then
      transparent_ok=1
    fi
-   if x$transparent_ok = x1 ; then
+   if test x$transparent_ok = x1 ; then
      AC_DEFINE(USE_TRANSPARENT, 1, "Define to enable transparent proxy support")
      case $host in
        *-*-openbsd*)