Merge pull request #4712 from kmk3/configure-improvements2

Configure improvements2

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:
         # firejail executable
         install -m 0755 -d $(DESTDIR)$(bindir)
         install -m 0755 src/firejail/firejail $(DESTDIR)$(bindir)
-ifeq ($(HAVE_SUID),yes)
+ifeq ($(HAVE_SUID),-DHAVE_SUID)
         chmod u+s $(DESTDIR)$(bindir)/firejail
 endif
         # firemon executable
diff --git a/configure b/configure
index 747769fb1..da886a541 100755
--- a/configure
+++ b/configure
@@ -651,12 +651,12 @@ HAVE_DBUSPROXY
 EXTRA_LDFLAGS
 EXTRA_CFLAGS
 HAVE_SELINUX
-HAVE_APPARMOR
 AA_LIBS
 AA_CFLAGS
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
+HAVE_APPARMOR
 RANLIB
 INSTALL_DATA
 INSTALL_SCRIPT
@@ -3303,6 +3303,7 @@ fi
 fi
 
 HAVE_APPARMOR=""
+
 # Check whether --enable-apparmor was given.
 if test "${enable_apparmor+set}" = set; then :
   enableval=$enable_apparmor;
@@ -3523,10 +3524,10 @@ $as_echo "yes" >&6; }
         EXTRA_CFLAGS="$EXTRA_CFLAGS $AA_CFLAGS" && EXTRA_LDFLAGS="$EXTRA_LDFLAGS $AA_LIBS"
 fi
 
-
 fi
 
 HAVE_SELINUX=""
+
 # Check whether --enable-selinux was given.
 if test "${enable_selinux+set}" = set; then :
   enableval=$enable_selinux;
@@ -3535,8 +3536,7 @@ fi
 if test "x$enable_selinux" = "xyes"; then :
 
         HAVE_SELINUX="-DHAVE_SELINUX"
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lselinux "
-
+        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lselinux"
 
 fi
 
@@ -3545,6 +3545,7 @@ fi
 
 
 HAVE_DBUSPROXY=""
+
 # Check whether --enable-dbusproxy was given.
 if test "${enable_dbusproxy+set}" = set; then :
   enableval=$enable_dbusproxy;
@@ -3554,21 +3555,19 @@ if test "x$enable_dbusproxy" != "xno"; then :
 
         HAVE_DBUSPROXY="-DHAVE_DBUSPROXY"
 
-
 fi
 
 # overlayfs features temporarily disabled pending fixes
 HAVE_OVERLAYFS=""
 
-#
 #AC_ARG_ENABLE([overlayfs],
-#    AS_HELP_STRING([--disable-overlayfs], [disable overlayfs]))
+#    [AS_HELP_STRING([--disable-overlayfs], [disable overlayfs])])
 #AS_IF([test "x$enable_overlayfs" != "xno"], [
 #       HAVE_OVERLAYFS="-DHAVE_OVERLAYFS"
-#       AC_SUBST(HAVE_OVERLAYFS)
 #])
 
 HAVE_OUTPUT=""
+
 # Check whether --enable-output was given.
 if test "${enable_output+set}" = set; then :
   enableval=$enable_output;
@@ -3578,10 +3577,10 @@ if test "x$enable_output" != "xno"; then :
 
         HAVE_OUTPUT="-DHAVE_OUTPUT"
 
-
 fi
 
 HAVE_USERTMPFS=""
+
 # Check whether --enable-usertmpfs was given.
 if test "${enable_usertmpfs+set}" = set; then :
   enableval=$enable_usertmpfs;
@@ -3591,10 +3590,10 @@ if test "x$enable_usertmpfs" != "xno"; then :
 
         HAVE_USERTMPFS="-DHAVE_USERTMPFS"
 
-
 fi
 
 HAVE_MAN="no"
+
 # Check whether --enable-man was given.
 if test "${enable_man+set}" = set; then :
   enableval=$enable_man;
@@ -3603,7 +3602,6 @@ fi
 if test "x$enable_man" != "xno"; then :
 
         HAVE_MAN="-DHAVE_MAN"
-
         # Extract the first word of "gawk", so it can be a program name with args.
 set dummy gawk; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -3643,12 +3641,13 @@ fi
 
 
         if test "x$HAVE_GAWK" != "xyes"; then :
-  as_fn_error $? "\"*** gawk not found ***\"" "$LINENO" 5
+  as_fn_error $? "*** gawk not found ***" "$LINENO" 5
 fi
 
 fi
 
 HAVE_FIRETUNNEL=""
+
 # Check whether --enable-firetunnel was given.
 if test "${enable_firetunnel+set}" = set; then :
   enableval=$enable_firetunnel;
@@ -3658,10 +3657,10 @@ if test "x$enable_firetunnel" != "xno"; then :
 
         HAVE_FIRETUNNEL="-DHAVE_FIRETUNNEL"
 
-
 fi
 
 HAVE_PRIVATEHOME=""
+
 # Check whether --enable-private-home was given.
 if test "${enable_private_home+set}" = set; then :
   enableval=$enable_private_home;
@@ -3671,10 +3670,10 @@ if test "x$enable_private_home" != "xno"; then :
 
         HAVE_PRIVATE_HOME="-DHAVE_PRIVATE_HOME"
 
-
 fi
 
 HAVE_CHROOT=""
+
 # Check whether --enable-chroot was given.
 if test "${enable_chroot+set}" = set; then :
   enableval=$enable_chroot;
@@ -3684,10 +3683,10 @@ if test "x$enable_chroot" != "xno"; then :
 
         HAVE_CHROOT="-DHAVE_CHROOT"
 
-
 fi
 
 HAVE_GLOBALCFG=""
+
 # Check whether --enable-globalcfg was given.
 if test "${enable_globalcfg+set}" = set; then :
   enableval=$enable_globalcfg;
@@ -3697,10 +3696,10 @@ if test "x$enable_globalcfg" != "xno"; then :
 
         HAVE_GLOBALCFG="-DHAVE_GLOBALCFG"
 
-
 fi
 
 HAVE_NETWORK=""
+
 # Check whether --enable-network was given.
 if test "${enable_network+set}" = set; then :
   enableval=$enable_network;
@@ -3710,10 +3709,10 @@ if test "x$enable_network" != "xno"; then :
 
         HAVE_NETWORK="-DHAVE_NETWORK"
 
-
 fi
 
 HAVE_USERNS=""
+
 # Check whether --enable-userns was given.
 if test "${enable_userns+set}" = set; then :
   enableval=$enable_userns;
@@ -3723,10 +3722,10 @@ if test "x$enable_userns" != "xno"; then :
 
         HAVE_USERNS="-DHAVE_USERNS"
 
-
 fi
 
 HAVE_X11=""
+
 # Check whether --enable-x11 was given.
 if test "${enable_x11+set}" = set; then :
   enableval=$enable_x11;
@@ -3736,10 +3735,10 @@ 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 :
   enableval=$enable_file_transfer;
@@ -3749,24 +3748,23 @@ if test "x$enable_file_transfer" != "xno"; then :
 
         HAVE_FILE_TRANSFER="-DHAVE_FILE_TRANSFER"
 
-
 fi
 
 HAVE_SUID=""
+
 # Check whether --enable-suid was given.
 if test "${enable_suid+set}" = set; then :
   enableval=$enable_suid;
 fi
 
-if test "x$enable_suid" = "xno"; then :
-  HAVE_SUID="no"
-else
-  HAVE_SUID="yes"
+if test "x$enable_suid" != "xno"; then :
 
-fi
+        HAVE_SUID="-DHAVE_SUID"
 
+fi
 
 HAVE_FATAL_WARNINGS=""
+
 # Check whether --enable-fatal_warnings was given.
 if test "${enable_fatal_warnings+set}" = set; then :
   enableval=$enable_fatal_warnings;
@@ -3776,10 +3774,10 @@ if test "x$enable_fatal_warnings" = "xyes"; then :
 
         HAVE_FATAL_WARNINGS="-W -Wall -Werror"
 
-
 fi
 
 BUSYBOX_WORKAROUND="no"
+
 # Check whether --enable-busybox-workaround was given.
 if test "${enable_busybox_workaround+set}" = set; then :
   enableval=$enable_busybox_workaround;
@@ -3789,11 +3787,11 @@ if test "x$enable_busybox_workaround" = "xyes"; then :
 
         BUSYBOX_WORKAROUND="yes"
 
-
 fi
 
 
 HAVE_GCOV=""
+
 # Check whether --enable-gcov was given.
 if test "${enable_gcov+set}" = set; then :
   enableval=$enable_gcov;
@@ -3801,27 +3799,26 @@ fi
 
 if test "x$enable_gcov" = "xyes"; then :
 
-        HAVE_GCOV="--coverage -DHAVE_GCOV "
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lgcov --coverage "
-
+        HAVE_GCOV="--coverage -DHAVE_GCOV"
+        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lgcov --coverage"
 
 fi
 
 HAVE_CONTRIB_INSTALL="yes"
+
 # Check whether --enable-contrib-install was given.
 if test "${enable_contrib_install+set}" = set; then :
   enableval=$enable_contrib_install;
 fi
 
 if test "x$enable_contrib_install" = "xno"; then :
-  HAVE_CONTRIB_INSTALL="no"
-else
-  HAVE_CONTRIB_INSTALL="yes"
 
-fi
+       HAVE_CONTRIB_INSTALL="no"
 
+fi
 
 HAVE_FORCE_NONEWPRIVS=""
+
 # Check whether --enable-force-nonewprivs was given.
 if test "${enable_force_nonewprivs+set}" = set; then :
   enableval=$enable_force_nonewprivs;
@@ -3831,10 +3828,10 @@ if test "x$enable_force_nonewprivs" = "xyes"; then :
 
         HAVE_FORCE_NONEWPRIVS="-DHAVE_FORCE_NONEWPRIVS"
 
-
 fi
 
 HAVE_LTS=""
+
 # Check whether --enable-lts was given.
 if test "${enable_lts+set}" = set; then :
   enableval=$enable_lts;
@@ -3843,53 +3840,22 @@ fi
 if test "x$enable_lts" = "xyes"; then :
 
         HAVE_LTS="-DHAVE_LTS"
-
-
         HAVE_DBUSPROXY=""
-
-
         HAVE_OVERLAYFS=""
-
-
         HAVE_OUTPUT=""
-
-
         HAVE_USERTMPFS=""
-
-
         HAVE_MAN="-DHAVE_MAN"
-
-
         HAVE_FIRETUNNEL=""
-
-
         HAVE_PRIVATEHOME=""
-
-
         HAVE_CHROOT=""
-
-
         HAVE_GLOBALCFG=""
-
-
         HAVE_USERNS=""
-
-
         HAVE_X11=""
-
-
         HAVE_FILE_TRANSFER=""
-
-
-        HAVE_SUID="yes"
-
-
+        HAVE_SUID="-DHAVE_SUID"
         BUSYBOX_WORKAROUND="no"
-
-
         HAVE_CONTRIB_INSTALL="no",
 
-
 fi
 
 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 @@
 #
 
 AC_PREREQ([2.68])
-AC_INIT([firejail],[0.9.67],[netblue30@protonmail.com],[],[https://firejail.wordpress.com])
-AC_CONFIG_SRCDIR([src/firejail/main.c])
+AC_INIT([firejail], [0.9.67], [netblue30@protonmail.com], [],
+    [https://firejail.wordpress.com])
 
+AC_CONFIG_SRCDIR([src/firejail/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_PROG_CC
@@ -40,13 +41,14 @@ AX_CHECK_COMPILE_FLAG(
 )
 
 AC_ARG_ENABLE([analyzer],
-    AS_HELP_STRING([--enable-analyzer], [enable GCC static analyzer]))
+    [AS_HELP_STRING([--enable-analyzer], [enable GCC static analyzer])])
 AS_IF([test "x$enable_analyzer" = "xyes"], [
         EXTRA_CFLAGS="$EXTRA_CFLAGS -fanalyzer -Wno-analyzer-malloc-leak"
 ])
 
 AC_ARG_ENABLE([sanitizer],
-    AS_HELP_STRING([--enable-sanitizer=@<:@address | memory | undefined@:>@], [enable a compiler-based sanitizer (debug)]), [], [enable_sanitizer=no])
+    [AS_HELP_STRING([--enable-sanitizer=@<:@address | memory | undefined@:>@], [enable a compiler-based sanitizer (debug)])],
+    [], [enable_sanitizer=no])
 AS_IF([test "x$enable_sanitizer" != "xno" ],
         [AX_CHECK_COMPILE_FLAG([-fsanitize=$enable_sanitizer], [
                 EXTRA_CFLAGS="$EXTRA_CFLAGS -fsanitize=$enable_sanitizer -fno-omit-frame-pointer"
@@ -55,22 +57,22 @@ AS_IF([test "x$enable_sanitizer" != "xno" ],
 )])
 
 HAVE_APPARMOR=""
+AC_SUBST([HAVE_APPARMOR])
 AC_ARG_ENABLE([apparmor],
-    AS_HELP_STRING([--enable-apparmor], [enable apparmor]))
+    [AS_HELP_STRING([--enable-apparmor], [enable apparmor])])
 AS_IF([test "x$enable_apparmor" = "xyes"], [
         HAVE_APPARMOR="-DHAVE_APPARMOR"
-        PKG_CHECK_MODULES([AA], libapparmor,
+        PKG_CHECK_MODULES([AA], [libapparmor],
             [EXTRA_CFLAGS="$EXTRA_CFLAGS $AA_CFLAGS" && EXTRA_LDFLAGS="$EXTRA_LDFLAGS $AA_LIBS"])
-        AC_SUBST(HAVE_APPARMOR)
 ])
 
 HAVE_SELINUX=""
+AC_SUBST([HAVE_SELINUX])
 AC_ARG_ENABLE([selinux],
-    AS_HELP_STRING([--enable-selinux], [SELinux labeling support]))
+    [AS_HELP_STRING([--enable-selinux], [SELinux labeling support])])
 AS_IF([test "x$enable_selinux" = "xyes"], [
         HAVE_SELINUX="-DHAVE_SELINUX"
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lselinux "
-        AC_SUBST(HAVE_SELINUX)
+        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lselinux"
 ])
 
 AC_SUBST([EXTRA_CFLAGS])
@@ -78,220 +80,187 @@ AC_SUBST([EXTRA_LDFLAGS])
 
 
 HAVE_DBUSPROXY=""
+AC_SUBST([HAVE_DBUSPROXY])
 AC_ARG_ENABLE([dbusproxy],
-    AS_HELP_STRING([--disable-dbusproxy], [disable dbus proxy]))
+    [AS_HELP_STRING([--disable-dbusproxy], [disable dbus proxy])])
 AS_IF([test "x$enable_dbusproxy" != "xno"], [
         HAVE_DBUSPROXY="-DHAVE_DBUSPROXY"
-        AC_SUBST(HAVE_DBUSPROXY)
 ])
 
 # overlayfs features temporarily disabled pending fixes
 HAVE_OVERLAYFS=""
-AC_SUBST(HAVE_OVERLAYFS)
-#
+AC_SUBST([HAVE_OVERLAYFS])
 #AC_ARG_ENABLE([overlayfs],
-#    AS_HELP_STRING([--disable-overlayfs], [disable overlayfs]))
+#    [AS_HELP_STRING([--disable-overlayfs], [disable overlayfs])])
 #AS_IF([test "x$enable_overlayfs" != "xno"], [
 #       HAVE_OVERLAYFS="-DHAVE_OVERLAYFS"
-#       AC_SUBST(HAVE_OVERLAYFS)
 #])
 
 HAVE_OUTPUT=""
+AC_SUBST([HAVE_OUTPUT])
 AC_ARG_ENABLE([output],
-    AS_HELP_STRING([--disable-output], [disable --output logging]))
+    [AS_HELP_STRING([--disable-output], [disable --output logging])])
 AS_IF([test "x$enable_output" != "xno"], [
         HAVE_OUTPUT="-DHAVE_OUTPUT"
-        AC_SUBST(HAVE_OUTPUT)
 ])
 
 HAVE_USERTMPFS=""
+AC_SUBST([HAVE_USERTMPFS])
 AC_ARG_ENABLE([usertmpfs],
-    AS_HELP_STRING([--disable-usertmpfs], [disable tmpfs as regular user]))
+    [AS_HELP_STRING([--disable-usertmpfs], [disable tmpfs as regular user])])
 AS_IF([test "x$enable_usertmpfs" != "xno"], [
         HAVE_USERTMPFS="-DHAVE_USERTMPFS"
-        AC_SUBST(HAVE_USERTMPFS)
 ])
 
 HAVE_MAN="no"
+AC_SUBST([HAVE_MAN])
 AC_ARG_ENABLE([man],
-    AS_HELP_STRING([--disable-man], [disable man pages]))
+    [AS_HELP_STRING([--disable-man], [disable man pages])])
 AS_IF([test "x$enable_man" != "xno"], [
         HAVE_MAN="-DHAVE_MAN"
-        AC_SUBST(HAVE_MAN)
         AC_CHECK_PROG([HAVE_GAWK], [gawk], [yes], [no])
-        AS_IF([test "x$HAVE_GAWK" != "xyes"], [AC_MSG_ERROR("*** gawk not found ***")])
+        AS_IF([test "x$HAVE_GAWK" != "xyes"], [AC_MSG_ERROR([*** gawk not found ***])])
 ])
 
 HAVE_FIRETUNNEL=""
+AC_SUBST([HAVE_FIRETUNNEL])
 AC_ARG_ENABLE([firetunnel],
-    AS_HELP_STRING([--disable-firetunnel], [disable firetunnel]))
+    [AS_HELP_STRING([--disable-firetunnel], [disable firetunnel])])
 AS_IF([test "x$enable_firetunnel" != "xno"], [
         HAVE_FIRETUNNEL="-DHAVE_FIRETUNNEL"
-        AC_SUBST(HAVE_FIRETUNNEL)
 ])
 
 HAVE_PRIVATEHOME=""
+AC_SUBST([HAVE_PRIVATE_HOME])
 AC_ARG_ENABLE([private-home],
-    AS_HELP_STRING([--disable-private-home], [disable private home feature]))
+    [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_CHROOT=""
+AC_SUBST([HAVE_CHROOT])
 AC_ARG_ENABLE([chroot],
-    AS_HELP_STRING([--disable-chroot], [disable chroot]))
+    [AS_HELP_STRING([--disable-chroot], [disable chroot])])
 AS_IF([test "x$enable_chroot" != "xno"], [
         HAVE_CHROOT="-DHAVE_CHROOT"
-        AC_SUBST(HAVE_CHROOT)
 ])
 
 HAVE_GLOBALCFG=""
+AC_SUBST([HAVE_GLOBALCFG])
 AC_ARG_ENABLE([globalcfg],
-    AS_HELP_STRING([--disable-globalcfg], [if the global config file firejail.cfg is not present, continue the program using defaults]))
+    [AS_HELP_STRING([--disable-globalcfg],
+        [if the global config file firejail.cfg is not present, continue the program using defaults])])
 AS_IF([test "x$enable_globalcfg" != "xno"], [
         HAVE_GLOBALCFG="-DHAVE_GLOBALCFG"
-        AC_SUBST(HAVE_GLOBALCFG)
 ])
 
 HAVE_NETWORK=""
+AC_SUBST([HAVE_NETWORK])
 AC_ARG_ENABLE([network],
-    AS_HELP_STRING([--disable-network], [disable network]))
+    [AS_HELP_STRING([--disable-network], [disable network])])
 AS_IF([test "x$enable_network" != "xno"], [
         HAVE_NETWORK="-DHAVE_NETWORK"
-        AC_SUBST(HAVE_NETWORK)
 ])
 
 HAVE_USERNS=""
+AC_SUBST([HAVE_USERNS])
 AC_ARG_ENABLE([userns],
-    AS_HELP_STRING([--disable-userns], [disable user namespace]))
+    [AS_HELP_STRING([--disable-userns], [disable user namespace])])
 AS_IF([test "x$enable_userns" != "xno"], [
         HAVE_USERNS="-DHAVE_USERNS"
-        AC_SUBST(HAVE_USERNS)
 ])
 
 HAVE_X11=""
+AC_SUBST([HAVE_X11])
 AC_ARG_ENABLE([x11],
-    AS_HELP_STRING([--disable-x11], [disable X11 sandboxing support]))
+    [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_SUBST([HAVE_FILE_TRANSFER])
 AC_ARG_ENABLE([file-transfer],
-    AS_HELP_STRING([--disable-file-transfer], [disable file transfer]))
+    [AS_HELP_STRING([--disable-file-transfer], [disable file transfer])])
 AS_IF([test "x$enable_file_transfer" != "xno"], [
         HAVE_FILE_TRANSFER="-DHAVE_FILE_TRANSFER"
-        AC_SUBST(HAVE_FILE_TRANSFER)
 ])
 
 HAVE_SUID=""
+AC_SUBST([HAVE_SUID])
 AC_ARG_ENABLE([suid],
-    AS_HELP_STRING([--disable-suid], [install as a non-SUID executable]))
-AS_IF([test "x$enable_suid" = "xno"],
-        [HAVE_SUID="no"],
-        [HAVE_SUID="yes"]
-)
-AC_SUBST(HAVE_SUID)
+    [AS_HELP_STRING([--disable-suid], [install as a non-SUID executable])])
+AS_IF([test "x$enable_suid" != "xno"], [
+        HAVE_SUID="-DHAVE_SUID"
+])
 
 HAVE_FATAL_WARNINGS=""
+AC_SUBST([HAVE_FATAL_WARNINGS])
 AC_ARG_ENABLE([fatal_warnings],
-    AS_HELP_STRING([--enable-fatal-warnings], [-W -Wall -Werror]))
+    [AS_HELP_STRING([--enable-fatal-warnings], [-W -Wall -Werror])])
 AS_IF([test "x$enable_fatal_warnings" = "xyes"], [
         HAVE_FATAL_WARNINGS="-W -Wall -Werror"
-        AC_SUBST(HAVE_FATAL_WARNINGS)
 ])
 
 BUSYBOX_WORKAROUND="no"
+AC_SUBST([BUSYBOX_WORKAROUND])
 AC_ARG_ENABLE([busybox-workaround],
-    AS_HELP_STRING([--enable-busybox-workaround], [enable busybox workaround]))
+    [AS_HELP_STRING([--enable-busybox-workaround], [enable busybox workaround])])
 AS_IF([test "x$enable_busybox_workaround" = "xyes"], [
         BUSYBOX_WORKAROUND="yes"
-        AC_SUBST(BUSYBOX_WORKAROUND)
 ])
 
 
 HAVE_GCOV=""
+AC_SUBST([HAVE_GCOV])
 AC_ARG_ENABLE([gcov],
-    AS_HELP_STRING([--enable-gcov], [Gcov instrumentation]))
+    [AS_HELP_STRING([--enable-gcov], [Gcov instrumentation])])
 AS_IF([test "x$enable_gcov" = "xyes"], [
-        HAVE_GCOV="--coverage -DHAVE_GCOV "
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lgcov --coverage "
-        AC_SUBST(HAVE_GCOV)
+        HAVE_GCOV="--coverage -DHAVE_GCOV"
+        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lgcov --coverage"
 ])
 
 HAVE_CONTRIB_INSTALL="yes"
+AC_SUBST([HAVE_CONTRIB_INSTALL])
 AC_ARG_ENABLE([contrib-install],
-    AS_HELP_STRING([--enable-contrib-install], [install contrib scripts]))
-AS_IF([test "x$enable_contrib_install" = "xno"],
-        [HAVE_CONTRIB_INSTALL="no"],
-        [HAVE_CONTRIB_INSTALL="yes"]
-)
-AC_SUBST(HAVE_CONTRIB_INSTALL)
+    [AS_HELP_STRING([--enable-contrib-install], [install contrib scripts])])
+AS_IF([test "x$enable_contrib_install" = "xno"], [
+       HAVE_CONTRIB_INSTALL="no"
+])
 
 HAVE_FORCE_NONEWPRIVS=""
+AC_SUBST([HAVE_FORCE_NONEWPRIVS])
 AC_ARG_ENABLE([force-nonewprivs],
-    AS_HELP_STRING([--enable-force-nonewprivs], [enable force nonewprivs]))
+    [AS_HELP_STRING([--enable-force-nonewprivs], [enable force nonewprivs])])
 AS_IF([test "x$enable_force_nonewprivs" = "xyes"], [
         HAVE_FORCE_NONEWPRIVS="-DHAVE_FORCE_NONEWPRIVS"
-        AC_SUBST(HAVE_FORCE_NONEWPRIVS)
 ])
 
 HAVE_LTS=""
+AC_SUBST([HAVE_LTS])
 AC_ARG_ENABLE([lts],
-    AS_HELP_STRING([--enable-lts], [enable long-term support software version (LTS)]))
+    [AS_HELP_STRING([--enable-lts], [enable long-term support software version (LTS)])])
 AS_IF([test "x$enable_lts" = "xyes"], [
         HAVE_LTS="-DHAVE_LTS"
-        AC_SUBST(HAVE_LTS)
-
         HAVE_DBUSPROXY=""
-        AC_SUBST(HAVE_DBUSPROXY)
-
         HAVE_OVERLAYFS=""
-        AC_SUBST(HAVE_OVERLAYFS)
-
         HAVE_OUTPUT=""
-        AC_SUBST(HAVE_OUTPUT)
-
         HAVE_USERTMPFS=""
-        AC_SUBST(HAVE_USERTMPFS)
-
         HAVE_MAN="-DHAVE_MAN"
-        AC_SUBST(HAVE_MAN)
-
         HAVE_FIRETUNNEL=""
-        AC_SUBST(HAVE_FIRETUNNEL)
-
         HAVE_PRIVATEHOME=""
-        AC_SUBST(HAVE_PRIVATE_HOME)
-
         HAVE_CHROOT=""
-        AC_SUBST(HAVE_CHROOT)
-
         HAVE_GLOBALCFG=""
-        AC_SUBST(HAVE_GLOBALCFG)
-
         HAVE_USERNS=""
-        AC_SUBST(HAVE_USERNS)
-
         HAVE_X11=""
-        AC_SUBST(HAVE_X11)
-
         HAVE_FILE_TRANSFER=""
-        AC_SUBST(HAVE_FILE_TRANSFER)
-
-        HAVE_SUID="yes"
-        AC_SUBST(HAVE_SUID)
-
+        HAVE_SUID="-DHAVE_SUID"
         BUSYBOX_WORKAROUND="no"
-        AC_SUBST(BUSYBOX_WORKAROUND)
-
         HAVE_CONTRIB_INSTALL="no",
-        AC_SUBST(HAVE_CONTRIB_INSTALL)
 ])
 
-AC_CHECK_HEADER([linux/seccomp.h],,AC_MSG_ERROR([*** SECCOMP support is not installed (/usr/include/linux/seccomp.h missing) ***]))
+AC_CHECK_HEADER([linux/seccomp.h], [], AC_MSG_ERROR([*** SECCOMP support is not installed (/usr/include/linux/seccomp.h missing) ***]))
 
 # set sysconfdir
 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@
 HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@
 HAVE_GCOV=@HAVE_GCOV@
 HAVE_SELINUX=@HAVE_SELINUX@
-ifeq (@HAVE_SUID@, yes)
-HAVE_SUID=-DHAVE_SUID
-else
-HAVE_SUID=
-endif
+HAVE_SUID=@HAVE_SUID@
 HAVE_DBUSPROXY=@HAVE_DBUSPROXY@
 HAVE_USERTMPFS=@HAVE_USERTMPFS@
 HAVE_OUTPUT=@HAVE_OUTPUT@