diff options
author | 2022-12-01 23:26:28 +0100 | |
---|---|---|
committer | 2022-12-01 23:26:28 +0100 | |
commit | d6b0d40a1941a62875dab7f45afd4271b07bc217 (patch) | |
tree | 714151e9350dc61c0b0e823c5fdae3a86837a3e4 /configure.ac | |
parent | firefox-common-addons: fix whitelisting in ${RUNUSER} (#5497) (diff) | |
parent | configure*: quote and line-wrap AC_CHECK_HEADER line (diff) | |
download | firejail-d6b0d40a1941a62875dab7f45afd4271b07bc217.tar.gz firejail-d6b0d40a1941a62875dab7f45afd4271b07bc217.tar.zst firejail-d6b0d40a1941a62875dab7f45afd4271b07bc217.zip |
Merge pull request #5488 from kmk3/configure-fix-format-misc
build: fix formatting and misc in configure
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/configure.ac b/configure.ac index 8a488ff43..e418b72bc 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -21,22 +21,22 @@ AC_CONFIG_MACRO_DIR([m4]) | |||
21 | AC_PROG_CC | 21 | AC_PROG_CC |
22 | 22 | ||
23 | HAVE_SPECTRE="no" | 23 | HAVE_SPECTRE="no" |
24 | AX_CHECK_COMPILE_FLAG( | 24 | AX_CHECK_COMPILE_FLAG([-mindirect-branch=thunk], [ |
25 | [-mindirect-branch=thunk], | 25 | HAVE_SPECTRE="yes" |
26 | [HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -mindirect-branch=thunk"] | 26 | EXTRA_CFLAGS="$EXTRA_CFLAGS -mindirect-branch=thunk" |
27 | ) | 27 | ]) |
28 | AX_CHECK_COMPILE_FLAG( | 28 | AX_CHECK_COMPILE_FLAG([-mretpoline], [ |
29 | [-mretpoline], | 29 | HAVE_SPECTRE="yes" |
30 | [HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -mretpoline"] | 30 | EXTRA_CFLAGS="$EXTRA_CFLAGS -mretpoline" |
31 | ) | 31 | ]) |
32 | AX_CHECK_COMPILE_FLAG( | 32 | AX_CHECK_COMPILE_FLAG([-fstack-clash-protection], [ |
33 | [-fstack-clash-protection], | 33 | HAVE_SPECTRE="yes" |
34 | [HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-clash-protection"] | 34 | EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-clash-protection" |
35 | ) | 35 | ]) |
36 | AX_CHECK_COMPILE_FLAG( | 36 | AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [ |
37 | [-fstack-protector-strong], | 37 | HAVE_SPECTRE="yes" |
38 | [HAVE_SPECTRE="yes" && EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-protector-strong"] | 38 | EXTRA_CFLAGS="$EXTRA_CFLAGS -fstack-protector-strong" |
39 | ) | 39 | ]) |
40 | 40 | ||
41 | AC_ARG_ENABLE([analyzer], | 41 | AC_ARG_ENABLE([analyzer], |
42 | [AS_HELP_STRING([--enable-analyzer], [enable GCC static analyzer])]) | 42 | [AS_HELP_STRING([--enable-analyzer], [enable GCC static analyzer])]) |
@@ -45,14 +45,16 @@ AS_IF([test "x$enable_analyzer" = "xyes"], [ | |||
45 | ]) | 45 | ]) |
46 | 46 | ||
47 | AC_ARG_ENABLE([sanitizer], | 47 | AC_ARG_ENABLE([sanitizer], |
48 | [AS_HELP_STRING([--enable-sanitizer=@<:@address | memory | undefined@:>@], [enable a compiler-based sanitizer (debug)])], | 48 | [AS_HELP_STRING([--enable-sanitizer=@<:@address | memory | undefined@:>@], |
49 | [], [enable_sanitizer=no]) | 49 | [enable a compiler-based sanitizer (debug)])], |
50 | AS_IF([test "x$enable_sanitizer" != "xno" ], | 50 | [], |
51 | [AX_CHECK_COMPILE_FLAG([-fsanitize=$enable_sanitizer], [ | 51 | [enable_sanitizer=no]) |
52 | AS_IF([test "x$enable_sanitizer" != "xno" ], [ | ||
53 | AX_CHECK_COMPILE_FLAG([-fsanitize=$enable_sanitizer], [ | ||
52 | EXTRA_CFLAGS="$EXTRA_CFLAGS -fsanitize=$enable_sanitizer -fno-omit-frame-pointer" | 54 | EXTRA_CFLAGS="$EXTRA_CFLAGS -fsanitize=$enable_sanitizer -fno-omit-frame-pointer" |
53 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -fsanitize=$enable_sanitizer" | 55 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS -fsanitize=$enable_sanitizer" |
54 | ], [AC_MSG_ERROR([sanitizer not supported: $enable_sanitizer])] | 56 | ], [AC_MSG_ERROR([sanitizer not supported: $enable_sanitizer])]) |
55 | )]) | 57 | ]) |
56 | 58 | ||
57 | HAVE_IDS="" | 59 | HAVE_IDS="" |
58 | AC_SUBST([HAVE_IDS]) | 60 | AC_SUBST([HAVE_IDS]) |
@@ -68,8 +70,10 @@ AC_ARG_ENABLE([apparmor], | |||
68 | [AS_HELP_STRING([--enable-apparmor], [enable apparmor])]) | 70 | [AS_HELP_STRING([--enable-apparmor], [enable apparmor])]) |
69 | AS_IF([test "x$enable_apparmor" = "xyes"], [ | 71 | AS_IF([test "x$enable_apparmor" = "xyes"], [ |
70 | HAVE_APPARMOR="-DHAVE_APPARMOR" | 72 | HAVE_APPARMOR="-DHAVE_APPARMOR" |
71 | PKG_CHECK_MODULES([AA], [libapparmor], | 73 | PKG_CHECK_MODULES([AA], [libapparmor], [ |
72 | [EXTRA_CFLAGS="$EXTRA_CFLAGS $AA_CFLAGS" && EXTRA_LDFLAGS="$EXTRA_LDFLAGS $AA_LIBS"]) | 74 | EXTRA_CFLAGS="$EXTRA_CFLAGS $AA_CFLAGS" |
75 | EXTRA_LDFLAGS="$EXTRA_LDFLAGS $AA_LIBS" | ||
76 | ]) | ||
73 | ]) | 77 | ]) |
74 | 78 | ||
75 | HAVE_SELINUX="" | 79 | HAVE_SELINUX="" |
@@ -84,7 +88,6 @@ AS_IF([test "x$enable_selinux" = "xyes"], [ | |||
84 | AC_SUBST([EXTRA_CFLAGS]) | 88 | AC_SUBST([EXTRA_CFLAGS]) |
85 | AC_SUBST([EXTRA_LDFLAGS]) | 89 | AC_SUBST([EXTRA_LDFLAGS]) |
86 | 90 | ||
87 | |||
88 | HAVE_DBUSPROXY="" | 91 | HAVE_DBUSPROXY="" |
89 | AC_SUBST([HAVE_DBUSPROXY]) | 92 | AC_SUBST([HAVE_DBUSPROXY]) |
90 | AC_ARG_ENABLE([dbusproxy], | 93 | AC_ARG_ENABLE([dbusproxy], |
@@ -217,7 +220,6 @@ AS_IF([test "x$enable_busybox_workaround" = "xyes"], [ | |||
217 | BUSYBOX_WORKAROUND="yes" | 220 | BUSYBOX_WORKAROUND="yes" |
218 | ]) | 221 | ]) |
219 | 222 | ||
220 | |||
221 | HAVE_GCOV="" | 223 | HAVE_GCOV="" |
222 | AC_SUBST([HAVE_GCOV]) | 224 | AC_SUBST([HAVE_GCOV]) |
223 | AC_ARG_ENABLE([gcov], | 225 | AC_ARG_ENABLE([gcov], |
@@ -232,7 +234,7 @@ AC_SUBST([HAVE_CONTRIB_INSTALL]) | |||
232 | AC_ARG_ENABLE([contrib-install], | 234 | AC_ARG_ENABLE([contrib-install], |
233 | [AS_HELP_STRING([--enable-contrib-install], [install contrib scripts])]) | 235 | [AS_HELP_STRING([--enable-contrib-install], [install contrib scripts])]) |
234 | AS_IF([test "x$enable_contrib_install" = "xno"], [ | 236 | AS_IF([test "x$enable_contrib_install" = "xno"], [ |
235 | HAVE_CONTRIB_INSTALL="no" | 237 | HAVE_CONTRIB_INSTALL="no" |
236 | ]) | 238 | ]) |
237 | 239 | ||
238 | HAVE_FORCE_NONEWPRIVS="" | 240 | HAVE_FORCE_NONEWPRIVS="" |
@@ -248,7 +250,7 @@ AC_SUBST([HAVE_ONLY_SYSCFG_PROFILES]) | |||
248 | AC_ARG_ENABLE([only-syscfg-profiles], | 250 | AC_ARG_ENABLE([only-syscfg-profiles], |
249 | [AS_HELP_STRING([--enable-only-syscfg-profiles], [disable profiles in $HOME/.config/firejail])]) | 251 | [AS_HELP_STRING([--enable-only-syscfg-profiles], [disable profiles in $HOME/.config/firejail])]) |
250 | AS_IF([test "x$enable_only_syscfg_profiles" = "xyes"], [ | 252 | AS_IF([test "x$enable_only_syscfg_profiles" = "xyes"], [ |
251 | HAVE_ONLY_SYSCFG_PROFILES="-DHAVE_ONLY_SYSCFG_PROFILES" | 253 | HAVE_ONLY_SYSCFG_PROFILES="-DHAVE_ONLY_SYSCFG_PROFILES" |
252 | ]) | 254 | ]) |
253 | 255 | ||
254 | HAVE_LTS="" | 256 | HAVE_LTS="" |
@@ -272,10 +274,11 @@ AS_IF([test "x$enable_lts" = "xyes"], [ | |||
272 | HAVE_FILE_TRANSFER="" | 274 | HAVE_FILE_TRANSFER="" |
273 | HAVE_SUID="-DHAVE_SUID" | 275 | HAVE_SUID="-DHAVE_SUID" |
274 | BUSYBOX_WORKAROUND="no" | 276 | BUSYBOX_WORKAROUND="no" |
275 | HAVE_CONTRIB_INSTALL="no", | 277 | HAVE_CONTRIB_INSTALL="no" |
276 | ]) | 278 | ]) |
277 | 279 | ||
278 | AC_CHECK_HEADER([linux/seccomp.h], [], AC_MSG_ERROR([*** SECCOMP support is not installed (/usr/include/linux/seccomp.h missing) ***])) | 280 | AC_CHECK_HEADER([linux/seccomp.h], [], |
281 | [AC_MSG_ERROR([*** SECCOMP support is not installed (/usr/include/linux/seccomp.h missing) ***])]) | ||
279 | 282 | ||
280 | # set sysconfdir | 283 | # set sysconfdir |
281 | if test "$prefix" = /usr; then | 284 | if test "$prefix" = /usr; then |
@@ -324,13 +327,10 @@ EOF | |||
324 | 327 | ||
325 | if test "$HAVE_LTS" = -DHAVE_LTS; then | 328 | if test "$HAVE_LTS" = -DHAVE_LTS; then |
326 | cat <<\EOF | 329 | cat <<\EOF |
327 | |||
328 | |||
329 | ********************************************************* | 330 | ********************************************************* |
330 | * Warning: Long-term support (LTS) was enabled! * | 331 | * Warning: Long-term support (LTS) was enabled! * |
331 | * Most compile-time options have bean rewritten! * | 332 | * Most compile-time options have been rewritten! * |
332 | ********************************************************* | 333 | ********************************************************* |
333 | 334 | ||
334 | |||
335 | EOF | 335 | EOF |
336 | fi | 336 | fi |