From d28f1d7157c87076771498f062f5af7e932bd20f Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Sun, 12 Jun 2016 07:27:21 -0400
Subject: support to disable enforcing firejail.config

---
 configure | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index da7d370d3..ca0704e91 100755
--- a/configure
+++ b/configure
@@ -634,6 +634,7 @@ HAVE_FILE_TRANSFER
 HAVE_X11
 HAVE_USERNS
 HAVE_NETWORK
+HAVE_GLOBALCFG
 HAVE_BIND
 HAVE_CHROOT
 HAVE_SECCOMP
@@ -692,6 +693,7 @@ enable_option_checking
 enable_seccomp
 enable_chroot
 enable_bind
+enable_globalcfg
 enable_network
 enable_userns
 enable_x11
@@ -1320,6 +1322,8 @@ Optional Features:
   --disable-seccomp       disable seccomp
   --disable-chroot        disable chroot
   --disable-bind          disable bind
+  --disable-globalcfg     disable global config file
+                          (/etc/firejail/firejail.cfg)
   --disable-network       disable network
   --enable-network=restricted
                           restrict --net= to root only
@@ -3102,6 +3106,19 @@ if test "x$enable_bind" != "xno"; then :
 	HAVE_BIND="-DHAVE_BIND"
 
 
+fi
+
+HAVE_GLOBALCFG=""
+# Check whether --enable-globalcfg was given.
+if test "${enable_globalcfg+set}" = set; then :
+  enableval=$enable_globalcfg;
+fi
+
+if test "x$enable_globalcfg" != "xno"; then :
+
+	HAVE_GLOBALCFG="-DHAVE_GLOBALCFG"
+
+
 fi
 
 HAVE_NETWORK=""
@@ -4834,6 +4851,7 @@ echo "   prefix: $prefix"
 echo "   sysconfdir: $sysconfdir"
 echo "   seccomp: $HAVE_SECCOMP"
 echo "   <linux/seccomp.h>: $HAVE_SECCOMP_H"
+echo "   global config: $HAVE_GLOBALCFG"
 echo "   chroot: $HAVE_CHROOT"
 echo "   bind: $HAVE_BIND"
 echo "   network: $HAVE_NETWORK"
-- 
cgit v1.2.3-54-g00ecf