Skip to content

Commit 83bf842

Browse files
author
Mikhail Kulko
committed
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 <mkulko@mkulko.me>
1 parent b04be3b commit 83bf842

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

configure.ac

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ AM_CONDITIONAL([ENABLE_ZSH_COMPLETION], [test "x$with_zsh_completion_dir" != "xn
7171

7272
# ------------------------------------------------------------------------------
7373
have_selinux=no
74+
have_selinux_2_3=no
7475
AC_ARG_ENABLE(selinux, AS_HELP_STRING([--disable-selinux], [Disable optional SELINUX support]))
7576
AS_IF([test "x$enable_selinux" != "xno"], [
7677
PKG_CHECK_MODULES([SELINUX], [libselinux >= 2.1.9],
@@ -81,8 +82,9 @@ AS_IF([test "x$enable_selinux" != "xno"], [
8182
AS_IF([test "x$have_selinux" = xno && test "x$enable_selinux" = xyes],
8283
[AC_MSG_ERROR([*** SELinux support requested but libraries not found])])
8384
PKG_CHECK_MODULES([SELINUX_2_3], [libselinux >= 2.3],
84-
[AC_DEFINE(HAVE_SELINUX_2_3, 1, [Define if SELinux is version >= 2.3])],
85-
[:])
85+
[AC_DEFINE(HAVE_SELINUX_2_3, 1, [Define if SELinux is version >= 2.3])
86+
have_selinux_2_3=yes],
87+
[have_selinux_2_3=no])
8688
])
8789
AM_CONDITIONAL(HAVE_SELINUX, [test "$have_selinux" = "yes"])
8890

@@ -152,8 +154,8 @@ echo "
152154

153155
man pages (xsltproc): $enable_man
154156
SELinux: $have_selinux
157+
... >= 2.3: $have_selinux_2_3
155158
setuid mode on make install: $with_priv_mode
156159
require default userns: $enable_require_userns
157-
warn when session parameter's set implicitly: $warn_implicit_session_opt
158160
mysteriously satisfying to pop: yes"
159161
echo ""

meson.build

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,3 +174,14 @@ endif
174174
if get_option('tests')
175175
subdir('tests')
176176
endif
177+
178+
message()
179+
message(' @0@ @1@'.format(meson.project_name(), meson.project_version()))
180+
message(' ===================')
181+
message()
182+
message(' man pages (xsltproc): @0@'.format(build_man_page))
183+
message(' SELinux: @0@'.format(cdata.has('HAVE_SELINUX')))
184+
message(' ... >= 2.3: @0@'.format(cdata.has('HAVE_SELINUX_2_3')))
185+
message(' require default userns: @0@'.format(get_option('require_userns')))
186+
message(' mysteriously satisfying to pop: true')
187+
message()

0 commit comments

Comments
 (0)