Merge pull request #5488 from kmk3/configure-fix-format-misc

build: fix formatting and misc in configure

2 files changed, 57 insertions, 50 deletions

diff --git a/configure b/configure
index f3bd77169..4c9ed1a36 100755
--- a/configure
+++ b/configure
@@ -2914,7 +2914,9 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mindirect_branch_thunk" >&5
 $as_echo "$ax_cv_check_cflags___mindirect_branch_thunk" >&6; }
 if test "x$ax_cv_check_cflags___mindirect_branch_thunk" = xyes; then :
-  HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -mindirect-branch=thunk"
+
+        HAVE_SPECTRE="yes"
+        EXTRA_CFLAGS="$EXTRA_CFLAGS -mindirect-branch=thunk"
 
 else
   :
@@ -2950,7 +2952,9 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mretpoline" >&5
 $as_echo "$ax_cv_check_cflags___mretpoline" >&6; }
 if test "x$ax_cv_check_cflags___mretpoline" = xyes; then :
-  HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -mretpoline"
+
+        HAVE_SPECTRE="yes"
+        EXTRA_CFLAGS="$EXTRA_CFLAGS -mretpoline"
 
 else
   :
@@ -2986,7 +2990,9 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fstack_clash_protection" >&5
 $as_echo "$ax_cv_check_cflags___fstack_clash_protection" >&6; }
 if test "x$ax_cv_check_cflags___fstack_clash_protection" = xyes; then :
-  HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-clash-protection"
+
+        HAVE_SPECTRE="yes"
+        EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-clash-protection"
 
 else
   :
@@ -3022,7 +3028,9 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fstack_protector_strong" >&5
 $as_echo "$ax_cv_check_cflags___fstack_protector_strong" >&6; }
 if test "x$ax_cv_check_cflags___fstack_protector_strong" = xyes; then :
-  HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-protector-strong"
+
+        HAVE_SPECTRE="yes"
+        EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-protector-strong"
 
 else
   :
@@ -3048,7 +3056,8 @@ else
 fi
 
 if test "x$enable_sanitizer" != "xno" ; then :
-  as_CACHEVAR=`$as_echo "ax_cv_check_cflags__-fsanitize=$enable_sanitizer" | $as_tr_sh`
+
+        as_CACHEVAR=`$as_echo "ax_cv_check_cflags__-fsanitize=$enable_sanitizer" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=$enable_sanitizer" >&5
 $as_echo_n "checking whether C compiler accepts -fsanitize=$enable_sanitizer... " >&6; }
 if eval \${$as_CACHEVAR+:} false; then :
@@ -3086,9 +3095,9 @@ if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
 
 else
   as_fn_error $? "sanitizer not supported: $enable_sanitizer" "$LINENO" 5
-
 fi
 
+
 fi
 
 HAVE_IDS=""
@@ -3323,7 +3332,10 @@ else
         AA_LIBS=$pkg_cv_AA_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        EXTRA_CFLAGS="$EXTRA_CFLAGS $AA_CFLAGS" && EXTRA_LDFLAGS="$EXTRA_LDFLAGS $AA_LIBS"
+
+                EXTRA_CFLAGS="$EXTRA_CFLAGS $AA_CFLAGS"
+                EXTRA_LDFLAGS="$EXTRA_LDFLAGS $AA_LIBS"
+
 fi
 
 fi
@@ -3345,7 +3357,6 @@ fi
 
 
 
-
 HAVE_DBUSPROXY=""
 
 # Check whether --enable-dbusproxy was given.
@@ -3591,7 +3602,6 @@ if test "x$enable_busybox_workaround" = "xyes"; then :
 
 fi
 
-
 HAVE_GCOV=""
 
 # Check whether --enable-gcov was given.
@@ -3615,7 +3625,7 @@ fi
 
 if test "x$enable_contrib_install" = "xno"; then :
 
-       HAVE_CONTRIB_INSTALL="no"
+        HAVE_CONTRIB_INSTALL="no"
 
 fi
 
@@ -3641,7 +3651,7 @@ fi
 
 if test "x$enable_only_syscfg_profiles" = "xyes"; then :
 
-    HAVE_ONLY_SYSCFG_PROFILES="-DHAVE_ONLY_SYSCFG_PROFILES"
+        HAVE_ONLY_SYSCFG_PROFILES="-DHAVE_ONLY_SYSCFG_PROFILES"
 
 fi
 
@@ -3670,7 +3680,7 @@ if test "x$enable_lts" = "xyes"; then :
         HAVE_FILE_TRANSFER=""
         HAVE_SUID="-DHAVE_SUID"
         BUSYBOX_WORKAROUND="no"
-        HAVE_CONTRIB_INSTALL="no",
+        HAVE_CONTRIB_INSTALL="no"
 
 fi
 
@@ -5284,13 +5294,10 @@ EOF
 
 if test "$HAVE_LTS" = -DHAVE_LTS; then
         cat <<\EOF
-
-
 *********************************************************
 *    Warning: Long-term support (LTS) was enabled!      *
-*    Most compile-time options have bean rewritten!     *
+*    Most compile-time options have been rewritten!     *
 *********************************************************
 
-
 EOF
 fi
diff --git a/configure.ac b/configure.ac
index 8a488ff43..e418b72bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,22 +21,22 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_CC
 
 HAVE_SPECTRE="no"
-AX_CHECK_COMPILE_FLAG(
-    [-mindirect-branch=thunk],
-    [HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -mindirect-branch=thunk"]
-)
-AX_CHECK_COMPILE_FLAG(
-    [-mretpoline],
-    [HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -mretpoline"]
-)
-AX_CHECK_COMPILE_FLAG(
-    [-fstack-clash-protection],
-    [HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-clash-protection"]
-)
-AX_CHECK_COMPILE_FLAG(
-    [-fstack-protector-strong],
-    [HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-protector-strong"]
-)
+AX_CHECK_COMPILE_FLAG([-mindirect-branch=thunk], [
+        HAVE_SPECTRE="yes"
+        EXTRA_CFLAGS="$EXTRA_CFLAGS -mindirect-branch=thunk"
+])
+AX_CHECK_COMPILE_FLAG([-mretpoline], [
+        HAVE_SPECTRE="yes"
+        EXTRA_CFLAGS="$EXTRA_CFLAGS -mretpoline"
+])
+AX_CHECK_COMPILE_FLAG([-fstack-clash-protection], [
+        HAVE_SPECTRE="yes"
+        EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-clash-protection"
+])
+AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [
+        HAVE_SPECTRE="yes"
+        EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-protector-strong"
+])
 
 AC_ARG_ENABLE([analyzer],
     [AS_HELP_STRING([--enable-analyzer], [enable GCC static analyzer])])
@@ -45,14 +45,16 @@ AS_IF([test "x$enable_analyzer" = "xyes"], [
 ])
 
 AC_ARG_ENABLE([sanitizer],
-    [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], [
+    [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"
                 EXTRA_LDFLAGS="$EXTRA_LDFLAGS -fsanitize=$enable_sanitizer"
-        ], [AC_MSG_ERROR([sanitizer not supported: $enable_sanitizer])]
-)])
+        ], [AC_MSG_ERROR([sanitizer not supported: $enable_sanitizer])])
+])
 
 HAVE_IDS=""
 AC_SUBST([HAVE_IDS])
@@ -68,8 +70,10 @@ AC_ARG_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],
-            [EXTRA_CFLAGS="$EXTRA_CFLAGS $AA_CFLAGS" && EXTRA_LDFLAGS="$EXTRA_LDFLAGS $AA_LIBS"])
+        PKG_CHECK_MODULES([AA], [libapparmor], [
+                EXTRA_CFLAGS="$EXTRA_CFLAGS $AA_CFLAGS"
+                EXTRA_LDFLAGS="$EXTRA_LDFLAGS $AA_LIBS"
+        ])
 ])
 
 HAVE_SELINUX=""
@@ -84,7 +88,6 @@ AS_IF([test "x$enable_selinux" = "xyes"], [
 AC_SUBST([EXTRA_CFLAGS])
 AC_SUBST([EXTRA_LDFLAGS])
 
-
 HAVE_DBUSPROXY=""
 AC_SUBST([HAVE_DBUSPROXY])
 AC_ARG_ENABLE([dbusproxy],
@@ -217,7 +220,6 @@ AS_IF([test "x$enable_busybox_workaround" = "xyes"], [
         BUSYBOX_WORKAROUND="yes"
 ])
 
-
 HAVE_GCOV=""
 AC_SUBST([HAVE_GCOV])
 AC_ARG_ENABLE([gcov],
@@ -232,7 +234,7 @@ 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="no"
 ])
 
 HAVE_FORCE_NONEWPRIVS=""
@@ -248,7 +250,7 @@ AC_SUBST([HAVE_ONLY_SYSCFG_PROFILES])
 AC_ARG_ENABLE([only-syscfg-profiles],
     [AS_HELP_STRING([--enable-only-syscfg-profiles], [disable profiles in $HOME/.config/firejail])])
 AS_IF([test "x$enable_only_syscfg_profiles" = "xyes"], [
-    HAVE_ONLY_SYSCFG_PROFILES="-DHAVE_ONLY_SYSCFG_PROFILES"
+        HAVE_ONLY_SYSCFG_PROFILES="-DHAVE_ONLY_SYSCFG_PROFILES"
 ])
 
 HAVE_LTS=""
@@ -272,10 +274,11 @@ AS_IF([test "x$enable_lts" = "xyes"], [
         HAVE_FILE_TRANSFER=""
         HAVE_SUID="-DHAVE_SUID"
         BUSYBOX_WORKAROUND="no"
-        HAVE_CONTRIB_INSTALL="no",
+        HAVE_CONTRIB_INSTALL="no"
 ])
 
-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
@@ -324,13 +327,10 @@ EOF
 
 if test "$HAVE_LTS" = -DHAVE_LTS; then
         cat <<\EOF
-
-
 *********************************************************
 *    Warning: Long-term support (LTS) was enabled!      *
-*    Most compile-time options have bean rewritten!     *
+*    Most compile-time options have been rewritten!     *
 *********************************************************
 
-
 EOF
 fi