configure*: wrap long shell command output lines

Instead of binding them together with conditionals in a single line,
split shell commands into multiple lines to make them more readable.

Note that for the macro arguments in question, the content inside []
quotes is output literally into ./configure, so the commands can be
written as if they were in a shell script directly (save for any special
characters/tokens in Autoconf).

Misc: Relates to commit 2c64d1fdd ("use AX_CHECK_COMPILE_FLAG to check
for spectre flags", 2019-06-21).

2 files changed, 36 insertions, 23 deletions

diff --git a/configure b/configure
index 1f5be1cba..52b9143b6 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
   :
@@ -3323,7 +3331,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
diff --git a/configure.ac b/configure.ac
index a78688e09..9cc20d94a 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])])
@@ -68,8 +68,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=""