diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-11-25 09:28:44 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-11-25 09:28:44 -0500 |
| commit | 62aad9c0b6812d04cfca3ec9e104d8ee2cbebb7c (patch) | |
| tree | 945e46e120e155c17a20e7f0cec3988b83432a24 | |
| parent | fe8eb9b366d9dccf06d8d4ce117b67bbb3aeba60 (diff) | |
| parent | 232ccc18c40f0d0302b2e21b0f67885c548f8e63 (diff) | |
| download | tor-62aad9c0b6812d04cfca3ec9e104d8ee2cbebb7c.tar.gz tor-62aad9c0b6812d04cfca3ec9e104d8ee2cbebb7c.zip | |
Merge branch 'maint-0.2.7'
| -rw-r--r-- | changes/bug17551 | 4 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug17551 b/changes/bug17551 new file mode 100644 index 0000000000..27e467979e --- /dev/null +++ b/changes/bug17551 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - When checking for net/pfvar.h, include netinet/in.h if possible. + This fixes transparent proxy detection on OpenBSD. Fixes bug + 17551; bugfix on 0.1.2.1-alpha. Patch from "rubiate". diff --git a/configure.ac b/configure.ac index 3bf2f471e0..868ff55825 100644 --- a/configure.ac +++ b/configure.ac @@ -967,6 +967,9 @@ AC_CHECK_HEADERS(net/pfvar.h, net_pfvar_found=1, net_pfvar_found=0, #endif #ifdef HAVE_NET_IF_H #include <net/if.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> #endif]) AC_CHECK_HEADERS(linux/if.h,[],[], |