fixes

3 files changed, 7 insertions, 15 deletions

diff --git a/configure b/configure
index 80f66f8b3..0ccaad051 100755
--- a/configure
+++ b/configure
@@ -2100,7 +2100,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 #AC_CONFIG_HEADERS([config.h])
 
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3106,7 +3105,6 @@ else
 fi
 
 
-
 HAVE_SPECTRE="no"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Spectre mitigation support in gcc compiler" >&5
 $as_echo_n "checking for Spectre mitigation support in gcc compiler... " >&6; }
@@ -3121,7 +3119,7 @@ if test "$HAVE_SPECTRE" = "yes"; then :
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        EXTRA_CFLAGS+="-mindirect-branch=thunk"
+        EXTRA_CFLAGS+=" -mindirect-branch=thunk "
 
 fi
 if test "$HAVE_SPECTRE" = "no"; then :
@@ -3132,7 +3130,6 @@ $as_echo "... not available" >&6; }
 fi
 
 
-
 HAVE_APPARMOR=""
 # Check whether --enable-apparmor was given.
 if test "${enable_apparmor+set}" = set; then :
@@ -3147,7 +3144,6 @@ if test "x$enable_apparmor" = "xyes"; then :
 fi
 
 
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3559,7 +3555,7 @@ fi
 fi
 if test "x$enable_apparmor" = "xyes"; then :
 
-        EXTRA_LDFLAGS+="-lapparmor "
+        EXTRA_LDFLAGS+=" -lapparmor "
 
 fi
 
@@ -3753,7 +3749,7 @@ fi
 if test "x$enable_gcov" = "xyes"; then :
 
         HAVE_GCOV="--coverage -DHAVE_GCOV "
-        EXTRA_LDFLAGS+="-lgcov --coverage "
+        EXTRA_LDFLAGS+=" -lgcov --coverage "
 
 
 fi
diff --git a/configure.ac b/configure.ac
index d6d4eb874..9a7a9d65e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,13 +3,11 @@ AC_INIT(firejail, 0.9.53, netblue30@yahoo.com, , http://firejail.wordpress.com)
 AC_CONFIG_SRCDIR([src/firejail/main.c])
 #AC_CONFIG_HEADERS([config.h])
 
-
 AC_PROG_CC
 #AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 
-
 HAVE_SPECTRE="no"
 AC_MSG_CHECKING(for Spectre mitigation support in gcc compiler)
 AS_IF([test "$CC" = "gcc"], [
@@ -19,14 +17,13 @@ AS_IF([test "$CC" = "gcc"], [
 ])
 AS_IF([test "$HAVE_SPECTRE" = "yes"], [
         AC_MSG_RESULT(yes)
-        EXTRA_CFLAGS+="-mindirect-branch=thunk"
+        EXTRA_CFLAGS+=" -mindirect-branch=thunk "
 ])
 AS_IF([test "$HAVE_SPECTRE" = "no"], [
         AC_MSG_RESULT(... not available)
 ])
 AC_SUBST([EXTRA_CFLAGS])
 
-
 HAVE_APPARMOR=""
 AC_ARG_ENABLE([apparmor],
     AS_HELP_STRING([--enable-apparmor], [enable apparmor]))
@@ -35,13 +32,12 @@ AS_IF([test "x$enable_apparmor" = "xyes"], [
         AC_SUBST(HAVE_APPARMOR)
 ])
 
-
 AS_IF([test "x$enable_apparmor" = "xyes"], [
         AC_CHECK_HEADER(sys/apparmor.h, , [AC_MSG_ERROR(
         [Couldn't find sys/apparmor.h... please install apparmor user space library and development files] )])
 ])
 AS_IF([test "x$enable_apparmor" = "xyes"], [
-        EXTRA_LDFLAGS+="-lapparmor "
+        EXTRA_LDFLAGS+=" -lapparmor "
 ])
 AC_SUBST([EXTRA_LDFLAGS])
 
@@ -160,7 +156,7 @@ AC_ARG_ENABLE([gcov],
     AS_HELP_STRING([--enable-gcov], [Gcov instrumentation]))
 AS_IF([test "x$enable_gcov" = "xyes"], [
         HAVE_GCOV="--coverage -DHAVE_GCOV "
-        EXTRA_LDFLAGS+="-lgcov --coverage "
+        EXTRA_LDFLAGS+=" -lgcov --coverage "
         AC_SUBST(HAVE_GCOV)
 ])
 
diff --git a/src/fsec-print/print.c b/src/fsec-print/print.c
index e3b53c44c..faf59aa35 100644
--- a/src/fsec-print/print.c
+++ b/src/fsec-print/print.c
@@ -269,7 +269,7 @@ static void bpf_decode_args(const struct sock_filter *bpf, unsigned int line) {
                                  native_arch = (ARCH_NR == ARCH_64)? 1: 0;
                         }
                         else if (bpf->k == X32_SYSCALL_BIT)
-                                printf("X32_ABI true:%.4x (false %.4x)",
+                                printf("X32_ABI %.4x (false %.4x)",
                                        (line + 1) + bpf->jt,
                                        (line + 1) + bpf->jf);
                         else if (name)