Просмотр исходного кода

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

Fixes 11628.
Nick Mathewson 10 лет назад
Родитель
Сommit
904dd436b5
2 измененных файлов с 11 добавлено и 2 удалено
  1. 4 0
      changes/bug11628
  2. 7 2
      configure.ac

+ 4 - 0
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.

+ 7 - 2
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.