aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2019-06-24 09:22:57 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2019-06-24 09:22:57 -0400
commit7a181426c5f7968bbd0c60d628a2e546813aaecf (patch)
tree89bf386b45af4aafd5e01e5d6d2d128543b6ff83 /configure.ac
parentrun cppcheck in gitlab-ci (diff)
downloadfirejail-7a181426c5f7968bbd0c60d628a2e546813aaecf.tar.gz
firejail-7a181426c5f7968bbd0c60d628a2e546813aaecf.tar.zst
firejail-7a181426c5f7968bbd0c60d628a2e546813aaecf.zip
disable firetunnel at config time (#2793)
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac18
1 files changed, 18 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index c3ca7d912..675c8fd65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,12 @@
1#
2# Note:
3#
4# If for any reason autoconf fails, run "autoreconf -i --install " and try again.
5# We rely soley on autoconf, without automake. Apparently, in this case
6# the macros from m4 directory are not picked up by default by automake.
7# "autoreconf -i --install" seems to fix the problem.
8#
9
1AC_PREREQ([2.68]) 10AC_PREREQ([2.68])
2AC_INIT(firejail, 0.9.61, netblue30@yahoo.com, , https://firejail.wordpress.com) 11AC_INIT(firejail, 0.9.61, netblue30@yahoo.com, , https://firejail.wordpress.com)
3AC_CONFIG_SRCDIR([src/firejail/main.c]) 12AC_CONFIG_SRCDIR([src/firejail/main.c])
@@ -39,6 +48,14 @@ AS_IF([test "x$enable_overlayfs" != "xno"], [
39 AC_SUBST(HAVE_OVERLAYFS) 48 AC_SUBST(HAVE_OVERLAYFS)
40]) 49])
41 50
51HAVE_FIRETUNNEL=""
52AC_ARG_ENABLE([firetunnel],
53 AS_HELP_STRING([--disable-firetunnel], [disable firetunnel]))
54AS_IF([test "x$enable_firetunnel" != "xno"], [
55 HAVE_FIRETUNNEL="-DHAVE_FIRETUNNEL"
56 AC_SUBST(HAVE_FIRETUNNEL)
57])
58
42HAVE_PRIVATEHOME="" 59HAVE_PRIVATEHOME=""
43AC_ARG_ENABLE([private-home], 60AC_ARG_ENABLE([private-home],
44 AS_HELP_STRING([--disable-private-home], [disable private home feature])) 61 AS_HELP_STRING([--disable-private-home], [disable private home feature]))
@@ -186,6 +203,7 @@ echo " whitelisting: $HAVE_WHITELIST"
186echo " private home support: $HAVE_PRIVATE_HOME" 203echo " private home support: $HAVE_PRIVATE_HOME"
187echo " file transfer support: $HAVE_FILE_TRANSFER" 204echo " file transfer support: $HAVE_FILE_TRANSFER"
188echo " overlayfs support: $HAVE_OVERLAYFS" 205echo " overlayfs support: $HAVE_OVERLAYFS"
206echo " firetunnel support: $HAVE_FIRETUNNEL"
189echo " busybox workaround: $BUSYBOX_WORKAROUND" 207echo " busybox workaround: $BUSYBOX_WORKAROUND"
190echo " Spectre compiler patch: $HAVE_SPECTRE" 208echo " Spectre compiler patch: $HAVE_SPECTRE"
191echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" 209echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS"