diff options
author | netblue30 <netblue30@protonmail.com> | 2021-05-29 12:33:49 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-29 12:33:49 -0500 |
commit | 6c1b75f6a7ea75cf0979bad0f67516d87cff75d0 (patch) | |
tree | 5af47a986414c75458126603bab8fdfe5866f693 | |
parent | Fix #3823 -- Unable to start hexchat with firejail (diff) | |
parent | configure*: use cat instead of many echoes (diff) | |
download | firejail-6c1b75f6a7ea75cf0979bad0f67516d87cff75d0.tar.gz firejail-6c1b75f6a7ea75cf0979bad0f67516d87cff75d0.tar.zst firejail-6c1b75f6a7ea75cf0979bad0f67516d87cff75d0.zip |
Merge pull request #4316 from kmk3/configure-improvements
Configure improvements
-rwxr-xr-x | configure | 83 | ||||
-rw-r--r-- | configure.ac | 93 |
2 files changed, 90 insertions, 86 deletions
@@ -5559,48 +5559,49 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then | |||
5559 | $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} | 5559 | $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} |
5560 | fi | 5560 | fi |
5561 | 5561 | ||
5562 | cat <<EOF | ||
5563 | |||
5564 | Configuration options: | ||
5565 | prefix: $prefix | ||
5566 | sysconfdir: $sysconfdir | ||
5567 | apparmor: $HAVE_APPARMOR | ||
5568 | SELinux labeling support: $HAVE_SELINUX | ||
5569 | global config: $HAVE_GLOBALCFG | ||
5570 | chroot: $HAVE_CHROOT | ||
5571 | network: $HAVE_NETWORK | ||
5572 | user namespace: $HAVE_USERNS | ||
5573 | X11 sandboxing support: $HAVE_X11 | ||
5574 | whitelisting: $HAVE_WHITELIST | ||
5575 | private home support: $HAVE_PRIVATE_HOME | ||
5576 | file transfer support: $HAVE_FILE_TRANSFER | ||
5577 | overlayfs support: $HAVE_OVERLAYFS | ||
5578 | DBUS proxy support: $HAVE_DBUSPROXY | ||
5579 | allow tmpfs as regular user: $HAVE_USERTMPFS | ||
5580 | enable --ouput logging: $HAVE_OUTPUT | ||
5581 | Manpage support: $HAVE_MAN | ||
5582 | firetunnel support: $HAVE_FIRETUNNEL | ||
5583 | busybox workaround: $BUSYBOX_WORKAROUND | ||
5584 | Spectre compiler patch: $HAVE_SPECTRE | ||
5585 | EXTRA_LDFLAGS: $EXTRA_LDFLAGS | ||
5586 | EXTRA_CFLAGS: $EXTRA_CFLAGS | ||
5587 | fatal warnings: $HAVE_FATAL_WARNINGS | ||
5588 | Gcov instrumentation: $HAVE_GCOV | ||
5589 | Install contrib scripts: $HAVE_CONTRIB_INSTALL | ||
5590 | Install as a SUID executable: $HAVE_SUID | ||
5591 | LTS: $HAVE_LTS | ||
5592 | Always enforce filters: $HAVE_FORCE_NONEWPRIVS | ||
5593 | |||
5594 | EOF | ||
5562 | 5595 | ||
5563 | echo | 5596 | if test "$HAVE_LTS" = -DHAVE_LTS; then |
5564 | echo "Configuration options:" | 5597 | cat <<\EOF |
5565 | echo " prefix: $prefix" | ||
5566 | echo " sysconfdir: $sysconfdir" | ||
5567 | echo " apparmor: $HAVE_APPARMOR" | ||
5568 | echo " SELinux labeling support: $HAVE_SELINUX" | ||
5569 | echo " global config: $HAVE_GLOBALCFG" | ||
5570 | echo " chroot: $HAVE_CHROOT" | ||
5571 | echo " network: $HAVE_NETWORK" | ||
5572 | echo " user namespace: $HAVE_USERNS" | ||
5573 | echo " X11 sandboxing support: $HAVE_X11" | ||
5574 | echo " whitelisting: $HAVE_WHITELIST" | ||
5575 | echo " private home support: $HAVE_PRIVATE_HOME" | ||
5576 | echo " file transfer support: $HAVE_FILE_TRANSFER" | ||
5577 | echo " overlayfs support: $HAVE_OVERLAYFS" | ||
5578 | echo " DBUS proxy support: $HAVE_DBUSPROXY" | ||
5579 | echo " allow tmpfs as regular user: $HAVE_USERTMPFS" | ||
5580 | echo " enable --ouput logging: $HAVE_OUTPUT" | ||
5581 | echo " Manpage support: $HAVE_MAN" | ||
5582 | echo " firetunnel support: $HAVE_FIRETUNNEL" | ||
5583 | echo " busybox workaround: $BUSYBOX_WORKAROUND" | ||
5584 | echo " Spectre compiler patch: $HAVE_SPECTRE" | ||
5585 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" | ||
5586 | echo " EXTRA_CFLAGS: $EXTRA_CFLAGS" | ||
5587 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" | ||
5588 | echo " Gcov instrumentation: $HAVE_GCOV" | ||
5589 | echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL" | ||
5590 | echo " Install as a SUID executable: $HAVE_SUID" | ||
5591 | echo " LTS: $HAVE_LTS" | ||
5592 | echo " Always enforce filters: $HAVE_FORCE_NONEWPRIVS" | ||
5593 | echo | ||
5594 | 5598 | ||
5595 | 5599 | ||
5596 | if test "$HAVE_LTS" = -DHAVE_LTS; then | 5600 | ********************************************************* |
5597 | echo | 5601 | * Warning: Long-term support (LTS) was enabled! * |
5598 | echo | 5602 | * Most compile-time options have bean rewritten! * |
5599 | echo "*********************************************************" | 5603 | ********************************************************* |
5600 | echo "* Warning: Long-term support (LTS) was enabled! *" | ||
5601 | echo "* Most compile-time options have bean rewritten! *" | ||
5602 | echo "*********************************************************" | ||
5603 | echo | ||
5604 | echo | ||
5605 | fi | ||
5606 | 5604 | ||
5605 | |||
5606 | EOF | ||
5607 | fi | ||
diff --git a/configure.ac b/configure.ac index 4af69766d..0eb616355 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -12,7 +12,7 @@ | |||
12 | # | 12 | # |
13 | 13 | ||
14 | AC_PREREQ([2.68]) | 14 | AC_PREREQ([2.68]) |
15 | AC_INIT(firejail, 0.9.65, netblue30@protonmail.com, , https://firejail.wordpress.com) | 15 | AC_INIT([firejail],[0.9.65],[netblue30@protonmail.com],[],[https://firejail.wordpress.com]) |
16 | AC_CONFIG_SRCDIR([src/firejail/main.c]) | 16 | AC_CONFIG_SRCDIR([src/firejail/main.c]) |
17 | 17 | ||
18 | AC_CONFIG_MACRO_DIR([m4]) | 18 | AC_CONFIG_MACRO_DIR([m4]) |
@@ -304,53 +304,56 @@ if test "$prefix" = /usr; then | |||
304 | fi | 304 | fi |
305 | 305 | ||
306 | AC_CONFIG_FILES([mkdeb.sh], [chmod +x mkdeb.sh]) | 306 | AC_CONFIG_FILES([mkdeb.sh], [chmod +x mkdeb.sh]) |
307 | AC_OUTPUT(Makefile src/common.mk src/lib/Makefile src/fcopy/Makefile src/fnet/Makefile src/firejail/Makefile src/fnetfilter/Makefile \ | 307 | AC_CONFIG_FILES([Makefile src/common.mk src/lib/Makefile src/fcopy/Makefile src/fnet/Makefile src/firejail/Makefile src/fnetfilter/Makefile \ |
308 | src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/fbuilder/Makefile src/fsec-print/Makefile \ | 308 | src/firemon/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/firecfg/Makefile src/fbuilder/Makefile src/fsec-print/Makefile \ |
309 | src/ftee/Makefile src/fseccomp/Makefile src/fldd/Makefile src/libpostexecseccomp/Makefile src/fsec-optimize/Makefile \ | 309 | src/ftee/Makefile src/fseccomp/Makefile src/fldd/Makefile src/libpostexecseccomp/Makefile src/fsec-optimize/Makefile \ |
310 | src/profstats/Makefile src/man/Makefile src/zsh_completion/Makefile src/bash_completion/Makefile test/Makefile \ | 310 | src/profstats/Makefile src/man/Makefile src/zsh_completion/Makefile src/bash_completion/Makefile test/Makefile \ |
311 | src/jailcheck/Makefile) | 311 | src/jailcheck/Makefile]) |
312 | 312 | AC_OUTPUT | |
313 | echo | 313 | |
314 | echo "Configuration options:" | 314 | cat <<EOF |
315 | echo " prefix: $prefix" | 315 | |
316 | echo " sysconfdir: $sysconfdir" | 316 | Configuration options: |
317 | echo " apparmor: $HAVE_APPARMOR" | 317 | prefix: $prefix |
318 | echo " SELinux labeling support: $HAVE_SELINUX" | 318 | sysconfdir: $sysconfdir |
319 | echo " global config: $HAVE_GLOBALCFG" | 319 | apparmor: $HAVE_APPARMOR |
320 | echo " chroot: $HAVE_CHROOT" | 320 | SELinux labeling support: $HAVE_SELINUX |
321 | echo " network: $HAVE_NETWORK" | 321 | global config: $HAVE_GLOBALCFG |
322 | echo " user namespace: $HAVE_USERNS" | 322 | chroot: $HAVE_CHROOT |
323 | echo " X11 sandboxing support: $HAVE_X11" | 323 | network: $HAVE_NETWORK |
324 | echo " whitelisting: $HAVE_WHITELIST" | 324 | user namespace: $HAVE_USERNS |
325 | echo " private home support: $HAVE_PRIVATE_HOME" | 325 | X11 sandboxing support: $HAVE_X11 |
326 | echo " file transfer support: $HAVE_FILE_TRANSFER" | 326 | whitelisting: $HAVE_WHITELIST |
327 | echo " overlayfs support: $HAVE_OVERLAYFS" | 327 | private home support: $HAVE_PRIVATE_HOME |
328 | echo " DBUS proxy support: $HAVE_DBUSPROXY" | 328 | file transfer support: $HAVE_FILE_TRANSFER |
329 | echo " allow tmpfs as regular user: $HAVE_USERTMPFS" | 329 | overlayfs support: $HAVE_OVERLAYFS |
330 | echo " enable --ouput logging: $HAVE_OUTPUT" | 330 | DBUS proxy support: $HAVE_DBUSPROXY |
331 | echo " Manpage support: $HAVE_MAN" | 331 | allow tmpfs as regular user: $HAVE_USERTMPFS |
332 | echo " firetunnel support: $HAVE_FIRETUNNEL" | 332 | enable --ouput logging: $HAVE_OUTPUT |
333 | echo " busybox workaround: $BUSYBOX_WORKAROUND" | 333 | Manpage support: $HAVE_MAN |
334 | echo " Spectre compiler patch: $HAVE_SPECTRE" | 334 | firetunnel support: $HAVE_FIRETUNNEL |
335 | echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS" | 335 | busybox workaround: $BUSYBOX_WORKAROUND |
336 | echo " EXTRA_CFLAGS: $EXTRA_CFLAGS" | 336 | Spectre compiler patch: $HAVE_SPECTRE |
337 | echo " fatal warnings: $HAVE_FATAL_WARNINGS" | 337 | EXTRA_LDFLAGS: $EXTRA_LDFLAGS |
338 | echo " Gcov instrumentation: $HAVE_GCOV" | 338 | EXTRA_CFLAGS: $EXTRA_CFLAGS |
339 | echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL" | 339 | fatal warnings: $HAVE_FATAL_WARNINGS |
340 | echo " Install as a SUID executable: $HAVE_SUID" | 340 | Gcov instrumentation: $HAVE_GCOV |
341 | echo " LTS: $HAVE_LTS" | 341 | Install contrib scripts: $HAVE_CONTRIB_INSTALL |
342 | echo " Always enforce filters: $HAVE_FORCE_NONEWPRIVS" | 342 | Install as a SUID executable: $HAVE_SUID |
343 | echo | 343 | LTS: $HAVE_LTS |
344 | 344 | Always enforce filters: $HAVE_FORCE_NONEWPRIVS | |
345 | |||
346 | EOF | ||
345 | 347 | ||
346 | if test "$HAVE_LTS" = -DHAVE_LTS; then | 348 | if test "$HAVE_LTS" = -DHAVE_LTS; then |
347 | echo | 349 | cat <<\EOF |
348 | echo | 350 | |
349 | echo "*********************************************************" | ||
350 | echo "* Warning: Long-term support (LTS) was enabled! *" | ||
351 | echo "* Most compile-time options have bean rewritten! *" | ||
352 | echo "*********************************************************" | ||
353 | echo | ||
354 | echo | ||
355 | fi | ||
356 | 351 | ||
352 | ********************************************************* | ||
353 | * Warning: Long-term support (LTS) was enabled! * | ||
354 | * Most compile-time options have bean rewritten! * | ||
355 | ********************************************************* | ||
356 | |||
357 | |||
358 | EOF | ||
359 | fi | ||