diff options
author | smitsohu <smitsohu@gmail.com> | 2019-06-28 15:59:33 +0200 |
---|---|---|
committer | smitsohu <smitsohu@gmail.com> | 2019-06-28 15:59:33 +0200 |
commit | 9ed832429026b7814802da9d389e19051907c925 (patch) | |
tree | 0d2af7c0b8536d27462db766ed70c5f742b153d6 /configure.ac | |
parent | simplify octal esc conversion, minor adjustments (diff) | |
parent | Add fonts to private-etc in udiskie profile (diff) | |
download | firejail-9ed832429026b7814802da9d389e19051907c925.tar.gz firejail-9ed832429026b7814802da9d389e19051907c925.tar.zst firejail-9ed832429026b7814802da9d389e19051907c925.zip |
Merge branch 'master' of https://github.com/netblue30/firejail
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index c3ca7d912..27dcb39c5 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,3 +1,16 @@ | |||
1 | # | ||
2 | # Note: | ||
3 | # | ||
4 | # If for any reason autoconf fails, run "autoreconf -i --install " and try again. | ||
5 | # This is how the error looks like on Arch Linux: | ||
6 | # ./configure: line 3064: syntax error near unexpected token `newline' | ||
7 | # ./configure: line 3064: `AX_CHECK_COMPILE_FLAG(' | ||
8 | # | ||
9 | # We rely solely on autoconf, without automake. Apparently, in this case | ||
10 | # the macros from m4 directory are not picked up by default by automake. | ||
11 | # "autoreconf -i --install" seems to fix the problem. | ||
12 | # | ||
13 | |||
1 | AC_PREREQ([2.68]) | 14 | AC_PREREQ([2.68]) |
2 | AC_INIT(firejail, 0.9.61, netblue30@yahoo.com, , https://firejail.wordpress.com) | 15 | AC_INIT(firejail, 0.9.61, netblue30@yahoo.com, , https://firejail.wordpress.com) |
3 | AC_CONFIG_SRCDIR([src/firejail/main.c]) | 16 | AC_CONFIG_SRCDIR([src/firejail/main.c]) |
@@ -17,6 +30,14 @@ AX_CHECK_COMPILE_FLAG( | |||
17 | [-mretpoline], | 30 | [-mretpoline], |
18 | [HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -mretpoline"] | 31 | [HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -mretpoline"] |
19 | ) | 32 | ) |
33 | AX_CHECK_COMPILE_FLAG( | ||
34 | [-fstack-clash-protection], | ||
35 | [HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -fstack-clash-protection"] | ||
36 | ) | ||
37 | AX_CHECK_COMPILE_FLAG( | ||
38 | [-fstack-protector-strong], | ||
39 | [HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -fstack-protector-strong"] | ||
40 | ) | ||
20 | 41 | ||
21 | HAVE_APPARMOR="" | 42 | HAVE_APPARMOR="" |
22 | AC_ARG_ENABLE([apparmor], | 43 | AC_ARG_ENABLE([apparmor], |
@@ -39,6 +60,14 @@ AS_IF([test "x$enable_overlayfs" != "xno"], [ | |||
39 | AC_SUBST(HAVE_OVERLAYFS) | 60 | AC_SUBST(HAVE_OVERLAYFS) |
40 | ]) | 61 | ]) |
41 | 62 | ||
63 | HAVE_FIRETUNNEL="" | ||
64 | AC_ARG_ENABLE([firetunnel], | ||
65 | AS_HELP_STRING([--disable-firetunnel], [disable firetunnel])) | ||
66 | AS_IF([test "x$enable_firetunnel" != "xno"], [ | ||
67 | HAVE_FIRETUNNEL="-DHAVE_FIRETUNNEL" | ||
68 | AC_SUBST(HAVE_FIRETUNNEL) | ||
69 | ]) | ||
70 | |||
42 | HAVE_PRIVATEHOME="" | 71 | HAVE_PRIVATEHOME="" |
43 | AC_ARG_ENABLE([private-home], | 72 | AC_ARG_ENABLE([private-home], |
44 | AS_HELP_STRING([--disable-private-home], [disable private home feature])) | 73 | AS_HELP_STRING([--disable-private-home], [disable private home feature])) |
@@ -186,6 +215,7 @@ echo " whitelisting: $HAVE_WHITELIST" | |||
186 | echo " private home support: $HAVE_PRIVATE_HOME" | 215 | echo " private home support: $HAVE_PRIVATE_HOME" |
187 | echo " file transfer support: $HAVE_FILE_TRANSFER" | 216 | echo " file transfer support: $HAVE_FILE_TRANSFER" |
188 | echo " overlayfs support: $HAVE_OVERLAYFS" | 217 | echo " overlayfs support: $HAVE_OVERLAYFS" |
218 | echo " firetunnel support: $HAVE_FIRETUNNEL" | ||
189 | echo " busybox workaround: $BUSYBOX_WORKAROUND" | 219 | echo " busybox workaround: $BUSYBOX_WORKAROUND" |
190 | echo " Spectre compiler patch: $HAVE_SPECTRE" | 220 | echo " Spectre compiler patch: $HAVE_SPECTRE" |
191 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" | 221 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" |