diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index f14b3812c..c3ca7d912 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,12 +1,10 @@ | |||
1 | AC_PREREQ([2.68]) | 1 | AC_PREREQ([2.68]) |
2 | AC_INIT(firejail, 0.9.61, netblue30@yahoo.com, , https://firejail.wordpress.com) | 2 | AC_INIT(firejail, 0.9.61, netblue30@yahoo.com, , https://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]) | ||
5 | 4 | ||
6 | AC_CONFIG_MACRO_DIR([m4]) | 5 | AC_CONFIG_MACRO_DIR([m4]) |
7 | 6 | ||
8 | AC_PROG_CC | 7 | AC_PROG_CC |
9 | #AC_PROG_CXX | ||
10 | AC_PROG_INSTALL | 8 | AC_PROG_INSTALL |
11 | AC_PROG_RANLIB | 9 | AC_PROG_RANLIB |
12 | 10 | ||
@@ -19,25 +17,20 @@ AX_CHECK_COMPILE_FLAG( | |||
19 | [-mretpoline], | 17 | [-mretpoline], |
20 | [HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -mretpoline"] | 18 | [HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -mretpoline"] |
21 | ) | 19 | ) |
22 | AC_SUBST([EXTRA_CFLAGS]) | ||
23 | 20 | ||
24 | HAVE_APPARMOR="" | 21 | HAVE_APPARMOR="" |
25 | AC_ARG_ENABLE([apparmor], | 22 | AC_ARG_ENABLE([apparmor], |
26 | AS_HELP_STRING([--enable-apparmor], [enable apparmor])) | 23 | AS_HELP_STRING([--enable-apparmor], [enable apparmor])) |
27 | AS_IF([test "x$enable_apparmor" = "xyes"], [ | 24 | AS_IF([test "x$enable_apparmor" = "xyes"], [ |
28 | HAVE_APPARMOR="-DHAVE_APPARMOR" | 25 | HAVE_APPARMOR="-DHAVE_APPARMOR" |
26 | PKG_CHECK_MODULES([AA], libapparmor, [EXTRA_CFLAGS+=" $AA_CFLAGS" && EXTRA_LDFLAGS+=" $AA_LIBS"]) | ||
29 | AC_SUBST(HAVE_APPARMOR) | 27 | AC_SUBST(HAVE_APPARMOR) |
30 | ]) | 28 | ]) |
31 | 29 | ||
32 | AS_IF([test "x$enable_apparmor" = "xyes"], [ | 30 | AC_SUBST([EXTRA_CFLAGS]) |
33 | AC_CHECK_HEADER(sys/apparmor.h, , [AC_MSG_ERROR( | ||
34 | [Couldn't find sys/apparmor.h... please install apparmor user space library and development files] )]) | ||
35 | ]) | ||
36 | AS_IF([test "x$enable_apparmor" = "xyes"], [ | ||
37 | EXTRA_LDFLAGS+=" -lapparmor " | ||
38 | ]) | ||
39 | AC_SUBST([EXTRA_LDFLAGS]) | 31 | AC_SUBST([EXTRA_LDFLAGS]) |
40 | 32 | ||
33 | |||
41 | HAVE_OVERLAYFS="" | 34 | HAVE_OVERLAYFS="" |
42 | AC_ARG_ENABLE([overlayfs], | 35 | AC_ARG_ENABLE([overlayfs], |
43 | AS_HELP_STRING([--disable-overlayfs], [disable overlayfs])) | 36 | AS_HELP_STRING([--disable-overlayfs], [disable overlayfs])) |