diff options
-rw-r--r-- | Makefile.in | 2 | ||||
-rwxr-xr-x | configure | 100 | ||||
-rw-r--r-- | configure.ac | 159 | ||||
-rw-r--r-- | src/common.mk.in | 6 |
4 files changed, 99 insertions, 168 deletions
diff --git a/Makefile.in b/Makefile.in index ddc63c1af..1044f1ade 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -105,7 +105,7 @@ realinstall: | |||
105 | # firejail executable | 105 | # firejail executable |
106 | install -m 0755 -d $(DESTDIR)$(bindir) | 106 | install -m 0755 -d $(DESTDIR)$(bindir) |
107 | install -m 0755 src/firejail/firejail $(DESTDIR)$(bindir) | 107 | install -m 0755 src/firejail/firejail $(DESTDIR)$(bindir) |
108 | ifeq ($(HAVE_SUID),yes) | 108 | ifeq ($(HAVE_SUID),-DHAVE_SUID) |
109 | chmod u+s $(DESTDIR)$(bindir)/firejail | 109 | chmod u+s $(DESTDIR)$(bindir)/firejail |
110 | endif | 110 | endif |
111 | # firemon executable | 111 | # firemon executable |
@@ -651,12 +651,12 @@ HAVE_DBUSPROXY | |||
651 | EXTRA_LDFLAGS | 651 | EXTRA_LDFLAGS |
652 | EXTRA_CFLAGS | 652 | EXTRA_CFLAGS |
653 | HAVE_SELINUX | 653 | HAVE_SELINUX |
654 | HAVE_APPARMOR | ||
655 | AA_LIBS | 654 | AA_LIBS |
656 | AA_CFLAGS | 655 | AA_CFLAGS |
657 | PKG_CONFIG_LIBDIR | 656 | PKG_CONFIG_LIBDIR |
658 | PKG_CONFIG_PATH | 657 | PKG_CONFIG_PATH |
659 | PKG_CONFIG | 658 | PKG_CONFIG |
659 | HAVE_APPARMOR | ||
660 | RANLIB | 660 | RANLIB |
661 | INSTALL_DATA | 661 | INSTALL_DATA |
662 | INSTALL_SCRIPT | 662 | INSTALL_SCRIPT |
@@ -3303,6 +3303,7 @@ fi | |||
3303 | fi | 3303 | fi |
3304 | 3304 | ||
3305 | HAVE_APPARMOR="" | 3305 | HAVE_APPARMOR="" |
3306 | |||
3306 | # Check whether --enable-apparmor was given. | 3307 | # Check whether --enable-apparmor was given. |
3307 | if test "${enable_apparmor+set}" = set; then : | 3308 | if test "${enable_apparmor+set}" = set; then : |
3308 | enableval=$enable_apparmor; | 3309 | enableval=$enable_apparmor; |
@@ -3523,10 +3524,10 @@ $as_echo "yes" >&6; } | |||
3523 | EXTRA_CFLAGS="$EXTRA_CFLAGS $AA_CFLAGS" && EXTRA_LDFLAGS="$EXTRA_LDFLAGS $AA_LIBS" | 3524 | EXTRA_CFLAGS="$EXTRA_CFLAGS $AA_CFLAGS" && EXTRA_LDFLAGS="$EXTRA_LDFLAGS $AA_LIBS" |
3524 | fi | 3525 | fi |
3525 | 3526 | ||
3526 | |||
3527 | fi | 3527 | fi |
3528 | 3528 | ||
3529 | HAVE_SELINUX="" | 3529 | HAVE_SELINUX="" |
3530 | |||
3530 | # Check whether --enable-selinux was given. | 3531 | # Check whether --enable-selinux was given. |
3531 | if test "${enable_selinux+set}" = set; then : | 3532 | if test "${enable_selinux+set}" = set; then : |
3532 | enableval=$enable_selinux; | 3533 | enableval=$enable_selinux; |
@@ -3535,8 +3536,7 @@ fi | |||
3535 | if test "x$enable_selinux" = "xyes"; then : | 3536 | if test "x$enable_selinux" = "xyes"; then : |
3536 | 3537 | ||
3537 | HAVE_SELINUX="-DHAVE_SELINUX" | 3538 | HAVE_SELINUX="-DHAVE_SELINUX" |
3538 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lselinux " | 3539 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lselinux" |
3539 | |||
3540 | 3540 | ||
3541 | fi | 3541 | fi |
3542 | 3542 | ||
@@ -3545,6 +3545,7 @@ fi | |||
3545 | 3545 | ||
3546 | 3546 | ||
3547 | HAVE_DBUSPROXY="" | 3547 | HAVE_DBUSPROXY="" |
3548 | |||
3548 | # Check whether --enable-dbusproxy was given. | 3549 | # Check whether --enable-dbusproxy was given. |
3549 | if test "${enable_dbusproxy+set}" = set; then : | 3550 | if test "${enable_dbusproxy+set}" = set; then : |
3550 | enableval=$enable_dbusproxy; | 3551 | enableval=$enable_dbusproxy; |
@@ -3554,21 +3555,19 @@ if test "x$enable_dbusproxy" != "xno"; then : | |||
3554 | 3555 | ||
3555 | HAVE_DBUSPROXY="-DHAVE_DBUSPROXY" | 3556 | HAVE_DBUSPROXY="-DHAVE_DBUSPROXY" |
3556 | 3557 | ||
3557 | |||
3558 | fi | 3558 | fi |
3559 | 3559 | ||
3560 | # overlayfs features temporarily disabled pending fixes | 3560 | # overlayfs features temporarily disabled pending fixes |
3561 | HAVE_OVERLAYFS="" | 3561 | HAVE_OVERLAYFS="" |
3562 | 3562 | ||
3563 | # | ||
3564 | #AC_ARG_ENABLE([overlayfs], | 3563 | #AC_ARG_ENABLE([overlayfs], |
3565 | # AS_HELP_STRING([--disable-overlayfs], [disable overlayfs])) | 3564 | # [AS_HELP_STRING([--disable-overlayfs], [disable overlayfs])]) |
3566 | #AS_IF([test "x$enable_overlayfs" != "xno"], [ | 3565 | #AS_IF([test "x$enable_overlayfs" != "xno"], [ |
3567 | # HAVE_OVERLAYFS="-DHAVE_OVERLAYFS" | 3566 | # HAVE_OVERLAYFS="-DHAVE_OVERLAYFS" |
3568 | # AC_SUBST(HAVE_OVERLAYFS) | ||
3569 | #]) | 3567 | #]) |
3570 | 3568 | ||
3571 | HAVE_OUTPUT="" | 3569 | HAVE_OUTPUT="" |
3570 | |||
3572 | # Check whether --enable-output was given. | 3571 | # Check whether --enable-output was given. |
3573 | if test "${enable_output+set}" = set; then : | 3572 | if test "${enable_output+set}" = set; then : |
3574 | enableval=$enable_output; | 3573 | enableval=$enable_output; |
@@ -3578,10 +3577,10 @@ if test "x$enable_output" != "xno"; then : | |||
3578 | 3577 | ||
3579 | HAVE_OUTPUT="-DHAVE_OUTPUT" | 3578 | HAVE_OUTPUT="-DHAVE_OUTPUT" |
3580 | 3579 | ||
3581 | |||
3582 | fi | 3580 | fi |
3583 | 3581 | ||
3584 | HAVE_USERTMPFS="" | 3582 | HAVE_USERTMPFS="" |
3583 | |||
3585 | # Check whether --enable-usertmpfs was given. | 3584 | # Check whether --enable-usertmpfs was given. |
3586 | if test "${enable_usertmpfs+set}" = set; then : | 3585 | if test "${enable_usertmpfs+set}" = set; then : |
3587 | enableval=$enable_usertmpfs; | 3586 | enableval=$enable_usertmpfs; |
@@ -3591,10 +3590,10 @@ if test "x$enable_usertmpfs" != "xno"; then : | |||
3591 | 3590 | ||
3592 | HAVE_USERTMPFS="-DHAVE_USERTMPFS" | 3591 | HAVE_USERTMPFS="-DHAVE_USERTMPFS" |
3593 | 3592 | ||
3594 | |||
3595 | fi | 3593 | fi |
3596 | 3594 | ||
3597 | HAVE_MAN="no" | 3595 | HAVE_MAN="no" |
3596 | |||
3598 | # Check whether --enable-man was given. | 3597 | # Check whether --enable-man was given. |
3599 | if test "${enable_man+set}" = set; then : | 3598 | if test "${enable_man+set}" = set; then : |
3600 | enableval=$enable_man; | 3599 | enableval=$enable_man; |
@@ -3603,7 +3602,6 @@ fi | |||
3603 | if test "x$enable_man" != "xno"; then : | 3602 | if test "x$enable_man" != "xno"; then : |
3604 | 3603 | ||
3605 | HAVE_MAN="-DHAVE_MAN" | 3604 | HAVE_MAN="-DHAVE_MAN" |
3606 | |||
3607 | # Extract the first word of "gawk", so it can be a program name with args. | 3605 | # Extract the first word of "gawk", so it can be a program name with args. |
3608 | set dummy gawk; ac_word=$2 | 3606 | set dummy gawk; ac_word=$2 |
3609 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | 3607 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
@@ -3643,12 +3641,13 @@ fi | |||
3643 | 3641 | ||
3644 | 3642 | ||
3645 | if test "x$HAVE_GAWK" != "xyes"; then : | 3643 | if test "x$HAVE_GAWK" != "xyes"; then : |
3646 | as_fn_error $? "\"*** gawk not found ***\"" "$LINENO" 5 | 3644 | as_fn_error $? "*** gawk not found ***" "$LINENO" 5 |
3647 | fi | 3645 | fi |
3648 | 3646 | ||
3649 | fi | 3647 | fi |
3650 | 3648 | ||
3651 | HAVE_FIRETUNNEL="" | 3649 | HAVE_FIRETUNNEL="" |
3650 | |||
3652 | # Check whether --enable-firetunnel was given. | 3651 | # Check whether --enable-firetunnel was given. |
3653 | if test "${enable_firetunnel+set}" = set; then : | 3652 | if test "${enable_firetunnel+set}" = set; then : |
3654 | enableval=$enable_firetunnel; | 3653 | enableval=$enable_firetunnel; |
@@ -3658,10 +3657,10 @@ if test "x$enable_firetunnel" != "xno"; then : | |||
3658 | 3657 | ||
3659 | HAVE_FIRETUNNEL="-DHAVE_FIRETUNNEL" | 3658 | HAVE_FIRETUNNEL="-DHAVE_FIRETUNNEL" |
3660 | 3659 | ||
3661 | |||
3662 | fi | 3660 | fi |
3663 | 3661 | ||
3664 | HAVE_PRIVATEHOME="" | 3662 | HAVE_PRIVATEHOME="" |
3663 | |||
3665 | # Check whether --enable-private-home was given. | 3664 | # Check whether --enable-private-home was given. |
3666 | if test "${enable_private_home+set}" = set; then : | 3665 | if test "${enable_private_home+set}" = set; then : |
3667 | enableval=$enable_private_home; | 3666 | enableval=$enable_private_home; |
@@ -3671,10 +3670,10 @@ if test "x$enable_private_home" != "xno"; then : | |||
3671 | 3670 | ||
3672 | HAVE_PRIVATE_HOME="-DHAVE_PRIVATE_HOME" | 3671 | HAVE_PRIVATE_HOME="-DHAVE_PRIVATE_HOME" |
3673 | 3672 | ||
3674 | |||
3675 | fi | 3673 | fi |
3676 | 3674 | ||
3677 | HAVE_CHROOT="" | 3675 | HAVE_CHROOT="" |
3676 | |||
3678 | # Check whether --enable-chroot was given. | 3677 | # Check whether --enable-chroot was given. |
3679 | if test "${enable_chroot+set}" = set; then : | 3678 | if test "${enable_chroot+set}" = set; then : |
3680 | enableval=$enable_chroot; | 3679 | enableval=$enable_chroot; |
@@ -3684,10 +3683,10 @@ if test "x$enable_chroot" != "xno"; then : | |||
3684 | 3683 | ||
3685 | HAVE_CHROOT="-DHAVE_CHROOT" | 3684 | HAVE_CHROOT="-DHAVE_CHROOT" |
3686 | 3685 | ||
3687 | |||
3688 | fi | 3686 | fi |
3689 | 3687 | ||
3690 | HAVE_GLOBALCFG="" | 3688 | HAVE_GLOBALCFG="" |
3689 | |||
3691 | # Check whether --enable-globalcfg was given. | 3690 | # Check whether --enable-globalcfg was given. |
3692 | if test "${enable_globalcfg+set}" = set; then : | 3691 | if test "${enable_globalcfg+set}" = set; then : |
3693 | enableval=$enable_globalcfg; | 3692 | enableval=$enable_globalcfg; |
@@ -3697,10 +3696,10 @@ if test "x$enable_globalcfg" != "xno"; then : | |||
3697 | 3696 | ||
3698 | HAVE_GLOBALCFG="-DHAVE_GLOBALCFG" | 3697 | HAVE_GLOBALCFG="-DHAVE_GLOBALCFG" |
3699 | 3698 | ||
3700 | |||
3701 | fi | 3699 | fi |
3702 | 3700 | ||
3703 | HAVE_NETWORK="" | 3701 | HAVE_NETWORK="" |
3702 | |||
3704 | # Check whether --enable-network was given. | 3703 | # Check whether --enable-network was given. |
3705 | if test "${enable_network+set}" = set; then : | 3704 | if test "${enable_network+set}" = set; then : |
3706 | enableval=$enable_network; | 3705 | enableval=$enable_network; |
@@ -3710,10 +3709,10 @@ if test "x$enable_network" != "xno"; then : | |||
3710 | 3709 | ||
3711 | HAVE_NETWORK="-DHAVE_NETWORK" | 3710 | HAVE_NETWORK="-DHAVE_NETWORK" |
3712 | 3711 | ||
3713 | |||
3714 | fi | 3712 | fi |
3715 | 3713 | ||
3716 | HAVE_USERNS="" | 3714 | HAVE_USERNS="" |
3715 | |||
3717 | # Check whether --enable-userns was given. | 3716 | # Check whether --enable-userns was given. |
3718 | if test "${enable_userns+set}" = set; then : | 3717 | if test "${enable_userns+set}" = set; then : |
3719 | enableval=$enable_userns; | 3718 | enableval=$enable_userns; |
@@ -3723,10 +3722,10 @@ if test "x$enable_userns" != "xno"; then : | |||
3723 | 3722 | ||
3724 | HAVE_USERNS="-DHAVE_USERNS" | 3723 | HAVE_USERNS="-DHAVE_USERNS" |
3725 | 3724 | ||
3726 | |||
3727 | fi | 3725 | fi |
3728 | 3726 | ||
3729 | HAVE_X11="" | 3727 | HAVE_X11="" |
3728 | |||
3730 | # Check whether --enable-x11 was given. | 3729 | # Check whether --enable-x11 was given. |
3731 | if test "${enable_x11+set}" = set; then : | 3730 | if test "${enable_x11+set}" = set; then : |
3732 | enableval=$enable_x11; | 3731 | enableval=$enable_x11; |
@@ -3736,10 +3735,10 @@ if test "x$enable_x11" != "xno"; then : | |||
3736 | 3735 | ||
3737 | HAVE_X11="-DHAVE_X11" | 3736 | HAVE_X11="-DHAVE_X11" |
3738 | 3737 | ||
3739 | |||
3740 | fi | 3738 | fi |
3741 | 3739 | ||
3742 | HAVE_FILE_TRANSFER="" | 3740 | HAVE_FILE_TRANSFER="" |
3741 | |||
3743 | # Check whether --enable-file-transfer was given. | 3742 | # Check whether --enable-file-transfer was given. |
3744 | if test "${enable_file_transfer+set}" = set; then : | 3743 | if test "${enable_file_transfer+set}" = set; then : |
3745 | enableval=$enable_file_transfer; | 3744 | enableval=$enable_file_transfer; |
@@ -3749,24 +3748,23 @@ if test "x$enable_file_transfer" != "xno"; then : | |||
3749 | 3748 | ||
3750 | HAVE_FILE_TRANSFER="-DHAVE_FILE_TRANSFER" | 3749 | HAVE_FILE_TRANSFER="-DHAVE_FILE_TRANSFER" |
3751 | 3750 | ||
3752 | |||
3753 | fi | 3751 | fi |
3754 | 3752 | ||
3755 | HAVE_SUID="" | 3753 | HAVE_SUID="" |
3754 | |||
3756 | # Check whether --enable-suid was given. | 3755 | # Check whether --enable-suid was given. |
3757 | if test "${enable_suid+set}" = set; then : | 3756 | if test "${enable_suid+set}" = set; then : |
3758 | enableval=$enable_suid; | 3757 | enableval=$enable_suid; |
3759 | fi | 3758 | fi |
3760 | 3759 | ||
3761 | if test "x$enable_suid" = "xno"; then : | 3760 | if test "x$enable_suid" != "xno"; then : |
3762 | HAVE_SUID="no" | ||
3763 | else | ||
3764 | HAVE_SUID="yes" | ||
3765 | 3761 | ||
3766 | fi | 3762 | HAVE_SUID="-DHAVE_SUID" |
3767 | 3763 | ||
3764 | fi | ||
3768 | 3765 | ||
3769 | HAVE_FATAL_WARNINGS="" | 3766 | HAVE_FATAL_WARNINGS="" |
3767 | |||
3770 | # Check whether --enable-fatal_warnings was given. | 3768 | # Check whether --enable-fatal_warnings was given. |
3771 | if test "${enable_fatal_warnings+set}" = set; then : | 3769 | if test "${enable_fatal_warnings+set}" = set; then : |
3772 | enableval=$enable_fatal_warnings; | 3770 | enableval=$enable_fatal_warnings; |
@@ -3776,10 +3774,10 @@ if test "x$enable_fatal_warnings" = "xyes"; then : | |||
3776 | 3774 | ||
3777 | HAVE_FATAL_WARNINGS="-W -Wall -Werror" | 3775 | HAVE_FATAL_WARNINGS="-W -Wall -Werror" |
3778 | 3776 | ||
3779 | |||
3780 | fi | 3777 | fi |
3781 | 3778 | ||
3782 | BUSYBOX_WORKAROUND="no" | 3779 | BUSYBOX_WORKAROUND="no" |
3780 | |||
3783 | # Check whether --enable-busybox-workaround was given. | 3781 | # Check whether --enable-busybox-workaround was given. |
3784 | if test "${enable_busybox_workaround+set}" = set; then : | 3782 | if test "${enable_busybox_workaround+set}" = set; then : |
3785 | enableval=$enable_busybox_workaround; | 3783 | enableval=$enable_busybox_workaround; |
@@ -3789,11 +3787,11 @@ if test "x$enable_busybox_workaround" = "xyes"; then : | |||
3789 | 3787 | ||
3790 | BUSYBOX_WORKAROUND="yes" | 3788 | BUSYBOX_WORKAROUND="yes" |
3791 | 3789 | ||
3792 | |||
3793 | fi | 3790 | fi |
3794 | 3791 | ||
3795 | 3792 | ||
3796 | HAVE_GCOV="" | 3793 | HAVE_GCOV="" |
3794 | |||
3797 | # Check whether --enable-gcov was given. | 3795 | # Check whether --enable-gcov was given. |
3798 | if test "${enable_gcov+set}" = set; then : | 3796 | if test "${enable_gcov+set}" = set; then : |
3799 | enableval=$enable_gcov; | 3797 | enableval=$enable_gcov; |
@@ -3801,27 +3799,26 @@ fi | |||
3801 | 3799 | ||
3802 | if test "x$enable_gcov" = "xyes"; then : | 3800 | if test "x$enable_gcov" = "xyes"; then : |
3803 | 3801 | ||
3804 | HAVE_GCOV="--coverage -DHAVE_GCOV " | 3802 | HAVE_GCOV="--coverage -DHAVE_GCOV" |
3805 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lgcov --coverage " | 3803 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lgcov --coverage" |
3806 | |||
3807 | 3804 | ||
3808 | fi | 3805 | fi |
3809 | 3806 | ||
3810 | HAVE_CONTRIB_INSTALL="yes" | 3807 | HAVE_CONTRIB_INSTALL="yes" |
3808 | |||
3811 | # Check whether --enable-contrib-install was given. | 3809 | # Check whether --enable-contrib-install was given. |
3812 | if test "${enable_contrib_install+set}" = set; then : | 3810 | if test "${enable_contrib_install+set}" = set; then : |
3813 | enableval=$enable_contrib_install; | 3811 | enableval=$enable_contrib_install; |
3814 | fi | 3812 | fi |
3815 | 3813 | ||
3816 | if test "x$enable_contrib_install" = "xno"; then : | 3814 | if test "x$enable_contrib_install" = "xno"; then : |
3817 | HAVE_CONTRIB_INSTALL="no" | ||
3818 | else | ||
3819 | HAVE_CONTRIB_INSTALL="yes" | ||
3820 | 3815 | ||
3821 | fi | 3816 | HAVE_CONTRIB_INSTALL="no" |
3822 | 3817 | ||
3818 | fi | ||
3823 | 3819 | ||
3824 | HAVE_FORCE_NONEWPRIVS="" | 3820 | HAVE_FORCE_NONEWPRIVS="" |
3821 | |||
3825 | # Check whether --enable-force-nonewprivs was given. | 3822 | # Check whether --enable-force-nonewprivs was given. |
3826 | if test "${enable_force_nonewprivs+set}" = set; then : | 3823 | if test "${enable_force_nonewprivs+set}" = set; then : |
3827 | enableval=$enable_force_nonewprivs; | 3824 | enableval=$enable_force_nonewprivs; |
@@ -3831,10 +3828,10 @@ if test "x$enable_force_nonewprivs" = "xyes"; then : | |||
3831 | 3828 | ||
3832 | HAVE_FORCE_NONEWPRIVS="-DHAVE_FORCE_NONEWPRIVS" | 3829 | HAVE_FORCE_NONEWPRIVS="-DHAVE_FORCE_NONEWPRIVS" |
3833 | 3830 | ||
3834 | |||
3835 | fi | 3831 | fi |
3836 | 3832 | ||
3837 | HAVE_LTS="" | 3833 | HAVE_LTS="" |
3834 | |||
3838 | # Check whether --enable-lts was given. | 3835 | # Check whether --enable-lts was given. |
3839 | if test "${enable_lts+set}" = set; then : | 3836 | if test "${enable_lts+set}" = set; then : |
3840 | enableval=$enable_lts; | 3837 | enableval=$enable_lts; |
@@ -3843,53 +3840,22 @@ fi | |||
3843 | if test "x$enable_lts" = "xyes"; then : | 3840 | if test "x$enable_lts" = "xyes"; then : |
3844 | 3841 | ||
3845 | HAVE_LTS="-DHAVE_LTS" | 3842 | HAVE_LTS="-DHAVE_LTS" |
3846 | |||
3847 | |||
3848 | HAVE_DBUSPROXY="" | 3843 | HAVE_DBUSPROXY="" |
3849 | |||
3850 | |||
3851 | HAVE_OVERLAYFS="" | 3844 | HAVE_OVERLAYFS="" |
3852 | |||
3853 | |||
3854 | HAVE_OUTPUT="" | 3845 | HAVE_OUTPUT="" |
3855 | |||
3856 | |||
3857 | HAVE_USERTMPFS="" | 3846 | HAVE_USERTMPFS="" |
3858 | |||
3859 | |||
3860 | HAVE_MAN="-DHAVE_MAN" | 3847 | HAVE_MAN="-DHAVE_MAN" |
3861 | |||
3862 | |||
3863 | HAVE_FIRETUNNEL="" | 3848 | HAVE_FIRETUNNEL="" |
3864 | |||
3865 | |||
3866 | HAVE_PRIVATEHOME="" | 3849 | HAVE_PRIVATEHOME="" |
3867 | |||
3868 | |||
3869 | HAVE_CHROOT="" | 3850 | HAVE_CHROOT="" |
3870 | |||
3871 | |||
3872 | HAVE_GLOBALCFG="" | 3851 | HAVE_GLOBALCFG="" |
3873 | |||
3874 | |||
3875 | HAVE_USERNS="" | 3852 | HAVE_USERNS="" |
3876 | |||
3877 | |||
3878 | HAVE_X11="" | 3853 | HAVE_X11="" |
3879 | |||
3880 | |||
3881 | HAVE_FILE_TRANSFER="" | 3854 | HAVE_FILE_TRANSFER="" |
3882 | 3855 | HAVE_SUID="-DHAVE_SUID" | |
3883 | |||
3884 | HAVE_SUID="yes" | ||
3885 | |||
3886 | |||
3887 | BUSYBOX_WORKAROUND="no" | 3856 | BUSYBOX_WORKAROUND="no" |
3888 | |||
3889 | |||
3890 | HAVE_CONTRIB_INSTALL="no", | 3857 | HAVE_CONTRIB_INSTALL="no", |
3891 | 3858 | ||
3892 | |||
3893 | fi | 3859 | fi |
3894 | 3860 | ||
3895 | ac_ext=c | 3861 | ac_ext=c |
diff --git a/configure.ac b/configure.ac index 5ef97cbd0..bf501506d 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -12,9 +12,10 @@ | |||
12 | # | 12 | # |
13 | 13 | ||
14 | AC_PREREQ([2.68]) | 14 | AC_PREREQ([2.68]) |
15 | AC_INIT([firejail],[0.9.67],[netblue30@protonmail.com],[],[https://firejail.wordpress.com]) | 15 | AC_INIT([firejail], [0.9.67], [netblue30@protonmail.com], [], |
16 | AC_CONFIG_SRCDIR([src/firejail/main.c]) | 16 | [https://firejail.wordpress.com]) |
17 | 17 | ||
18 | AC_CONFIG_SRCDIR([src/firejail/main.c]) | ||
18 | AC_CONFIG_MACRO_DIR([m4]) | 19 | AC_CONFIG_MACRO_DIR([m4]) |
19 | 20 | ||
20 | AC_PROG_CC | 21 | AC_PROG_CC |
@@ -40,13 +41,14 @@ AX_CHECK_COMPILE_FLAG( | |||
40 | ) | 41 | ) |
41 | 42 | ||
42 | AC_ARG_ENABLE([analyzer], | 43 | AC_ARG_ENABLE([analyzer], |
43 | AS_HELP_STRING([--enable-analyzer], [enable GCC static analyzer])) | 44 | [AS_HELP_STRING([--enable-analyzer], [enable GCC static analyzer])]) |
44 | AS_IF([test "x$enable_analyzer" = "xyes"], [ | 45 | AS_IF([test "x$enable_analyzer" = "xyes"], [ |
45 | EXTRA_CFLAGS="$EXTRA_CFLAGS -fanalyzer -Wno-analyzer-malloc-leak" | 46 | EXTRA_CFLAGS="$EXTRA_CFLAGS -fanalyzer -Wno-analyzer-malloc-leak" |
46 | ]) | 47 | ]) |
47 | 48 | ||
48 | AC_ARG_ENABLE([sanitizer], | 49 | AC_ARG_ENABLE([sanitizer], |
49 | AS_HELP_STRING([--enable-sanitizer=@<:@address | memory | undefined@:>@], [enable a compiler-based sanitizer (debug)]), [], [enable_sanitizer=no]) | 50 | [AS_HELP_STRING([--enable-sanitizer=@<:@address | memory | undefined@:>@], [enable a compiler-based sanitizer (debug)])], |
51 | [], [enable_sanitizer=no]) | ||
50 | AS_IF([test "x$enable_sanitizer" != "xno" ], | 52 | AS_IF([test "x$enable_sanitizer" != "xno" ], |
51 | [AX_CHECK_COMPILE_FLAG([-fsanitize=$enable_sanitizer], [ | 53 | [AX_CHECK_COMPILE_FLAG([-fsanitize=$enable_sanitizer], [ |
52 | EXTRA_CFLAGS="$EXTRA_CFLAGS -fsanitize=$enable_sanitizer -fno-omit-frame-pointer" | 54 | EXTRA_CFLAGS="$EXTRA_CFLAGS -fsanitize=$enable_sanitizer -fno-omit-frame-pointer" |
@@ -55,22 +57,22 @@ AS_IF([test "x$enable_sanitizer" != "xno" ], | |||
55 | )]) | 57 | )]) |
56 | 58 | ||
57 | HAVE_APPARMOR="" | 59 | HAVE_APPARMOR="" |
60 | AC_SUBST([HAVE_APPARMOR]) | ||
58 | AC_ARG_ENABLE([apparmor], | 61 | AC_ARG_ENABLE([apparmor], |
59 | AS_HELP_STRING([--enable-apparmor], [enable apparmor])) | 62 | [AS_HELP_STRING([--enable-apparmor], [enable apparmor])]) |
60 | AS_IF([test "x$enable_apparmor" = "xyes"], [ | 63 | AS_IF([test "x$enable_apparmor" = "xyes"], [ |
61 | HAVE_APPARMOR="-DHAVE_APPARMOR" | 64 | HAVE_APPARMOR="-DHAVE_APPARMOR" |
62 | PKG_CHECK_MODULES([AA], libapparmor, | 65 | PKG_CHECK_MODULES([AA], [libapparmor], |
63 | [EXTRA_CFLAGS="$EXTRA_CFLAGS $AA_CFLAGS" && EXTRA_LDFLAGS="$EXTRA_LDFLAGS $AA_LIBS"]) | 66 | [EXTRA_CFLAGS="$EXTRA_CFLAGS $AA_CFLAGS" && EXTRA_LDFLAGS="$EXTRA_LDFLAGS $AA_LIBS"]) |
64 | AC_SUBST(HAVE_APPARMOR) | ||
65 | ]) | 67 | ]) |
66 | 68 | ||
67 | HAVE_SELINUX="" | 69 | HAVE_SELINUX="" |
70 | AC_SUBST([HAVE_SELINUX]) | ||
68 | AC_ARG_ENABLE([selinux], | 71 | AC_ARG_ENABLE([selinux], |
69 | AS_HELP_STRING([--enable-selinux], [SELinux labeling support])) | 72 | [AS_HELP_STRING([--enable-selinux], [SELinux labeling support])]) |
70 | AS_IF([test "x$enable_selinux" = "xyes"], [ | 73 | AS_IF([test "x$enable_selinux" = "xyes"], [ |
71 | HAVE_SELINUX="-DHAVE_SELINUX" | 74 | HAVE_SELINUX="-DHAVE_SELINUX" |
72 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lselinux " | 75 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lselinux" |
73 | AC_SUBST(HAVE_SELINUX) | ||
74 | ]) | 76 | ]) |
75 | 77 | ||
76 | AC_SUBST([EXTRA_CFLAGS]) | 78 | AC_SUBST([EXTRA_CFLAGS]) |
@@ -78,220 +80,187 @@ AC_SUBST([EXTRA_LDFLAGS]) | |||
78 | 80 | ||
79 | 81 | ||
80 | HAVE_DBUSPROXY="" | 82 | HAVE_DBUSPROXY="" |
83 | AC_SUBST([HAVE_DBUSPROXY]) | ||
81 | AC_ARG_ENABLE([dbusproxy], | 84 | AC_ARG_ENABLE([dbusproxy], |
82 | AS_HELP_STRING([--disable-dbusproxy], [disable dbus proxy])) | 85 | [AS_HELP_STRING([--disable-dbusproxy], [disable dbus proxy])]) |
83 | AS_IF([test "x$enable_dbusproxy" != "xno"], [ | 86 | AS_IF([test "x$enable_dbusproxy" != "xno"], [ |
84 | HAVE_DBUSPROXY="-DHAVE_DBUSPROXY" | 87 | HAVE_DBUSPROXY="-DHAVE_DBUSPROXY" |
85 | AC_SUBST(HAVE_DBUSPROXY) | ||
86 | ]) | 88 | ]) |
87 | 89 | ||
88 | # overlayfs features temporarily disabled pending fixes | 90 | # overlayfs features temporarily disabled pending fixes |
89 | HAVE_OVERLAYFS="" | 91 | HAVE_OVERLAYFS="" |
90 | AC_SUBST(HAVE_OVERLAYFS) | 92 | AC_SUBST([HAVE_OVERLAYFS]) |
91 | # | ||
92 | #AC_ARG_ENABLE([overlayfs], | 93 | #AC_ARG_ENABLE([overlayfs], |
93 | # AS_HELP_STRING([--disable-overlayfs], [disable overlayfs])) | 94 | # [AS_HELP_STRING([--disable-overlayfs], [disable overlayfs])]) |
94 | #AS_IF([test "x$enable_overlayfs" != "xno"], [ | 95 | #AS_IF([test "x$enable_overlayfs" != "xno"], [ |
95 | # HAVE_OVERLAYFS="-DHAVE_OVERLAYFS" | 96 | # HAVE_OVERLAYFS="-DHAVE_OVERLAYFS" |
96 | # AC_SUBST(HAVE_OVERLAYFS) | ||
97 | #]) | 97 | #]) |
98 | 98 | ||
99 | HAVE_OUTPUT="" | 99 | HAVE_OUTPUT="" |
100 | AC_SUBST([HAVE_OUTPUT]) | ||
100 | AC_ARG_ENABLE([output], | 101 | AC_ARG_ENABLE([output], |
101 | AS_HELP_STRING([--disable-output], [disable --output logging])) | 102 | [AS_HELP_STRING([--disable-output], [disable --output logging])]) |
102 | AS_IF([test "x$enable_output" != "xno"], [ | 103 | AS_IF([test "x$enable_output" != "xno"], [ |
103 | HAVE_OUTPUT="-DHAVE_OUTPUT" | 104 | HAVE_OUTPUT="-DHAVE_OUTPUT" |
104 | AC_SUBST(HAVE_OUTPUT) | ||
105 | ]) | 105 | ]) |
106 | 106 | ||
107 | HAVE_USERTMPFS="" | 107 | HAVE_USERTMPFS="" |
108 | AC_SUBST([HAVE_USERTMPFS]) | ||
108 | AC_ARG_ENABLE([usertmpfs], | 109 | AC_ARG_ENABLE([usertmpfs], |
109 | AS_HELP_STRING([--disable-usertmpfs], [disable tmpfs as regular user])) | 110 | [AS_HELP_STRING([--disable-usertmpfs], [disable tmpfs as regular user])]) |
110 | AS_IF([test "x$enable_usertmpfs" != "xno"], [ | 111 | AS_IF([test "x$enable_usertmpfs" != "xno"], [ |
111 | HAVE_USERTMPFS="-DHAVE_USERTMPFS" | 112 | HAVE_USERTMPFS="-DHAVE_USERTMPFS" |
112 | AC_SUBST(HAVE_USERTMPFS) | ||
113 | ]) | 113 | ]) |
114 | 114 | ||
115 | HAVE_MAN="no" | 115 | HAVE_MAN="no" |
116 | AC_SUBST([HAVE_MAN]) | ||
116 | AC_ARG_ENABLE([man], | 117 | AC_ARG_ENABLE([man], |
117 | AS_HELP_STRING([--disable-man], [disable man pages])) | 118 | [AS_HELP_STRING([--disable-man], [disable man pages])]) |
118 | AS_IF([test "x$enable_man" != "xno"], [ | 119 | AS_IF([test "x$enable_man" != "xno"], [ |
119 | HAVE_MAN="-DHAVE_MAN" | 120 | HAVE_MAN="-DHAVE_MAN" |
120 | AC_SUBST(HAVE_MAN) | ||
121 | AC_CHECK_PROG([HAVE_GAWK], [gawk], [yes], [no]) | 121 | AC_CHECK_PROG([HAVE_GAWK], [gawk], [yes], [no]) |
122 | AS_IF([test "x$HAVE_GAWK" != "xyes"], [AC_MSG_ERROR("*** gawk not found ***")]) | 122 | AS_IF([test "x$HAVE_GAWK" != "xyes"], [AC_MSG_ERROR([*** gawk not found ***])]) |
123 | ]) | 123 | ]) |
124 | 124 | ||
125 | HAVE_FIRETUNNEL="" | 125 | HAVE_FIRETUNNEL="" |
126 | AC_SUBST([HAVE_FIRETUNNEL]) | ||
126 | AC_ARG_ENABLE([firetunnel], | 127 | AC_ARG_ENABLE([firetunnel], |
127 | AS_HELP_STRING([--disable-firetunnel], [disable firetunnel])) | 128 | [AS_HELP_STRING([--disable-firetunnel], [disable firetunnel])]) |
128 | AS_IF([test "x$enable_firetunnel" != "xno"], [ | 129 | AS_IF([test "x$enable_firetunnel" != "xno"], [ |
129 | HAVE_FIRETUNNEL="-DHAVE_FIRETUNNEL" | 130 | HAVE_FIRETUNNEL="-DHAVE_FIRETUNNEL" |
130 | AC_SUBST(HAVE_FIRETUNNEL) | ||
131 | ]) | 131 | ]) |
132 | 132 | ||
133 | HAVE_PRIVATEHOME="" | 133 | HAVE_PRIVATEHOME="" |
134 | AC_SUBST([HAVE_PRIVATE_HOME]) | ||
134 | AC_ARG_ENABLE([private-home], | 135 | AC_ARG_ENABLE([private-home], |
135 | AS_HELP_STRING([--disable-private-home], [disable private home feature])) | 136 | [AS_HELP_STRING([--disable-private-home], [disable private home feature])]) |
136 | AS_IF([test "x$enable_private_home" != "xno"], [ | 137 | AS_IF([test "x$enable_private_home" != "xno"], [ |
137 | HAVE_PRIVATE_HOME="-DHAVE_PRIVATE_HOME" | 138 | HAVE_PRIVATE_HOME="-DHAVE_PRIVATE_HOME" |
138 | AC_SUBST(HAVE_PRIVATE_HOME) | ||
139 | ]) | 139 | ]) |
140 | 140 | ||
141 | HAVE_CHROOT="" | 141 | HAVE_CHROOT="" |
142 | AC_SUBST([HAVE_CHROOT]) | ||
142 | AC_ARG_ENABLE([chroot], | 143 | AC_ARG_ENABLE([chroot], |
143 | AS_HELP_STRING([--disable-chroot], [disable chroot])) | 144 | [AS_HELP_STRING([--disable-chroot], [disable chroot])]) |
144 | AS_IF([test "x$enable_chroot" != "xno"], [ | 145 | AS_IF([test "x$enable_chroot" != "xno"], [ |
145 | HAVE_CHROOT="-DHAVE_CHROOT" | 146 | HAVE_CHROOT="-DHAVE_CHROOT" |
146 | AC_SUBST(HAVE_CHROOT) | ||
147 | ]) | 147 | ]) |
148 | 148 | ||
149 | HAVE_GLOBALCFG="" | 149 | HAVE_GLOBALCFG="" |
150 | AC_SUBST([HAVE_GLOBALCFG]) | ||
150 | AC_ARG_ENABLE([globalcfg], | 151 | AC_ARG_ENABLE([globalcfg], |
151 | AS_HELP_STRING([--disable-globalcfg], [if the global config file firejail.cfg is not present, continue the program using defaults])) | 152 | [AS_HELP_STRING([--disable-globalcfg], |
153 | [if the global config file firejail.cfg is not present, continue the program using defaults])]) | ||
152 | AS_IF([test "x$enable_globalcfg" != "xno"], [ | 154 | AS_IF([test "x$enable_globalcfg" != "xno"], [ |
153 | HAVE_GLOBALCFG="-DHAVE_GLOBALCFG" | 155 | HAVE_GLOBALCFG="-DHAVE_GLOBALCFG" |
154 | AC_SUBST(HAVE_GLOBALCFG) | ||
155 | ]) | 156 | ]) |
156 | 157 | ||
157 | HAVE_NETWORK="" | 158 | HAVE_NETWORK="" |
159 | AC_SUBST([HAVE_NETWORK]) | ||
158 | AC_ARG_ENABLE([network], | 160 | AC_ARG_ENABLE([network], |
159 | AS_HELP_STRING([--disable-network], [disable network])) | 161 | [AS_HELP_STRING([--disable-network], [disable network])]) |
160 | AS_IF([test "x$enable_network" != "xno"], [ | 162 | AS_IF([test "x$enable_network" != "xno"], [ |
161 | HAVE_NETWORK="-DHAVE_NETWORK" | 163 | HAVE_NETWORK="-DHAVE_NETWORK" |
162 | AC_SUBST(HAVE_NETWORK) | ||
163 | ]) | 164 | ]) |
164 | 165 | ||
165 | HAVE_USERNS="" | 166 | HAVE_USERNS="" |
167 | AC_SUBST([HAVE_USERNS]) | ||
166 | AC_ARG_ENABLE([userns], | 168 | AC_ARG_ENABLE([userns], |
167 | AS_HELP_STRING([--disable-userns], [disable user namespace])) | 169 | [AS_HELP_STRING([--disable-userns], [disable user namespace])]) |
168 | AS_IF([test "x$enable_userns" != "xno"], [ | 170 | AS_IF([test "x$enable_userns" != "xno"], [ |
169 | HAVE_USERNS="-DHAVE_USERNS" | 171 | HAVE_USERNS="-DHAVE_USERNS" |
170 | AC_SUBST(HAVE_USERNS) | ||
171 | ]) | 172 | ]) |
172 | 173 | ||
173 | HAVE_X11="" | 174 | HAVE_X11="" |
175 | AC_SUBST([HAVE_X11]) | ||
174 | AC_ARG_ENABLE([x11], | 176 | AC_ARG_ENABLE([x11], |
175 | AS_HELP_STRING([--disable-x11], [disable X11 sandboxing support])) | 177 | [AS_HELP_STRING([--disable-x11], [disable X11 sandboxing support])]) |
176 | AS_IF([test "x$enable_x11" != "xno"], [ | 178 | AS_IF([test "x$enable_x11" != "xno"], [ |
177 | HAVE_X11="-DHAVE_X11" | 179 | HAVE_X11="-DHAVE_X11" |
178 | AC_SUBST(HAVE_X11) | ||
179 | ]) | 180 | ]) |
180 | 181 | ||
181 | HAVE_FILE_TRANSFER="" | 182 | HAVE_FILE_TRANSFER="" |
183 | AC_SUBST([HAVE_FILE_TRANSFER]) | ||
182 | AC_ARG_ENABLE([file-transfer], | 184 | AC_ARG_ENABLE([file-transfer], |
183 | AS_HELP_STRING([--disable-file-transfer], [disable file transfer])) | 185 | [AS_HELP_STRING([--disable-file-transfer], [disable file transfer])]) |
184 | AS_IF([test "x$enable_file_transfer" != "xno"], [ | 186 | AS_IF([test "x$enable_file_transfer" != "xno"], [ |
185 | HAVE_FILE_TRANSFER="-DHAVE_FILE_TRANSFER" | 187 | HAVE_FILE_TRANSFER="-DHAVE_FILE_TRANSFER" |
186 | AC_SUBST(HAVE_FILE_TRANSFER) | ||
187 | ]) | 188 | ]) |
188 | 189 | ||
189 | HAVE_SUID="" | 190 | HAVE_SUID="" |
191 | AC_SUBST([HAVE_SUID]) | ||
190 | AC_ARG_ENABLE([suid], | 192 | AC_ARG_ENABLE([suid], |
191 | AS_HELP_STRING([--disable-suid], [install as a non-SUID executable])) | 193 | [AS_HELP_STRING([--disable-suid], [install as a non-SUID executable])]) |
192 | AS_IF([test "x$enable_suid" = "xno"], | 194 | AS_IF([test "x$enable_suid" != "xno"], [ |
193 | [HAVE_SUID="no"], | 195 | HAVE_SUID="-DHAVE_SUID" |
194 | [HAVE_SUID="yes"] | 196 | ]) |
195 | ) | ||
196 | AC_SUBST(HAVE_SUID) | ||
197 | 197 | ||
198 | HAVE_FATAL_WARNINGS="" | 198 | HAVE_FATAL_WARNINGS="" |
199 | AC_SUBST([HAVE_FATAL_WARNINGS]) | ||
199 | AC_ARG_ENABLE([fatal_warnings], | 200 | AC_ARG_ENABLE([fatal_warnings], |
200 | AS_HELP_STRING([--enable-fatal-warnings], [-W -Wall -Werror])) | 201 | [AS_HELP_STRING([--enable-fatal-warnings], [-W -Wall -Werror])]) |
201 | AS_IF([test "x$enable_fatal_warnings" = "xyes"], [ | 202 | AS_IF([test "x$enable_fatal_warnings" = "xyes"], [ |
202 | HAVE_FATAL_WARNINGS="-W -Wall -Werror" | 203 | HAVE_FATAL_WARNINGS="-W -Wall -Werror" |
203 | AC_SUBST(HAVE_FATAL_WARNINGS) | ||
204 | ]) | 204 | ]) |
205 | 205 | ||
206 | BUSYBOX_WORKAROUND="no" | 206 | BUSYBOX_WORKAROUND="no" |
207 | AC_SUBST([BUSYBOX_WORKAROUND]) | ||
207 | AC_ARG_ENABLE([busybox-workaround], | 208 | AC_ARG_ENABLE([busybox-workaround], |
208 | AS_HELP_STRING([--enable-busybox-workaround], [enable busybox workaround])) | 209 | [AS_HELP_STRING([--enable-busybox-workaround], [enable busybox workaround])]) |
209 | AS_IF([test "x$enable_busybox_workaround" = "xyes"], [ | 210 | AS_IF([test "x$enable_busybox_workaround" = "xyes"], [ |
210 | BUSYBOX_WORKAROUND="yes" | 211 | BUSYBOX_WORKAROUND="yes" |
211 | AC_SUBST(BUSYBOX_WORKAROUND) | ||
212 | ]) | 212 | ]) |
213 | 213 | ||
214 | 214 | ||
215 | HAVE_GCOV="" | 215 | HAVE_GCOV="" |
216 | AC_SUBST([HAVE_GCOV]) | ||
216 | AC_ARG_ENABLE([gcov], | 217 | AC_ARG_ENABLE([gcov], |
217 | AS_HELP_STRING([--enable-gcov], [Gcov instrumentation])) | 218 | [AS_HELP_STRING([--enable-gcov], [Gcov instrumentation])]) |
218 | AS_IF([test "x$enable_gcov" = "xyes"], [ | 219 | AS_IF([test "x$enable_gcov" = "xyes"], [ |
219 | HAVE_GCOV="--coverage -DHAVE_GCOV " | 220 | HAVE_GCOV="--coverage -DHAVE_GCOV" |
220 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lgcov --coverage " | 221 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lgcov --coverage" |
221 | AC_SUBST(HAVE_GCOV) | ||
222 | ]) | 222 | ]) |
223 | 223 | ||
224 | HAVE_CONTRIB_INSTALL="yes" | 224 | HAVE_CONTRIB_INSTALL="yes" |
225 | AC_SUBST([HAVE_CONTRIB_INSTALL]) | ||
225 | AC_ARG_ENABLE([contrib-install], | 226 | AC_ARG_ENABLE([contrib-install], |
226 | AS_HELP_STRING([--enable-contrib-install], [install contrib scripts])) | 227 | [AS_HELP_STRING([--enable-contrib-install], [install contrib scripts])]) |
227 | AS_IF([test "x$enable_contrib_install" = "xno"], | 228 | AS_IF([test "x$enable_contrib_install" = "xno"], [ |
228 | [HAVE_CONTRIB_INSTALL="no"], | 229 | HAVE_CONTRIB_INSTALL="no" |
229 | [HAVE_CONTRIB_INSTALL="yes"] | 230 | ]) |
230 | ) | ||
231 | AC_SUBST(HAVE_CONTRIB_INSTALL) | ||
232 | 231 | ||
233 | HAVE_FORCE_NONEWPRIVS="" | 232 | HAVE_FORCE_NONEWPRIVS="" |
233 | AC_SUBST([HAVE_FORCE_NONEWPRIVS]) | ||
234 | AC_ARG_ENABLE([force-nonewprivs], | 234 | AC_ARG_ENABLE([force-nonewprivs], |
235 | AS_HELP_STRING([--enable-force-nonewprivs], [enable force nonewprivs])) | 235 | [AS_HELP_STRING([--enable-force-nonewprivs], [enable force nonewprivs])]) |
236 | AS_IF([test "x$enable_force_nonewprivs" = "xyes"], [ | 236 | AS_IF([test "x$enable_force_nonewprivs" = "xyes"], [ |
237 | HAVE_FORCE_NONEWPRIVS="-DHAVE_FORCE_NONEWPRIVS" | 237 | HAVE_FORCE_NONEWPRIVS="-DHAVE_FORCE_NONEWPRIVS" |
238 | AC_SUBST(HAVE_FORCE_NONEWPRIVS) | ||
239 | ]) | 238 | ]) |
240 | 239 | ||
241 | HAVE_LTS="" | 240 | HAVE_LTS="" |
241 | AC_SUBST([HAVE_LTS]) | ||
242 | AC_ARG_ENABLE([lts], | 242 | AC_ARG_ENABLE([lts], |
243 | AS_HELP_STRING([--enable-lts], [enable long-term support software version (LTS)])) | 243 | [AS_HELP_STRING([--enable-lts], [enable long-term support software version (LTS)])]) |
244 | AS_IF([test "x$enable_lts" = "xyes"], [ | 244 | AS_IF([test "x$enable_lts" = "xyes"], [ |
245 | HAVE_LTS="-DHAVE_LTS" | 245 | HAVE_LTS="-DHAVE_LTS" |
246 | AC_SUBST(HAVE_LTS) | ||
247 | |||
248 | HAVE_DBUSPROXY="" | 246 | HAVE_DBUSPROXY="" |
249 | AC_SUBST(HAVE_DBUSPROXY) | ||
250 | |||
251 | HAVE_OVERLAYFS="" | 247 | HAVE_OVERLAYFS="" |
252 | AC_SUBST(HAVE_OVERLAYFS) | ||
253 | |||
254 | HAVE_OUTPUT="" | 248 | HAVE_OUTPUT="" |
255 | AC_SUBST(HAVE_OUTPUT) | ||
256 | |||
257 | HAVE_USERTMPFS="" | 249 | HAVE_USERTMPFS="" |
258 | AC_SUBST(HAVE_USERTMPFS) | ||
259 | |||
260 | HAVE_MAN="-DHAVE_MAN" | 250 | HAVE_MAN="-DHAVE_MAN" |
261 | AC_SUBST(HAVE_MAN) | ||
262 | |||
263 | HAVE_FIRETUNNEL="" | 251 | HAVE_FIRETUNNEL="" |
264 | AC_SUBST(HAVE_FIRETUNNEL) | ||
265 | |||
266 | HAVE_PRIVATEHOME="" | 252 | HAVE_PRIVATEHOME="" |
267 | AC_SUBST(HAVE_PRIVATE_HOME) | ||
268 | |||
269 | HAVE_CHROOT="" | 253 | HAVE_CHROOT="" |
270 | AC_SUBST(HAVE_CHROOT) | ||
271 | |||
272 | HAVE_GLOBALCFG="" | 254 | HAVE_GLOBALCFG="" |
273 | AC_SUBST(HAVE_GLOBALCFG) | ||
274 | |||
275 | HAVE_USERNS="" | 255 | HAVE_USERNS="" |
276 | AC_SUBST(HAVE_USERNS) | ||
277 | |||
278 | HAVE_X11="" | 256 | HAVE_X11="" |
279 | AC_SUBST(HAVE_X11) | ||
280 | |||
281 | HAVE_FILE_TRANSFER="" | 257 | HAVE_FILE_TRANSFER="" |
282 | AC_SUBST(HAVE_FILE_TRANSFER) | 258 | HAVE_SUID="-DHAVE_SUID" |
283 | |||
284 | HAVE_SUID="yes" | ||
285 | AC_SUBST(HAVE_SUID) | ||
286 | |||
287 | BUSYBOX_WORKAROUND="no" | 259 | BUSYBOX_WORKAROUND="no" |
288 | AC_SUBST(BUSYBOX_WORKAROUND) | ||
289 | |||
290 | HAVE_CONTRIB_INSTALL="no", | 260 | HAVE_CONTRIB_INSTALL="no", |
291 | AC_SUBST(HAVE_CONTRIB_INSTALL) | ||
292 | ]) | 261 | ]) |
293 | 262 | ||
294 | AC_CHECK_HEADER([linux/seccomp.h],,AC_MSG_ERROR([*** SECCOMP support is not installed (/usr/include/linux/seccomp.h missing) ***])) | 263 | AC_CHECK_HEADER([linux/seccomp.h], [], AC_MSG_ERROR([*** SECCOMP support is not installed (/usr/include/linux/seccomp.h missing) ***])) |
295 | 264 | ||
296 | # set sysconfdir | 265 | # set sysconfdir |
297 | if test "$prefix" = /usr; then | 266 | if test "$prefix" = /usr; then |
diff --git a/src/common.mk.in b/src/common.mk.in index c8329e7c2..c55c26f42 100644 --- a/src/common.mk.in +++ b/src/common.mk.in | |||
@@ -22,11 +22,7 @@ HAVE_FIRETUNNEL=@HAVE_FIRETUNNEL@ | |||
22 | HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@ | 22 | HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@ |
23 | HAVE_GCOV=@HAVE_GCOV@ | 23 | HAVE_GCOV=@HAVE_GCOV@ |
24 | HAVE_SELINUX=@HAVE_SELINUX@ | 24 | HAVE_SELINUX=@HAVE_SELINUX@ |
25 | ifeq (@HAVE_SUID@, yes) | 25 | HAVE_SUID=@HAVE_SUID@ |
26 | HAVE_SUID=-DHAVE_SUID | ||
27 | else | ||
28 | HAVE_SUID= | ||
29 | endif | ||
30 | HAVE_DBUSPROXY=@HAVE_DBUSPROXY@ | 26 | HAVE_DBUSPROXY=@HAVE_DBUSPROXY@ |
31 | HAVE_USERTMPFS=@HAVE_USERTMPFS@ | 27 | HAVE_USERTMPFS=@HAVE_USERTMPFS@ |
32 | HAVE_OUTPUT=@HAVE_OUTPUT@ | 28 | HAVE_OUTPUT=@HAVE_OUTPUT@ |