autoconf

3 files changed, 1 insertions, 109 deletions

diff --git a/configure b/configure
index 0dfed3876..b15f649df 100755
--- a/configure
+++ b/configure
@@ -631,15 +631,11 @@ HAVE_FATAL_WARNINGS
 HAVE_SUID
 HAVE_WHITELIST
 HAVE_FILE_TRANSFER
-HAVE_X11
 HAVE_USERNS
 HAVE_NETWORK
 HAVE_GLOBALCFG
 HAVE_BIND
-HAVE_CHROOT
 HAVE_SECCOMP
-HAVE_PRIVATE_HOME
-HAVE_OVERLAYFS
 EXTRA_LDFLAGS
 EGREP
 GREP
@@ -700,15 +696,11 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_apparmor
-enable_overlayfs
-enable_private_home
 enable_seccomp
-enable_chroot
 enable_bind
 enable_globalcfg
 enable_network
 enable_userns
-enable_x11
 enable_file_transfer
 enable_whitelist
 enable_suid
@@ -1346,16 +1338,12 @@ Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-apparmor       enable apparmor
-  --disable-overlayfs     disable overlayfs
-  --disable-private-home  disable private home feature
   --disable-seccomp       disable seccomp
-  --disable-chroot        disable chroot
   --disable-bind          disable bind
   --disable-globalcfg     if the global config file firejail.cfg is not
                           present, continue the program using defaults
   --disable-network       disable network
   --disable-userns        disable user namespace
-  --disable-x11           disable X11 sandboxing support
   --disable-file-transfer disable file transfer
   --disable-whitelist     disable whitelist
   --disable-suid          install as a non-SUID executable
@@ -3574,32 +3562,6 @@ if test "x$enable_apparmor" = "xyes"; then :
 fi
 
 
-HAVE_OVERLAYFS=""
-# Check whether --enable-overlayfs was given.
-if test "${enable_overlayfs+set}" = set; then :
-  enableval=$enable_overlayfs;
-fi
-
-if test "x$enable_overlayfs" != "xno"; then :
-
-        HAVE_OVERLAYFS="-DHAVE_OVERLAYFS"
-
-
-fi
-
-HAVE_PRIVATEHOME=""
-# Check whether --enable-private-home was given.
-if test "${enable_private_home+set}" = set; then :
-  enableval=$enable_private_home;
-fi
-
-if test "x$enable_private_home" != "xno"; then :
-
-        HAVE_PRIVATE_HOME="-DHAVE_PRIVATE_HOME"
-
-
-fi
-
 HAVE_SECCOMP=""
 # Check whether --enable-seccomp was given.
 if test "${enable_seccomp+set}" = set; then :
@@ -3613,19 +3575,6 @@ if test "x$enable_seccomp" != "xno"; then :
 
 fi
 
-HAVE_CHROOT=""
-# Check whether --enable-chroot was given.
-if test "${enable_chroot+set}" = set; then :
-  enableval=$enable_chroot;
-fi
-
-if test "x$enable_chroot" != "xno"; then :
-
-        HAVE_CHROOT="-DHAVE_CHROOT"
-
-
-fi
-
 HAVE_BIND=""
 # Check whether --enable-bind was given.
 if test "${enable_bind+set}" = set; then :
@@ -3678,19 +3627,6 @@ if test "x$enable_userns" != "xno"; then :
 
 fi
 
-HAVE_X11=""
-# Check whether --enable-x11 was given.
-if test "${enable_x11+set}" = set; then :
-  enableval=$enable_x11;
-fi
-
-if test "x$enable_x11" != "xno"; then :
-
-        HAVE_X11="-DHAVE_X11"
-
-
-fi
-
 HAVE_FILE_TRANSFER=""
 # Check whether --enable-file-transfer was given.
 if test "${enable_file_transfer+set}" = set; then :
@@ -5021,15 +4957,11 @@ echo "   seccomp: $HAVE_SECCOMP"
 echo "   <linux/seccomp.h>: $HAVE_SECCOMP_H"
 echo "   apparmor: $HAVE_APPARMOR"
 echo "   global config: $HAVE_GLOBALCFG"
-echo "   chroot: $HAVE_CHROOT"
 echo "   bind: $HAVE_BIND"
 echo "   network: $HAVE_NETWORK"
 echo "   user namespace: $HAVE_USERNS"
-echo "   X11 sandboxing support: $HAVE_X11"
 echo "   whitelisting: $HAVE_WHITELIST"
-echo "   private home support: $HAVE_PRIVATE_HOME"
 echo "   file transfer support: $HAVE_FILE_TRANSFER"
-echo "   overlayfs support: $HAVE_OVERLAYFS"
 echo "   busybox workaround: $BUSYBOX_WORKAROUND"
 echo "   Spectre compiler patch: $HAVE_SPECTRE"
 echo "   EXTRA_LDFLAGS: $EXTRA_LDFLAGS"
diff --git a/configure.ac b/configure.ac
index 6408609fd..0cd5c7dd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,22 +55,6 @@ AS_IF([test "x$enable_apparmor" = "xyes"], [
 ])
 AC_SUBST([EXTRA_LDFLAGS])
 
-HAVE_OVERLAYFS=""
-AC_ARG_ENABLE([overlayfs],
-    AS_HELP_STRING([--disable-overlayfs], [disable overlayfs]))
-AS_IF([test "x$enable_overlayfs" != "xno"], [
-        HAVE_OVERLAYFS="-DHAVE_OVERLAYFS"
-        AC_SUBST(HAVE_OVERLAYFS)
-])
-
-HAVE_PRIVATEHOME=""
-AC_ARG_ENABLE([private-home],
-    AS_HELP_STRING([--disable-private-home], [disable private home feature]))
-AS_IF([test "x$enable_private_home" != "xno"], [
-        HAVE_PRIVATE_HOME="-DHAVE_PRIVATE_HOME"
-        AC_SUBST(HAVE_PRIVATE_HOME)
-])
-
 HAVE_SECCOMP=""
 AC_ARG_ENABLE([seccomp],
     AS_HELP_STRING([--disable-seccomp], [disable seccomp]))
@@ -79,14 +63,6 @@ AS_IF([test "x$enable_seccomp" != "xno"], [
         AC_SUBST(HAVE_SECCOMP)
 ])
 
-HAVE_CHROOT=""
-AC_ARG_ENABLE([chroot],
-    AS_HELP_STRING([--disable-chroot], [disable chroot]))
-AS_IF([test "x$enable_chroot" != "xno"], [
-        HAVE_CHROOT="-DHAVE_CHROOT"
-        AC_SUBST(HAVE_CHROOT)
-])
-
 HAVE_BIND=""
 AC_ARG_ENABLE([bind],
     AS_HELP_STRING([--disable-bind], [disable bind]))
@@ -119,14 +95,6 @@ AS_IF([test "x$enable_userns" != "xno"], [
         AC_SUBST(HAVE_USERNS)
 ])
 
-HAVE_X11=""
-AC_ARG_ENABLE([x11],
-    AS_HELP_STRING([--disable-x11], [disable X11 sandboxing support]))
-AS_IF([test "x$enable_x11" != "xno"], [
-        HAVE_X11="-DHAVE_X11"
-        AC_SUBST(HAVE_X11)
-])
-
 HAVE_FILE_TRANSFER=""
 AC_ARG_ENABLE([file-transfer],
     AS_HELP_STRING([--disable-file-transfer], [disable file transfer]))
@@ -201,15 +169,11 @@ echo "   seccomp: $HAVE_SECCOMP"
 echo "   <linux/seccomp.h>: $HAVE_SECCOMP_H"
 echo "   apparmor: $HAVE_APPARMOR"
 echo "   global config: $HAVE_GLOBALCFG"
-echo "   chroot: $HAVE_CHROOT"
 echo "   bind: $HAVE_BIND"
 echo "   network: $HAVE_NETWORK"
 echo "   user namespace: $HAVE_USERNS"
-echo "   X11 sandboxing support: $HAVE_X11"
 echo "   whitelisting: $HAVE_WHITELIST"
-echo "   private home support: $HAVE_PRIVATE_HOME"
 echo "   file transfer support: $HAVE_FILE_TRANSFER"
-echo "   overlayfs support: $HAVE_OVERLAYFS"
 echo "   busybox workaround: $BUSYBOX_WORKAROUND"
 echo "   Spectre compiler patch: $HAVE_SPECTRE"
 echo "   EXTRA_LDFLAGS: $EXTRA_LDFLAGS"
diff --git a/src/common.mk.in b/src/common.mk.in
index fd9f2e5a5..7440b7b45 100644
--- a/src/common.mk.in
+++ b/src/common.mk.in
@@ -10,18 +10,14 @@ VERSION=@PACKAGE_VERSION@
 NAME=@PACKAGE_NAME@
 HAVE_SECCOMP_H=@HAVE_SECCOMP_H@
 HAVE_SECCOMP=@HAVE_SECCOMP@
-HAVE_CHROOT=@HAVE_CHROOT@
 HAVE_BIND=@HAVE_BIND@
 HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@
 HAVE_NETWORK=@HAVE_NETWORK@
 HAVE_USERNS=@HAVE_USERNS@
-HAVE_X11=@HAVE_X11@
 HAVE_FILE_TRANSFER=@HAVE_FILE_TRANSFER@
 HAVE_WHITELIST=@HAVE_WHITELIST@
 HAVE_GLOBALCFG=@HAVE_GLOBALCFG@
 HAVE_APPARMOR=@HAVE_APPARMOR@
-HAVE_OVERLAYFS=@HAVE_OVERLAYFS@
-HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@
 HAVE_GCOV=@HAVE_GCOV@
 
 H_FILE_LIST       = $(sort $(wildcard *.[h]))
@@ -29,7 +25,7 @@ C_FILE_LIST       = $(sort $(wildcard *.c))
 OBJS = $(C_FILE_LIST:.c=.o)
 BINOBJS =  $(foreach file, $(OBJS), $file)
 
-CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"'  $(HAVE_GCOV) -DPREFIX='"$(prefix)"'  -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_APPARMOR) $(HAVE_OVERLAYFS) $(HAVE_SECCOMP) $(HAVE_GLOBALCFG) $(HAVE_SECCOMP_H) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_BIND) $(HAVE_FILE_TRANSFER) $(HAVE_WHITELIST) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security
+CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"'  $(HAVE_GCOV) -DPREFIX='"$(prefix)"'  -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' $(HAVE_APPARMOR) $(HAVE_SECCOMP) $(HAVE_GLOBALCFG) $(HAVE_SECCOMP_H) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_BIND) $(HAVE_FILE_TRANSFER) $(HAVE_WHITELIST) -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security
 LDFLAGS += -pie -Wl,-z,relro -Wl,-z,now -lpthread
 EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@
 EXTRA_CFLAGS +=@EXTRA_CFLAGS@