Skip to content

Commit

Permalink
configure*: use cat instead of many echoes
Browse files Browse the repository at this point in the history 
For simplicity and increased portability.
  • Loading branch information
@kmk3
kmk3 committed May 28, 2021
1 parent bf81cd6 commit bfbed38
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 82 deletions.
83 changes: 42 additions & 41 deletions configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5559,48 +5559,49 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
cat <<EOF
Configuration options:
prefix: $prefix
sysconfdir: $sysconfdir
apparmor: $HAVE_APPARMOR
SELinux labeling support: $HAVE_SELINUX
global config: $HAVE_GLOBALCFG
chroot: $HAVE_CHROOT
network: $HAVE_NETWORK
user namespace: $HAVE_USERNS
X11 sandboxing support: $HAVE_X11
whitelisting: $HAVE_WHITELIST
private home support: $HAVE_PRIVATE_HOME
file transfer support: $HAVE_FILE_TRANSFER
overlayfs support: $HAVE_OVERLAYFS
DBUS proxy support: $HAVE_DBUSPROXY
allow tmpfs as regular user: $HAVE_USERTMPFS
enable --ouput logging: $HAVE_OUTPUT
Manpage support: $HAVE_MAN
firetunnel support: $HAVE_FIRETUNNEL
busybox workaround: $BUSYBOX_WORKAROUND
Spectre compiler patch: $HAVE_SPECTRE
EXTRA_LDFLAGS: $EXTRA_LDFLAGS
EXTRA_CFLAGS: $EXTRA_CFLAGS
fatal warnings: $HAVE_FATAL_WARNINGS
Gcov instrumentation: $HAVE_GCOV
Install contrib scripts: $HAVE_CONTRIB_INSTALL
Install as a SUID executable: $HAVE_SUID
LTS: $HAVE_LTS
Always enforce filters: $HAVE_FORCE_NONEWPRIVS
EOF
echo
echo "Configuration options:"
echo " prefix: $prefix"
echo " sysconfdir: $sysconfdir"
echo " apparmor: $HAVE_APPARMOR"
echo " SELinux labeling support: $HAVE_SELINUX"
echo " global config: $HAVE_GLOBALCFG"
echo " chroot: $HAVE_CHROOT"
echo " network: $HAVE_NETWORK"
echo " user namespace: $HAVE_USERNS"
echo " X11 sandboxing support: $HAVE_X11"
echo " whitelisting: $HAVE_WHITELIST"
echo " private home support: $HAVE_PRIVATE_HOME"
echo " file transfer support: $HAVE_FILE_TRANSFER"
echo " overlayfs support: $HAVE_OVERLAYFS"
echo " DBUS proxy support: $HAVE_DBUSPROXY"
echo " allow tmpfs as regular user: $HAVE_USERTMPFS"
echo " enable --ouput logging: $HAVE_OUTPUT"
echo " Manpage support: $HAVE_MAN"
echo " firetunnel support: $HAVE_FIRETUNNEL"
echo " busybox workaround: $BUSYBOX_WORKAROUND"
echo " Spectre compiler patch: $HAVE_SPECTRE"
echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS"
echo " EXTRA_CFLAGS: $EXTRA_CFLAGS"
echo " fatal warnings: $HAVE_FATAL_WARNINGS"
echo " Gcov instrumentation: $HAVE_GCOV"
echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL"
echo " Install as a SUID executable: $HAVE_SUID"
echo " LTS: $HAVE_LTS"
echo " Always enforce filters: $HAVE_FORCE_NONEWPRIVS"
echo
if test "$HAVE_LTS" = -DHAVE_LTS; then
cat <<\EOF
if test "$HAVE_LTS" = -DHAVE_LTS; then
echo
echo
echo "*********************************************************"
echo "* Warning: Long-term support (LTS) was enabled! *"
echo "* Most compile-time options have bean rewritten! *"
echo "*********************************************************"
echo
echo
fi
*********************************************************
* Warning: Long-term support (LTS) was enabled! *
* Most compile-time options have bean rewritten! *
*********************************************************
EOF
fi
84 changes: 43 additions & 41 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,47 +311,49 @@ src/profstats/Makefile src/man/Makefile src/zsh_completion/Makefile src/bash_com
src/jailcheck/Makefile])
AC_OUTPUT

echo
echo "Configuration options:"
echo " prefix: $prefix"
echo " sysconfdir: $sysconfdir"
echo " apparmor: $HAVE_APPARMOR"
echo " SELinux labeling support: $HAVE_SELINUX"
echo " global config: $HAVE_GLOBALCFG"
echo " chroot: $HAVE_CHROOT"
echo " network: $HAVE_NETWORK"
echo " user namespace: $HAVE_USERNS"
echo " X11 sandboxing support: $HAVE_X11"
echo " whitelisting: $HAVE_WHITELIST"
echo " private home support: $HAVE_PRIVATE_HOME"
echo " file transfer support: $HAVE_FILE_TRANSFER"
echo " overlayfs support: $HAVE_OVERLAYFS"
echo " DBUS proxy support: $HAVE_DBUSPROXY"
echo " allow tmpfs as regular user: $HAVE_USERTMPFS"
echo " enable --ouput logging: $HAVE_OUTPUT"
echo " Manpage support: $HAVE_MAN"
echo " firetunnel support: $HAVE_FIRETUNNEL"
echo " busybox workaround: $BUSYBOX_WORKAROUND"
echo " Spectre compiler patch: $HAVE_SPECTRE"
echo " EXTRA_LDFLAGS: $EXTRA_LDFLAGS"
echo " EXTRA_CFLAGS: $EXTRA_CFLAGS"
echo " fatal warnings: $HAVE_FATAL_WARNINGS"
echo " Gcov instrumentation: $HAVE_GCOV"
echo " Install contrib scripts: $HAVE_CONTRIB_INSTALL"
echo " Install as a SUID executable: $HAVE_SUID"
echo " LTS: $HAVE_LTS"
echo " Always enforce filters: $HAVE_FORCE_NONEWPRIVS"
echo

cat <<EOF

Configuration options:
prefix: $prefix
sysconfdir: $sysconfdir
apparmor: $HAVE_APPARMOR
SELinux labeling support: $HAVE_SELINUX
global config: $HAVE_GLOBALCFG
chroot: $HAVE_CHROOT
network: $HAVE_NETWORK
user namespace: $HAVE_USERNS
X11 sandboxing support: $HAVE_X11
whitelisting: $HAVE_WHITELIST
private home support: $HAVE_PRIVATE_HOME
file transfer support: $HAVE_FILE_TRANSFER
overlayfs support: $HAVE_OVERLAYFS
DBUS proxy support: $HAVE_DBUSPROXY
allow tmpfs as regular user: $HAVE_USERTMPFS
enable --ouput logging: $HAVE_OUTPUT
Manpage support: $HAVE_MAN
firetunnel support: $HAVE_FIRETUNNEL
busybox workaround: $BUSYBOX_WORKAROUND
Spectre compiler patch: $HAVE_SPECTRE
EXTRA_LDFLAGS: $EXTRA_LDFLAGS
EXTRA_CFLAGS: $EXTRA_CFLAGS
fatal warnings: $HAVE_FATAL_WARNINGS
Gcov instrumentation: $HAVE_GCOV
Install contrib scripts: $HAVE_CONTRIB_INSTALL
Install as a SUID executable: $HAVE_SUID
LTS: $HAVE_LTS
Always enforce filters: $HAVE_FORCE_NONEWPRIVS

EOF

if test "$HAVE_LTS" = -DHAVE_LTS; then
echo
echo
echo "*********************************************************"
echo "* Warning: Long-term support (LTS) was enabled! *"
echo "* Most compile-time options have bean rewritten! *"
echo "*********************************************************"
echo
echo
fi
cat <<\EOF


*********************************************************
* Warning: Long-term support (LTS) was enabled! *
* Most compile-time options have bean rewritten! *
*********************************************************


EOF
fi

0 comments on commit bfbed38

Please sign in to comment.