From 83bf84253adbec1dc5675970e34fea32e6e52393 Mon Sep 17 00:00:00 2001 From: Mikhail Kulko Date: Wed, 12 Apr 2023 16:32:04 +0600 Subject: [PATCH] also port the banner someone gets when they build bubblewrap with autotools to meson and add an indicator of whether the version of SELinux is >= 2.3 to it Signed-off-by: Mikhail Kulko --- configure.ac | 8 +++++--- meson.build | 11 +++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index a43423f1..489af2f3 100644 --- a/configure.ac +++ b/configure.ac @@ -71,6 +71,7 @@ AM_CONDITIONAL([ENABLE_ZSH_COMPLETION], [test "x$with_zsh_completion_dir" != "xn # ------------------------------------------------------------------------------ have_selinux=no +have_selinux_2_3=no AC_ARG_ENABLE(selinux, AS_HELP_STRING([--disable-selinux], [Disable optional SELINUX support])) AS_IF([test "x$enable_selinux" != "xno"], [ PKG_CHECK_MODULES([SELINUX], [libselinux >= 2.1.9], @@ -81,8 +82,9 @@ AS_IF([test "x$enable_selinux" != "xno"], [ AS_IF([test "x$have_selinux" = xno && test "x$enable_selinux" = xyes], [AC_MSG_ERROR([*** SELinux support requested but libraries not found])]) PKG_CHECK_MODULES([SELINUX_2_3], [libselinux >= 2.3], - [AC_DEFINE(HAVE_SELINUX_2_3, 1, [Define if SELinux is version >= 2.3])], - [:]) + [AC_DEFINE(HAVE_SELINUX_2_3, 1, [Define if SELinux is version >= 2.3]) + have_selinux_2_3=yes], + [have_selinux_2_3=no]) ]) AM_CONDITIONAL(HAVE_SELINUX, [test "$have_selinux" = "yes"]) @@ -152,8 +154,8 @@ echo " man pages (xsltproc): $enable_man SELinux: $have_selinux + ... >= 2.3: $have_selinux_2_3 setuid mode on make install: $with_priv_mode require default userns: $enable_require_userns - warn when session parameter's set implicitly: $warn_implicit_session_opt mysteriously satisfying to pop: yes" echo "" diff --git a/meson.build b/meson.build index 6de2bac8..a9c3193d 100644 --- a/meson.build +++ b/meson.build @@ -174,3 +174,14 @@ endif if get_option('tests') subdir('tests') endif + +message() +message(' @0@ @1@'.format(meson.project_name(), meson.project_version())) +message(' ===================') +message() +message(' man pages (xsltproc): @0@'.format(build_man_page)) +message(' SELinux: @0@'.format(cdata.has('HAVE_SELINUX'))) +message(' ... >= 2.3: @0@'.format(cdata.has('HAVE_SELINUX_2_3'))) +message(' require default userns: @0@'.format(get_option('require_userns'))) +message(' mysteriously satisfying to pop: true') +message() \ No newline at end of file