[or-cvs] r15726: Patch from coderman: detect transparent proxy header correct (tor/trunk)

[nickm at seul.org]

Author: nickm
Date: 2008-07-07 11:09:26 -0400 (Mon, 07 Jul 2008)
New Revision: 15726

Modified:
   tor/trunk/ChangeLog
   tor/trunk/configure.in
Log:
Patch from coderman: detect transparent proxy header correctly on some linux versions.

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-07-07 14:53:25 UTC (rev 15725)
+++ tor/trunk/ChangeLog	2008-07-07 15:09:26 UTC (rev 15726)
@@ -18,6 +18,9 @@
     - When opening /dev/null in finish_daemonize(), do not pass the
       O_CREAT flag.  Fortify was complaining, and correctly so.  Fixes
       bug 742; fix from Michael Scherer.  Bugfix on 0.0.2pre19.
+    - Correctly detect transparent proxy support on Linux hosts that
+      require in.h to be included before netfilter_ipv4.h.  Patch from
+      coderman.
 
 
 Changes in version 0.2.1.2-alpha - 2008-06-20

Modified: tor/trunk/configure.in
===================================================================
--- tor/trunk/configure.in	2008-07-07 14:53:25 UTC (rev 15725)
+++ tor/trunk/configure.in	2008-07-07 15:09:26 UTC (rev 15726)
@@ -349,6 +349,9 @@
 #endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
 #endif])
 
 if test x$transparent = xtrue ; then