diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 952dec3b8..9a7a9d65e 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -3,12 +3,27 @@ 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 | ||
11 | HAVE_SPECTRE="no" | ||
12 | AC_MSG_CHECKING(for Spectre mitigation support in gcc compiler) | ||
13 | AS_IF([test "$CC" = "gcc"], [ | ||
14 | HAVE_SPECTRE="yes" | ||
15 | $CC -mindirect-branch=thunk -c dummy.c || HAVE_SPECTRE="no" | ||
16 | rm -f dummy.o | ||
17 | ]) | ||
18 | AS_IF([test "$HAVE_SPECTRE" = "yes"], [ | ||
19 | AC_MSG_RESULT(yes) | ||
20 | EXTRA_CFLAGS+=" -mindirect-branch=thunk " | ||
21 | ]) | ||
22 | AS_IF([test "$HAVE_SPECTRE" = "no"], [ | ||
23 | AC_MSG_RESULT(... not available) | ||
24 | ]) | ||
25 | AC_SUBST([EXTRA_CFLAGS]) | ||
26 | |||
12 | HAVE_APPARMOR="" | 27 | HAVE_APPARMOR="" |
13 | AC_ARG_ENABLE([apparmor], | 28 | AC_ARG_ENABLE([apparmor], |
14 | AS_HELP_STRING([--enable-apparmor], [enable apparmor])) | 29 | AS_HELP_STRING([--enable-apparmor], [enable apparmor])) |
@@ -17,13 +32,12 @@ AS_IF([test "x$enable_apparmor" = "xyes"], [ | |||
17 | AC_SUBST(HAVE_APPARMOR) | 32 | AC_SUBST(HAVE_APPARMOR) |
18 | ]) | 33 | ]) |
19 | 34 | ||
20 | |||
21 | AS_IF([test "x$enable_apparmor" = "xyes"], [ | 35 | AS_IF([test "x$enable_apparmor" = "xyes"], [ |
22 | AC_CHECK_HEADER(sys/apparmor.h, , [AC_MSG_ERROR( | 36 | AC_CHECK_HEADER(sys/apparmor.h, , [AC_MSG_ERROR( |
23 | [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] )]) |
24 | ]) | 38 | ]) |
25 | AS_IF([test "x$enable_apparmor" = "xyes"], [ | 39 | AS_IF([test "x$enable_apparmor" = "xyes"], [ |
26 | EXTRA_LDFLAGS+="-lapparmor " | 40 | EXTRA_LDFLAGS+=" -lapparmor " |
27 | ]) | 41 | ]) |
28 | AC_SUBST([EXTRA_LDFLAGS]) | 42 | AC_SUBST([EXTRA_LDFLAGS]) |
29 | 43 | ||
@@ -142,7 +156,7 @@ AC_ARG_ENABLE([gcov], | |||
142 | AS_HELP_STRING([--enable-gcov], [Gcov instrumentation])) | 156 | AS_HELP_STRING([--enable-gcov], [Gcov instrumentation])) |
143 | AS_IF([test "x$enable_gcov" = "xyes"], [ | 157 | AS_IF([test "x$enable_gcov" = "xyes"], [ |
144 | HAVE_GCOV="--coverage -DHAVE_GCOV " | 158 | HAVE_GCOV="--coverage -DHAVE_GCOV " |
145 | EXTRA_LDFLAGS+="-lgcov --coverage " | 159 | EXTRA_LDFLAGS+=" -lgcov --coverage " |
146 | AC_SUBST(HAVE_GCOV) | 160 | AC_SUBST(HAVE_GCOV) |
147 | ]) | 161 | ]) |
148 | 162 | ||
@@ -198,7 +212,9 @@ echo " file transfer support: $HAVE_FILE_TRANSFER" | |||
198 | echo " overlayfs support: $HAVE_OVERLAYFS" | 212 | echo " overlayfs support: $HAVE_OVERLAYFS" |
199 | echo " git install support: $HAVE_GIT_INSTALL" | 213 | echo " git install support: $HAVE_GIT_INSTALL" |
200 | echo " busybox workaround: $BUSYBOX_WORKAROUND" | 214 | echo " busybox workaround: $BUSYBOX_WORKAROUND" |
215 | echo " Spectre compiler patch: $HAVE_SPECTRE" | ||
201 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" | 216 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" |
217 | echo " EXTRA_CFLAGS: $EXTRA_CFLAGS" | ||
202 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" | 218 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" |
203 | echo " Gcov instrumentation: $HAVE_GCOV" | 219 | echo " Gcov instrumentation: $HAVE_GCOV" |
204 | echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL" | 220 | echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL" |