diff options
author | startx2017 <vradu.startx@yandex.com> | 2020-09-01 09:54:26 -0400 |
---|---|---|
committer | startx2017 <vradu.startx@yandex.com> | 2020-09-01 09:54:26 -0400 |
commit | a5c62dfa5955ad91aa6592c0a5443b93f8432bf3 (patch) | |
tree | 2b5fecafafbc8fafb1cab44d567385da059b483c /configure.ac | |
parent | shell none: avoid syscalls after seccomp_install_filters (diff) | |
download | firejail-a5c62dfa5955ad91aa6592c0a5443b93f8432bf3.tar.gz firejail-a5c62dfa5955ad91aa6592c0a5443b93f8432bf3.tar.zst firejail-a5c62dfa5955ad91aa6592c0a5443b93f8432bf3.zip |
removed --disable-seccomp from ./configure
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index feb0b38a6..0524651fb 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -76,14 +76,6 @@ AS_IF([test "x$enable_private_home" != "xno"], [ | |||
76 | AC_SUBST(HAVE_PRIVATE_HOME) | 76 | AC_SUBST(HAVE_PRIVATE_HOME) |
77 | ]) | 77 | ]) |
78 | 78 | ||
79 | HAVE_SECCOMP="" | ||
80 | AC_ARG_ENABLE([seccomp], | ||
81 | AS_HELP_STRING([--disable-seccomp], [disable seccomp])) | ||
82 | AS_IF([test "x$enable_seccomp" != "xno"], [ | ||
83 | HAVE_SECCOMP="-DHAVE_SECCOMP" | ||
84 | AC_SUBST(HAVE_SECCOMP) | ||
85 | ]) | ||
86 | |||
87 | HAVE_CHROOT="" | 79 | HAVE_CHROOT="" |
88 | AC_ARG_ENABLE([chroot], | 80 | AC_ARG_ENABLE([chroot], |
89 | AS_HELP_STRING([--disable-chroot], [disable chroot])) | 81 | AS_HELP_STRING([--disable-chroot], [disable chroot])) |
@@ -196,8 +188,7 @@ AS_IF([test "x$enable_selinux" = "xyes"], [ | |||
196 | # checking pthread library | 188 | # checking pthread library |
197 | AC_CHECK_LIB([pthread], [main], [], AC_MSG_ERROR([*** POSIX thread support not installed ***])) | 189 | AC_CHECK_LIB([pthread], [main], [], AC_MSG_ERROR([*** POSIX thread support not installed ***])) |
198 | AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([*** POSIX thread support not installed ***])) | 190 | AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([*** POSIX thread support not installed ***])) |
199 | AC_CHECK_HEADER([linux/seccomp.h], HAVE_SECCOMP_H="-DHAVE_SECCOMP_H", HAVE_SECCOMP_H="") | 191 | AC_CHECK_HEADER([linux/seccomp.h],,AC_MSG_ERROR([*** SECCOMP support is not installed (/usr/include/linux/seccomp.h missing) ***])) |
200 | AC_SUBST(HAVE_SECCOMP_H) | ||
201 | 192 | ||
202 | # set sysconfdir | 193 | # set sysconfdir |
203 | if test "$prefix" = /usr; then | 194 | if test "$prefix" = /usr; then |
@@ -214,8 +205,6 @@ echo | |||
214 | echo "Configuration options:" | 205 | echo "Configuration options:" |
215 | echo " prefix: $prefix" | 206 | echo " prefix: $prefix" |
216 | echo " sysconfdir: $sysconfdir" | 207 | echo " sysconfdir: $sysconfdir" |
217 | echo " seccomp: $HAVE_SECCOMP" | ||
218 | echo " <linux/seccomp.h>: $HAVE_SECCOMP_H" | ||
219 | echo " apparmor: $HAVE_APPARMOR" | 208 | echo " apparmor: $HAVE_APPARMOR" |
220 | echo " global config: $HAVE_GLOBALCFG" | 209 | echo " global config: $HAVE_GLOBALCFG" |
221 | echo " chroot: $HAVE_CHROOT" | 210 | echo " chroot: $HAVE_CHROOT" |