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 @@
+#
+# Note:
+#
+# If for any reason autoconf fails, run "autoreconf -i --install " and try again.
+# This is how the error looks like on Arch Linux:
+#        ./configure: line 3064: syntax error near unexpected token `newline'
+#        ./configure: line 3064: `AX_CHECK_COMPILE_FLAG('
+#
+# We rely solely on autoconf, without automake. Apparently, in this case
+# the macros from m4 directory are not picked up by default by automake.
+# "autoreconf -i --install" seems to fix the problem.
+#
+
 AC_PREREQ([2.68])
 AC_INIT(firejail, 0.9.61, netblue30@yahoo.com, , https://firejail.wordpress.com)
 AC_CONFIG_SRCDIR([src/firejail/main.c])
@@ -17,6 +30,14 @@ AX_CHECK_COMPILE_FLAG(
     [-mretpoline],
     [HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -mretpoline"]
 )
+AX_CHECK_COMPILE_FLAG(
+    [-fstack-clash-protection],
+    [HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -fstack-clash-protection"]
+)
+AX_CHECK_COMPILE_FLAG(
+    [-fstack-protector-strong],
+    [HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -fstack-protector-strong"]
+)
 
 HAVE_APPARMOR=""
 AC_ARG_ENABLE([apparmor],
@@ -39,6 +60,14 @@ AS_IF([test "x$enable_overlayfs" != "xno"], [
         AC_SUBST(HAVE_OVERLAYFS)
 ])
 
+HAVE_FIRETUNNEL=""
+AC_ARG_ENABLE([firetunnel],
+    AS_HELP_STRING([--disable-firetunnel], [disable firetunnel]))
+AS_IF([test "x$enable_firetunnel" != "xno"], [
+        HAVE_FIRETUNNEL="-DHAVE_FIRETUNNEL"
+        AC_SUBST(HAVE_FIRETUNNEL)
+])
+
 HAVE_PRIVATEHOME=""
 AC_ARG_ENABLE([private-home],
     AS_HELP_STRING([--disable-private-home], [disable private home feature]))
@@ -186,6 +215,7 @@ echo "   whitelisting: $HAVE_WHITELIST"
 echo "   private home support: $HAVE_PRIVATE_HOME"
 echo "   file transfer support: $HAVE_FILE_TRANSFER"
 echo "   overlayfs support: $HAVE_OVERLAYFS"
+echo "   firetunnel support: $HAVE_FIRETUNNEL"
 echo "   busybox workaround: $BUSYBOX_WORKAROUND"
 echo "   Spectre compiler patch: $HAVE_SPECTRE"
 echo "   EXTRA_LDFLAGS: $EXTRA_LDFLAGS"