diff options
author | netblue30 <netblue30@yahoo.com> | 2019-06-24 09:22:57 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2019-06-24 09:22:57 -0400 |
commit | 7a181426c5f7968bbd0c60d628a2e546813aaecf (patch) | |
tree | 89bf386b45af4aafd5e01e5d6d2d128543b6ff83 /configure | |
parent | run cppcheck in gitlab-ci (diff) | |
download | firejail-7a181426c5f7968bbd0c60d628a2e546813aaecf.tar.gz firejail-7a181426c5f7968bbd0c60d628a2e546813aaecf.tar.zst firejail-7a181426c5f7968bbd0c60d628a2e546813aaecf.zip |
disable firetunnel at config time (#2793)
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 17 |
1 files changed, 17 insertions, 0 deletions
@@ -642,6 +642,7 @@ HAVE_GLOBALCFG | |||
642 | HAVE_CHROOT | 642 | HAVE_CHROOT |
643 | HAVE_SECCOMP | 643 | HAVE_SECCOMP |
644 | HAVE_PRIVATE_HOME | 644 | HAVE_PRIVATE_HOME |
645 | HAVE_FIRETUNNEL | ||
645 | HAVE_OVERLAYFS | 646 | HAVE_OVERLAYFS |
646 | EXTRA_LDFLAGS | 647 | EXTRA_LDFLAGS |
647 | EXTRA_CFLAGS | 648 | EXTRA_CFLAGS |
@@ -706,6 +707,7 @@ ac_user_opts=' | |||
706 | enable_option_checking | 707 | enable_option_checking |
707 | enable_apparmor | 708 | enable_apparmor |
708 | enable_overlayfs | 709 | enable_overlayfs |
710 | enable_firetunnel | ||
709 | enable_private_home | 711 | enable_private_home |
710 | enable_seccomp | 712 | enable_seccomp |
711 | enable_chroot | 713 | enable_chroot |
@@ -1357,6 +1359,7 @@ Optional Features: | |||
1357 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] | 1359 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] |
1358 | --enable-apparmor enable apparmor | 1360 | --enable-apparmor enable apparmor |
1359 | --disable-overlayfs disable overlayfs | 1361 | --disable-overlayfs disable overlayfs |
1362 | --disable-firetunnel disable firetunnel | ||
1360 | --disable-private-home disable private home feature | 1363 | --disable-private-home disable private home feature |
1361 | --disable-seccomp disable seccomp | 1364 | --disable-seccomp disable seccomp |
1362 | --disable-chroot disable chroot | 1365 | --disable-chroot disable chroot |
@@ -3433,6 +3436,19 @@ if test "x$enable_overlayfs" != "xno"; then : | |||
3433 | 3436 | ||
3434 | fi | 3437 | fi |
3435 | 3438 | ||
3439 | HAVE_FIRETUNNEL="" | ||
3440 | # Check whether --enable-firetunnel was given. | ||
3441 | if test "${enable_firetunnel+set}" = set; then : | ||
3442 | enableval=$enable_firetunnel; | ||
3443 | fi | ||
3444 | |||
3445 | if test "x$enable_firetunnel" != "xno"; then : | ||
3446 | |||
3447 | HAVE_FIRETUNNEL="-DHAVE_FIRETUNNEL" | ||
3448 | |||
3449 | |||
3450 | fi | ||
3451 | |||
3436 | HAVE_PRIVATEHOME="" | 3452 | HAVE_PRIVATEHOME="" |
3437 | # Check whether --enable-private-home was given. | 3453 | # Check whether --enable-private-home was given. |
3438 | if test "${enable_private_home+set}" = set; then : | 3454 | if test "${enable_private_home+set}" = set; then : |
@@ -5280,6 +5296,7 @@ echo " whitelisting: $HAVE_WHITELIST" | |||
5280 | echo " private home support: $HAVE_PRIVATE_HOME" | 5296 | echo " private home support: $HAVE_PRIVATE_HOME" |
5281 | echo " file transfer support: $HAVE_FILE_TRANSFER" | 5297 | echo " file transfer support: $HAVE_FILE_TRANSFER" |
5282 | echo " overlayfs support: $HAVE_OVERLAYFS" | 5298 | echo " overlayfs support: $HAVE_OVERLAYFS" |
5299 | echo " firetunnel support: $HAVE_FIRETUNNEL" | ||
5283 | echo " busybox workaround: $BUSYBOX_WORKAROUND" | 5300 | echo " busybox workaround: $BUSYBOX_WORKAROUND" |
5284 | echo " Spectre compiler patch: $HAVE_SPECTRE" | 5301 | echo " Spectre compiler patch: $HAVE_SPECTRE" |
5285 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" | 5302 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" |