diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 10 |
1 files changed, 3 insertions, 7 deletions
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) | |||
3 | AC_CONFIG_SRCDIR([src/firejail/main.c]) | 3 | AC_CONFIG_SRCDIR([src/firejail/main.c]) |
4 | #AC_CONFIG_HEADERS([config.h]) | 4 | #AC_CONFIG_HEADERS([config.h]) |
5 | 5 | ||
6 | |||
7 | AC_PROG_CC | 6 | AC_PROG_CC |
8 | #AC_PROG_CXX | 7 | #AC_PROG_CXX |
9 | AC_PROG_INSTALL | 8 | AC_PROG_INSTALL |
10 | AC_PROG_RANLIB | 9 | AC_PROG_RANLIB |
11 | 10 | ||
12 | |||
13 | HAVE_SPECTRE="no" | 11 | HAVE_SPECTRE="no" |
14 | AC_MSG_CHECKING(for Spectre mitigation support in gcc compiler) | 12 | AC_MSG_CHECKING(for Spectre mitigation support in gcc compiler) |
15 | AS_IF([test "$CC" = "gcc"], [ | 13 | AS_IF([test "$CC" = "gcc"], [ |
@@ -19,14 +17,13 @@ AS_IF([test "$CC" = "gcc"], [ | |||
19 | ]) | 17 | ]) |
20 | AS_IF([test "$HAVE_SPECTRE" = "yes"], [ | 18 | AS_IF([test "$HAVE_SPECTRE" = "yes"], [ |
21 | AC_MSG_RESULT(yes) | 19 | AC_MSG_RESULT(yes) |
22 | EXTRA_CFLAGS+="-mindirect-branch=thunk" | 20 | EXTRA_CFLAGS+=" -mindirect-branch=thunk " |
23 | ]) | 21 | ]) |
24 | AS_IF([test "$HAVE_SPECTRE" = "no"], [ | 22 | AS_IF([test "$HAVE_SPECTRE" = "no"], [ |
25 | AC_MSG_RESULT(... not available) | 23 | AC_MSG_RESULT(... not available) |
26 | ]) | 24 | ]) |
27 | AC_SUBST([EXTRA_CFLAGS]) | 25 | AC_SUBST([EXTRA_CFLAGS]) |
28 | 26 | ||
29 | |||
30 | HAVE_APPARMOR="" | 27 | HAVE_APPARMOR="" |
31 | AC_ARG_ENABLE([apparmor], | 28 | AC_ARG_ENABLE([apparmor], |
32 | AS_HELP_STRING([--enable-apparmor], [enable apparmor])) | 29 | AS_HELP_STRING([--enable-apparmor], [enable apparmor])) |
@@ -35,13 +32,12 @@ AS_IF([test "x$enable_apparmor" = "xyes"], [ | |||
35 | AC_SUBST(HAVE_APPARMOR) | 32 | AC_SUBST(HAVE_APPARMOR) |
36 | ]) | 33 | ]) |
37 | 34 | ||
38 | |||
39 | AS_IF([test "x$enable_apparmor" = "xyes"], [ | 35 | AS_IF([test "x$enable_apparmor" = "xyes"], [ |
40 | AC_CHECK_HEADER(sys/apparmor.h, , [AC_MSG_ERROR( | 36 | AC_CHECK_HEADER(sys/apparmor.h, , [AC_MSG_ERROR( |
41 | [Couldn't find sys/apparmor.h... please install apparmor user space library and development files] )]) | 37 | [Couldn't find sys/apparmor.h... please install apparmor user space library and development files] )]) |
42 | ]) | 38 | ]) |
43 | AS_IF([test "x$enable_apparmor" = "xyes"], [ | 39 | AS_IF([test "x$enable_apparmor" = "xyes"], [ |
44 | EXTRA_LDFLAGS+="-lapparmor " | 40 | EXTRA_LDFLAGS+=" -lapparmor " |
45 | ]) | 41 | ]) |
46 | AC_SUBST([EXTRA_LDFLAGS]) | 42 | AC_SUBST([EXTRA_LDFLAGS]) |
47 | 43 | ||
@@ -160,7 +156,7 @@ AC_ARG_ENABLE([gcov], | |||
160 | AS_HELP_STRING([--enable-gcov], [Gcov instrumentation])) | 156 | AS_HELP_STRING([--enable-gcov], [Gcov instrumentation])) |
161 | AS_IF([test "x$enable_gcov" = "xyes"], [ | 157 | AS_IF([test "x$enable_gcov" = "xyes"], [ |
162 | HAVE_GCOV="--coverage -DHAVE_GCOV " | 158 | HAVE_GCOV="--coverage -DHAVE_GCOV " |
163 | EXTRA_LDFLAGS+="-lgcov --coverage " | 159 | EXTRA_LDFLAGS+=" -lgcov --coverage " |
164 | AC_SUBST(HAVE_GCOV) | 160 | AC_SUBST(HAVE_GCOV) |
165 | ]) | 161 | ]) |
166 | 162 | ||