diff options
author | netblue30 <netblue30@yahoo.com> | 2020-09-01 16:10:41 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2020-09-01 16:10:41 -0400 |
commit | 18348b2749b3b21bb2407f0d6ed95e1fd4239be3 (patch) | |
tree | 931f7b11813203e2fced36d2f4053d4eeb92dea1 /configure.ac | |
parent | fshaper.sh fix (#3620) (diff) | |
parent | Merge branch 'master' of https://github.com/netblue30/firejail (diff) | |
download | firejail-18348b2749b3b21bb2407f0d6ed95e1fd4239be3.tar.gz firejail-18348b2749b3b21bb2407f0d6ed95e1fd4239be3.tar.zst firejail-18348b2749b3b21bb2407f0d6ed95e1fd4239be3.zip |
Merge branch 'master' of https://github.com/netblue30/firejail
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index feb0b38a6..241865968 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 |
@@ -208,14 +199,12 @@ AC_CONFIG_FILES([mkdeb.sh], [chmod +x mkdeb.sh]) | |||
208 | AC_OUTPUT(Makefile src/common.mk src/lib/Makefile src/fcopy/Makefile src/fnet/Makefile src/firejail/Makefile src/fnetfilter/Makefile \ | 199 | AC_OUTPUT(Makefile src/common.mk src/lib/Makefile src/fcopy/Makefile src/fnet/Makefile src/firejail/Makefile src/fnetfilter/Makefile \ |
209 | src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/fbuilder/Makefile src/fsec-print/Makefile \ | 200 | src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/fbuilder/Makefile src/fsec-print/Makefile \ |
210 | src/ftee/Makefile src/faudit/Makefile src/fseccomp/Makefile src/fldd/Makefile src/libpostexecseccomp/Makefile src/fsec-optimize/Makefile \ | 201 | src/ftee/Makefile src/faudit/Makefile src/fseccomp/Makefile src/fldd/Makefile src/libpostexecseccomp/Makefile src/fsec-optimize/Makefile \ |
211 | src/profstats/Makefile) | 202 | src/profstats/Makefile src/man/Makefile) |
212 | 203 | ||
213 | echo | 204 | 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" |