diff options
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 25 |
1 files changed, 21 insertions, 4 deletions
@@ -644,6 +644,7 @@ HAVE_PRIVATE_HOME | |||
644 | HAVE_FIRETUNNEL | 644 | HAVE_FIRETUNNEL |
645 | HAVE_GAWK | 645 | HAVE_GAWK |
646 | HAVE_MAN | 646 | HAVE_MAN |
647 | HAVE_USERTMPFS | ||
647 | HAVE_OVERLAYFS | 648 | HAVE_OVERLAYFS |
648 | HAVE_DBUSPROXY | 649 | HAVE_DBUSPROXY |
649 | EXTRA_LDFLAGS | 650 | EXTRA_LDFLAGS |
@@ -711,6 +712,7 @@ enable_analyzer | |||
711 | enable_apparmor | 712 | enable_apparmor |
712 | enable_dbusproxy | 713 | enable_dbusproxy |
713 | enable_overlayfs | 714 | enable_overlayfs |
715 | enable_usertmpfs | ||
714 | enable_man | 716 | enable_man |
715 | enable_firetunnel | 717 | enable_firetunnel |
716 | enable_private_home | 718 | enable_private_home |
@@ -1366,6 +1368,7 @@ Optional Features: | |||
1366 | --enable-apparmor enable apparmor | 1368 | --enable-apparmor enable apparmor |
1367 | --disable-dbusproxy disable dbus proxy | 1369 | --disable-dbusproxy disable dbus proxy |
1368 | --disable-overlayfs disable overlayfs | 1370 | --disable-overlayfs disable overlayfs |
1371 | --disable-usertmpfs disable tmpfs as regular user | ||
1369 | --disable-man disable man pages | 1372 | --disable-man disable man pages |
1370 | --disable-firetunnel disable firetunnel | 1373 | --disable-firetunnel disable firetunnel |
1371 | --disable-private-home disable private home feature | 1374 | --disable-private-home disable private home feature |
@@ -3417,8 +3420,8 @@ if test "x$enable_apparmor" = "xyes"; then : | |||
3417 | HAVE_APPARMOR="-DHAVE_APPARMOR" | 3420 | HAVE_APPARMOR="-DHAVE_APPARMOR" |
3418 | 3421 | ||
3419 | pkg_failed=no | 3422 | pkg_failed=no |
3420 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libapparmor" >&5 | 3423 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AA" >&5 |
3421 | $as_echo_n "checking for libapparmor... " >&6; } | 3424 | $as_echo_n "checking for AA... " >&6; } |
3422 | 3425 | ||
3423 | if test -n "$AA_CFLAGS"; then | 3426 | if test -n "$AA_CFLAGS"; then |
3424 | pkg_cv_AA_CFLAGS="$AA_CFLAGS" | 3427 | pkg_cv_AA_CFLAGS="$AA_CFLAGS" |
@@ -3458,7 +3461,7 @@ fi | |||
3458 | 3461 | ||
3459 | 3462 | ||
3460 | if test $pkg_failed = yes; then | 3463 | if test $pkg_failed = yes; then |
3461 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 3464 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3462 | $as_echo "no" >&6; } | 3465 | $as_echo "no" >&6; } |
3463 | 3466 | ||
3464 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 3467 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
@@ -3485,7 +3488,7 @@ Alternatively, you may set the environment variables AA_CFLAGS | |||
3485 | and AA_LIBS to avoid the need to call pkg-config. | 3488 | and AA_LIBS to avoid the need to call pkg-config. |
3486 | See the pkg-config man page for more details." "$LINENO" 5 | 3489 | See the pkg-config man page for more details." "$LINENO" 5 |
3487 | elif test $pkg_failed = untried; then | 3490 | elif test $pkg_failed = untried; then |
3488 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 3491 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3489 | $as_echo "no" >&6; } | 3492 | $as_echo "no" >&6; } |
3490 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 3493 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3491 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 3494 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
@@ -3540,6 +3543,19 @@ if test "x$enable_overlayfs" != "xno"; then : | |||
3540 | 3543 | ||
3541 | fi | 3544 | fi |
3542 | 3545 | ||
3546 | HAVE_USERTMPS="" | ||
3547 | # Check whether --enable-usertmpfs was given. | ||
3548 | if test "${enable_usertmpfs+set}" = set; then : | ||
3549 | enableval=$enable_usertmpfs; | ||
3550 | fi | ||
3551 | |||
3552 | if test "x$enable_usertmpfs" != "xno"; then : | ||
3553 | |||
3554 | HAVE_USERTMPFS="-DHAVE_USERTMPFS" | ||
3555 | |||
3556 | |||
3557 | fi | ||
3558 | |||
3543 | HAVE_MAN="no" | 3559 | HAVE_MAN="no" |
3544 | # Check whether --enable-man was given. | 3560 | # Check whether --enable-man was given. |
3545 | if test "${enable_man+set}" = set; then : | 3561 | if test "${enable_man+set}" = set; then : |
@@ -5464,6 +5480,7 @@ echo " private home support: $HAVE_PRIVATE_HOME" | |||
5464 | echo " file transfer support: $HAVE_FILE_TRANSFER" | 5480 | echo " file transfer support: $HAVE_FILE_TRANSFER" |
5465 | echo " overlayfs support: $HAVE_OVERLAYFS" | 5481 | echo " overlayfs support: $HAVE_OVERLAYFS" |
5466 | echo " DBUS proxy support: $HAVE_DBUSPROXY" | 5482 | echo " DBUS proxy support: $HAVE_DBUSPROXY" |
5483 | echo " allow tmpfs as regular user: $HAVE_USERTMPFS" | ||
5467 | echo " Manpage support: $HAVE_MAN" | 5484 | echo " Manpage support: $HAVE_MAN" |
5468 | echo " firetunnel support: $HAVE_FIRETUNNEL" | 5485 | echo " firetunnel support: $HAVE_FIRETUNNEL" |
5469 | echo " busybox workaround: $BUSYBOX_WORKAROUND" | 5486 | echo " busybox workaround: $BUSYBOX_WORKAROUND" |