commit 904dd436b58a63d430d09038a2d0edcc1133798f Author: Nick Mathewson nickm@torproject.org Date: Mon Apr 28 11:11:11 2014 -0400

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

Fixes 11628. --- changes/bug11628 | 4 ++++ configure.ac | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/changes/bug11628 b/changes/bug11628 new file mode 100644 index 0000000..b93e1f4 --- /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 edfe2f8..8b5e853 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.