[tor-commits] [tor/master] Add autoconf magic to support Bitrig

[nickm at torproject.org]

commit d92d3f33356af002892ba5754d9d36cc4504c95f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 4 10:56:33 2012 -0400

    Add autoconf magic to support Bitrig
    
    Bitrig is an openbsd fork.  Patch from dhill.  Ticket 6982.
---
 changes/6982 |    3 +++
 configure.ac |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changes/6982 b/changes/6982
new file mode 100644
index 0000000..edfa066
--- /dev/null
+++ b/changes/6982
@@ -0,0 +1,3 @@
+  o Minor features (portability):
+    - Tor now builds correctly on Bitrig, an OpenBSD fork. Patch from dhill.
+      Ticket 6982.
diff --git a/configure.ac b/configure.ac
index 4db1a2c..bb7ea6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -743,7 +743,7 @@ if test x$transparent = xtrue ; then
    if test x$transparent_ok = x1 ; then
      AC_DEFINE(USE_TRANSPARENT, 1, "Define to enable transparent proxy support")
      case $host in
-       *-*-openbsd*)
+       *-*-openbsd* | *-*-bitrig*)
          AC_DEFINE(OPENBSD, 1, "Define to handle pf on OpenBSD properly") ;;
      esac
    else
@@ -1252,7 +1252,7 @@ if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xy
   CFLAGS="$save_CFLAGS"
 
   case $host in
-    *-*-openbsd*)
+    *-*-openbsd* | *-*-bitrig*)
       # Some OpenBSD versions (like 4.8) have -Wsystem-headers by default.
       # That's fine, except that the headers don't pass -Wredundant-decls.
       # Therefore, let's disable -Wsystem-headers when we're building