diff options
-rwxr-xr-x | configure | 38 | ||||
-rw-r--r-- | configure.ac | 17 |
2 files changed, 27 insertions, 28 deletions
@@ -1,6 +1,6 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh |
2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
3 | # Generated by GNU Autoconf 2.69 for firejail 0.9.64.2. | 3 | # Generated by GNU Autoconf 2.69 for firejail 0.9.64.4. |
4 | # | 4 | # |
5 | # Report bugs to <netblue30@protonmail.com>. | 5 | # Report bugs to <netblue30@protonmail.com>. |
6 | # | 6 | # |
@@ -580,8 +580,8 @@ MAKEFLAGS= | |||
580 | # Identity of this package. | 580 | # Identity of this package. |
581 | PACKAGE_NAME='firejail' | 581 | PACKAGE_NAME='firejail' |
582 | PACKAGE_TARNAME='firejail' | 582 | PACKAGE_TARNAME='firejail' |
583 | PACKAGE_VERSION='0.9.64.2' | 583 | PACKAGE_VERSION='0.9.64.4' |
584 | PACKAGE_STRING='firejail 0.9.64.2' | 584 | PACKAGE_STRING='firejail 0.9.64.4' |
585 | PACKAGE_BUGREPORT='netblue30@protonmail.com' | 585 | PACKAGE_BUGREPORT='netblue30@protonmail.com' |
586 | PACKAGE_URL='https://firejail.wordpress.com' | 586 | PACKAGE_URL='https://firejail.wordpress.com' |
587 | 587 | ||
@@ -711,7 +711,6 @@ enable_option_checking | |||
711 | enable_analyzer | 711 | enable_analyzer |
712 | enable_apparmor | 712 | enable_apparmor |
713 | enable_dbusproxy | 713 | enable_dbusproxy |
714 | enable_overlayfs | ||
715 | enable_usertmpfs | 714 | enable_usertmpfs |
716 | enable_man | 715 | enable_man |
717 | enable_firetunnel | 716 | enable_firetunnel |
@@ -1294,7 +1293,7 @@ if test "$ac_init_help" = "long"; then | |||
1294 | # Omit some internal or obsolete options to make the list less imposing. | 1293 | # Omit some internal or obsolete options to make the list less imposing. |
1295 | # This message is too long to be a string in the A/UX 3.1 sh. | 1294 | # This message is too long to be a string in the A/UX 3.1 sh. |
1296 | cat <<_ACEOF | 1295 | cat <<_ACEOF |
1297 | \`configure' configures firejail 0.9.64.2 to adapt to many kinds of systems. | 1296 | \`configure' configures firejail 0.9.64.4 to adapt to many kinds of systems. |
1298 | 1297 | ||
1299 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1298 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1300 | 1299 | ||
@@ -1356,7 +1355,7 @@ fi | |||
1356 | 1355 | ||
1357 | if test -n "$ac_init_help"; then | 1356 | if test -n "$ac_init_help"; then |
1358 | case $ac_init_help in | 1357 | case $ac_init_help in |
1359 | short | recursive ) echo "Configuration of firejail 0.9.64.2:";; | 1358 | short | recursive ) echo "Configuration of firejail 0.9.64.4:";; |
1360 | esac | 1359 | esac |
1361 | cat <<\_ACEOF | 1360 | cat <<\_ACEOF |
1362 | 1361 | ||
@@ -1367,7 +1366,6 @@ Optional Features: | |||
1367 | --enable-analyzer enable GCC 10 static analyzer | 1366 | --enable-analyzer enable GCC 10 static analyzer |
1368 | --enable-apparmor enable apparmor | 1367 | --enable-apparmor enable apparmor |
1369 | --disable-dbusproxy disable dbus proxy | 1368 | --disable-dbusproxy disable dbus proxy |
1370 | --disable-overlayfs disable overlayfs | ||
1371 | --disable-usertmpfs disable tmpfs as regular user | 1369 | --disable-usertmpfs disable tmpfs as regular user |
1372 | --disable-man disable man pages | 1370 | --disable-man disable man pages |
1373 | --disable-firetunnel disable firetunnel | 1371 | --disable-firetunnel disable firetunnel |
@@ -1473,7 +1471,7 @@ fi | |||
1473 | test -n "$ac_init_help" && exit $ac_status | 1471 | test -n "$ac_init_help" && exit $ac_status |
1474 | if $ac_init_version; then | 1472 | if $ac_init_version; then |
1475 | cat <<\_ACEOF | 1473 | cat <<\_ACEOF |
1476 | firejail configure 0.9.64.2 | 1474 | firejail configure 0.9.64.4 |
1477 | generated by GNU Autoconf 2.69 | 1475 | generated by GNU Autoconf 2.69 |
1478 | 1476 | ||
1479 | Copyright (C) 2012 Free Software Foundation, Inc. | 1477 | Copyright (C) 2012 Free Software Foundation, Inc. |
@@ -1775,7 +1773,7 @@ cat >config.log <<_ACEOF | |||
1775 | This file contains any messages produced by compilers while | 1773 | This file contains any messages produced by compilers while |
1776 | running configure, to aid debugging if configure makes a mistake. | 1774 | running configure, to aid debugging if configure makes a mistake. |
1777 | 1775 | ||
1778 | It was created by firejail $as_me 0.9.64.2, which was | 1776 | It was created by firejail $as_me 0.9.64.4, which was |
1779 | generated by GNU Autoconf 2.69. Invocation command line was | 1777 | generated by GNU Autoconf 2.69. Invocation command line was |
1780 | 1778 | ||
1781 | $ $0 $@ | 1779 | $ $0 $@ |
@@ -3530,18 +3528,16 @@ if test "x$enable_dbusproxy" != "xno"; then : | |||
3530 | 3528 | ||
3531 | fi | 3529 | fi |
3532 | 3530 | ||
3531 | # overlayfs features temporarely disabled pending fixes | ||
3533 | HAVE_OVERLAYFS="" | 3532 | HAVE_OVERLAYFS="" |
3534 | # Check whether --enable-overlayfs was given. | ||
3535 | if test "${enable_overlayfs+set}" = set; then : | ||
3536 | enableval=$enable_overlayfs; | ||
3537 | fi | ||
3538 | |||
3539 | if test "x$enable_overlayfs" != "xno"; then : | ||
3540 | |||
3541 | HAVE_OVERLAYFS="-DHAVE_OVERLAYFS" | ||
3542 | 3533 | ||
3543 | 3534 | # | |
3544 | fi | 3535 | #AC_ARG_ENABLE([overlayfs], |
3536 | # AS_HELP_STRING([--disable-overlayfs], [disable overlayfs])) | ||
3537 | #AS_IF([test "x$enable_overlayfs" != "xno"], [ | ||
3538 | # HAVE_OVERLAYFS="-DHAVE_OVERLAYFS" | ||
3539 | # AC_SUBST(HAVE_OVERLAYFS) | ||
3540 | #]) | ||
3545 | 3541 | ||
3546 | HAVE_USERTMPS="" | 3542 | HAVE_USERTMPS="" |
3547 | # Check whether --enable-usertmpfs was given. | 3543 | # Check whether --enable-usertmpfs was given. |
@@ -4817,7 +4813,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |||
4817 | # report actual input values of CONFIG_FILES etc. instead of their | 4813 | # report actual input values of CONFIG_FILES etc. instead of their |
4818 | # values after options handling. | 4814 | # values after options handling. |
4819 | ac_log=" | 4815 | ac_log=" |
4820 | This file was extended by firejail $as_me 0.9.64.2, which was | 4816 | This file was extended by firejail $as_me 0.9.64.4, which was |
4821 | generated by GNU Autoconf 2.69. Invocation command line was | 4817 | generated by GNU Autoconf 2.69. Invocation command line was |
4822 | 4818 | ||
4823 | CONFIG_FILES = $CONFIG_FILES | 4819 | CONFIG_FILES = $CONFIG_FILES |
@@ -4871,7 +4867,7 @@ _ACEOF | |||
4871 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 4867 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
4872 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 4868 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
4873 | ac_cs_version="\\ | 4869 | ac_cs_version="\\ |
4874 | firejail config.status 0.9.64.2 | 4870 | firejail config.status 0.9.64.4 |
4875 | configured by $0, generated by GNU Autoconf 2.69, | 4871 | configured by $0, generated by GNU Autoconf 2.69, |
4876 | with options \\"\$ac_cs_config\\" | 4872 | with options \\"\$ac_cs_config\\" |
4877 | 4873 | ||
diff --git a/configure.ac b/configure.ac index 8ff8ef6bc..4ab98e682 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -12,7 +12,7 @@ | |||
12 | # | 12 | # |
13 | 13 | ||
14 | AC_PREREQ([2.68]) | 14 | AC_PREREQ([2.68]) |
15 | AC_INIT(firejail, 0.9.64.2, netblue30@protonmail.com, , https://firejail.wordpress.com) | 15 | AC_INIT(firejail, 0.9.64.4, netblue30@protonmail.com, , https://firejail.wordpress.com) |
16 | AC_CONFIG_SRCDIR([src/firejail/main.c]) | 16 | AC_CONFIG_SRCDIR([src/firejail/main.c]) |
17 | 17 | ||
18 | AC_CONFIG_MACRO_DIR([m4]) | 18 | AC_CONFIG_MACRO_DIR([m4]) |
@@ -66,13 +66,16 @@ AS_IF([test "x$enable_dbusproxy" != "xno"], [ | |||
66 | AC_SUBST(HAVE_DBUSPROXY) | 66 | AC_SUBST(HAVE_DBUSPROXY) |
67 | ]) | 67 | ]) |
68 | 68 | ||
69 | # overlayfs features temporarely disabled pending fixes | ||
69 | HAVE_OVERLAYFS="" | 70 | HAVE_OVERLAYFS="" |
70 | AC_ARG_ENABLE([overlayfs], | 71 | AC_SUBST(HAVE_OVERLAYFS) |
71 | AS_HELP_STRING([--disable-overlayfs], [disable overlayfs])) | 72 | # |
72 | AS_IF([test "x$enable_overlayfs" != "xno"], [ | 73 | #AC_ARG_ENABLE([overlayfs], |
73 | HAVE_OVERLAYFS="-DHAVE_OVERLAYFS" | 74 | # AS_HELP_STRING([--disable-overlayfs], [disable overlayfs])) |
74 | AC_SUBST(HAVE_OVERLAYFS) | 75 | #AS_IF([test "x$enable_overlayfs" != "xno"], [ |
75 | ]) | 76 | # HAVE_OVERLAYFS="-DHAVE_OVERLAYFS" |
77 | # AC_SUBST(HAVE_OVERLAYFS) | ||
78 | #]) | ||
76 | 79 | ||
77 | HAVE_USERTMPS="" | 80 | HAVE_USERTMPS="" |
78 | AC_ARG_ENABLE([usertmpfs], | 81 | AC_ARG_ENABLE([usertmpfs], |