From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 28 Apr 2014 15:11:11 +0000 (-0400)
Subject: New --disable-seccomp option to turn off support for seccomp.
X-Git-Tag: tor-0.2.5.5-alpha~116^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=904dd436b58a63d430d09038a2d0edcc1133798f;p=thirdparty%2Ftor.git

New --disable-seccomp option to turn off support for seccomp.

Fixes 11628.
---

diff --git a/changes/bug11628 b/changes/bug11628
new file mode 100644
index 0000000000..b93e1f4fc7
--- /dev/null
+++ b/changes/bug11628
@@ -0,0 +1,4 @@
+  o Minor features:
+    - The configure script has a --disable-seccomp option to turn off
+      support for libseccomp on systems that have it, in case it (or
+      Tor's use of it) is broken. Resolves ticket 11628.
diff --git a/configure.ac b/configure.ac
index edfe2f8e9a..8b5e853ea3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,6 +161,9 @@ AC_ARG_ENABLE(bufferevents,
 AC_ARG_ENABLE(tool-name-check,
      AS_HELP_STRING(--disable-tool-name-check, check for sanely named toolchain when cross-compiling))
 
+AC_ARG_ENABLE(seccomp,
+     AS_HELP_STRING(--disable-seccomp, do not attempt to use libseccomp))
+
 dnl check for the correct "ar" when cross-compiling
 AN_MAKEVAR([AR], [AC_PROG_AR])
 AN_PROGRAM([ar], [AC_PROG_AR])
@@ -726,8 +729,10 @@ fi
 dnl ============================================================
 dnl Check for libseccomp
 
-AC_CHECK_HEADERS([seccomp.h])
-AC_SEARCH_LIBS(seccomp_init, [seccomp])
+if test "x$enable_seccomp" != "xno"; then
+  AC_CHECK_HEADERS([seccomp.h])
+  AC_SEARCH_LIBS(seccomp_init, [seccomp])
+fi
 
 dnl ============================================================
 dnl We need an implementation of curve25519.