diff options
author | 2022-06-13 10:05:06 -0400 | |
---|---|---|
committer | 2022-06-13 10:05:06 -0400 | |
commit | bebf68303ac870eaa6981a7e797fa263ce221ae3 (patch) | |
tree | 71a856de10d3da6464e268b401e1e4d156d30672 | |
parent | more on disable cgroups (diff) | |
download | firejail-bebf68303ac870eaa6981a7e797fa263ce221ae3.tar.gz firejail-bebf68303ac870eaa6981a7e797fa263ce221ae3.tar.zst firejail-bebf68303ac870eaa6981a7e797fa263ce221ae3.zip |
compile time: changed --disable-firetunnel into --enable-firetunnel
-rwxr-xr-x | configure | 12 | ||||
-rw-r--r-- | configure.ac | 4 |
2 files changed, 8 insertions, 8 deletions
@@ -1378,7 +1378,7 @@ Optional Features: | |||
1378 | --disable-output disable --output logging | 1378 | --disable-output disable --output logging |
1379 | --disable-usertmpfs disable tmpfs as regular user | 1379 | --disable-usertmpfs disable tmpfs as regular user |
1380 | --disable-man disable man pages | 1380 | --disable-man disable man pages |
1381 | --disable-firetunnel disable firetunnel | 1381 | --enable-firetunnel enable firetunnel |
1382 | --disable-private-home disable private home feature | 1382 | --disable-private-home disable private home feature |
1383 | --disable-chroot disable chroot | 1383 | --disable-chroot disable chroot |
1384 | --disable-globalcfg if the global config file firejail.config is not | 1384 | --disable-globalcfg if the global config file firejail.config is not |
@@ -3236,8 +3236,8 @@ if test "x$enable_apparmor" = "xyes"; then : | |||
3236 | HAVE_APPARMOR="-DHAVE_APPARMOR" | 3236 | HAVE_APPARMOR="-DHAVE_APPARMOR" |
3237 | 3237 | ||
3238 | pkg_failed=no | 3238 | pkg_failed=no |
3239 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AA" >&5 | 3239 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libapparmor" >&5 |
3240 | $as_echo_n "checking for AA... " >&6; } | 3240 | $as_echo_n "checking for libapparmor... " >&6; } |
3241 | 3241 | ||
3242 | if test -n "$AA_CFLAGS"; then | 3242 | if test -n "$AA_CFLAGS"; then |
3243 | pkg_cv_AA_CFLAGS="$AA_CFLAGS" | 3243 | pkg_cv_AA_CFLAGS="$AA_CFLAGS" |
@@ -3277,7 +3277,7 @@ fi | |||
3277 | 3277 | ||
3278 | 3278 | ||
3279 | if test $pkg_failed = yes; then | 3279 | if test $pkg_failed = yes; then |
3280 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 3280 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3281 | $as_echo "no" >&6; } | 3281 | $as_echo "no" >&6; } |
3282 | 3282 | ||
3283 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 3283 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
@@ -3304,7 +3304,7 @@ Alternatively, you may set the environment variables AA_CFLAGS | |||
3304 | and AA_LIBS to avoid the need to call pkg-config. | 3304 | and AA_LIBS to avoid the need to call pkg-config. |
3305 | See the pkg-config man page for more details." "$LINENO" 5 | 3305 | See the pkg-config man page for more details." "$LINENO" 5 |
3306 | elif test $pkg_failed = untried; then | 3306 | elif test $pkg_failed = untried; then |
3307 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 3307 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3308 | $as_echo "no" >&6; } | 3308 | $as_echo "no" >&6; } |
3309 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 3309 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3310 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 3310 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
@@ -3455,7 +3455,7 @@ if test "${enable_firetunnel+set}" = set; then : | |||
3455 | enableval=$enable_firetunnel; | 3455 | enableval=$enable_firetunnel; |
3456 | fi | 3456 | fi |
3457 | 3457 | ||
3458 | if test "x$enable_firetunnel" != "xno"; then : | 3458 | if test "x$enable_firetunnel" = "xyes"; then : |
3459 | 3459 | ||
3460 | HAVE_FIRETUNNEL="-DHAVE_FIRETUNNEL" | 3460 | HAVE_FIRETUNNEL="-DHAVE_FIRETUNNEL" |
3461 | 3461 | ||
diff --git a/configure.ac b/configure.ac index cb20589cb..b52df6376 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -131,8 +131,8 @@ AS_IF([test "x$enable_man" != "xno"], [ | |||
131 | HAVE_FIRETUNNEL="" | 131 | HAVE_FIRETUNNEL="" |
132 | AC_SUBST([HAVE_FIRETUNNEL]) | 132 | AC_SUBST([HAVE_FIRETUNNEL]) |
133 | AC_ARG_ENABLE([firetunnel], | 133 | AC_ARG_ENABLE([firetunnel], |
134 | [AS_HELP_STRING([--disable-firetunnel], [disable firetunnel])]) | 134 | [AS_HELP_STRING([--enable-firetunnel], [enable firetunnel])]) |
135 | AS_IF([test "x$enable_firetunnel" != "xno"], [ | 135 | AS_IF([test "x$enable_firetunnel" = "xyes"], [ |
136 | HAVE_FIRETUNNEL="-DHAVE_FIRETUNNEL" | 136 | HAVE_FIRETUNNEL="-DHAVE_FIRETUNNEL" |
137 | ]) | 137 | ]) |
138 | 138 | ||