diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-30 17:21:15 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-30 17:21:15 -0400 |
| commit | f43fee8f8f194af475932f5312b2e538770d3c94 (patch) | |
| tree | 7a01d1efd5e9cadb4050ef6400dd512f872892b4 | |
| parent | 14efaa028382a75f97371cc15c3d0e49b7d7728d (diff) | |
| parent | 904dd436b58a63d430d09038a2d0edcc1133798f (diff) | |
| download | tor-f43fee8f8f194af475932f5312b2e538770d3c94.tar tor-f43fee8f8f194af475932f5312b2e538770d3c94.tar.gz | |
Merge remote-tracking branch 'public/bug11628'
| -rw-r--r-- | changes/bug11628 | 4 | ||||
| -rw-r--r-- | configure.ac | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/changes/bug11628 b/changes/bug11628 new file mode 100644 index 000000000..b93e1f4fc --- /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 c0c818757..3ef5cdd7d 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. |