mirror of
https://github.com/systemd/systemd.git
synced 2024-10-27 10:25:37 +03:00
build-sys: ensure selinux configure check follows logic of other optional features
This commit is contained in:
parent
990d8b885b
commit
591622d7ef
21
configure.ac
21
configure.ac
@ -115,15 +115,18 @@ PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 1.3.2 ])
|
||||
AC_SUBST(DBUS_CFLAGS)
|
||||
AC_SUBST(DBUS_LIBS)
|
||||
|
||||
PKG_CHECK_MODULES(SELINUX, libselinux,
|
||||
have_selinux=yes,
|
||||
have_selinux=no)
|
||||
if test "x$have_selinux" = "xyes" ; then
|
||||
AC_DEFINE(HAVE_SELINUX, [], [Define if SELINUX is available])
|
||||
have_selinux=no
|
||||
AC_ARG_ENABLE(selinux, AS_HELP_STRING([--disable-selinux], [Disable optional SELINUX support]))
|
||||
if test "x$enable_selinux" != "xno"; then
|
||||
PKG_CHECK_MODULES(SELINUX, [ libselinux ],
|
||||
[AC_DEFINE(HAVE_SELINUX, 1, [Define if SELinux is available]) have_selinux=yes], have_selinux=no)
|
||||
AC_SUBST(SELINUX_CFLAGS)
|
||||
AC_SUBST(SELINUX_LIBS)
|
||||
if test "x$have_selinux" = xno -a "x$enable_selinux" = xyes; then
|
||||
AC_MSG_ERROR([*** SELinux support requested but libraries not found])
|
||||
fi
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_SELINUX, test x$have_selinux = xyes)
|
||||
AC_SUBST(SELINUX_CFLAGS)
|
||||
AC_SUBST(SELINUX_LIBS)
|
||||
AM_CONDITIONAL(HAVE_SELINUX, [test "$have_selinux" = "yes"])
|
||||
|
||||
AC_ARG_ENABLE([tcpwrap],
|
||||
AS_HELP_STRING([--disable-tcpwrap],[Disable optional TCP wrappers support]),
|
||||
@ -230,7 +233,7 @@ if test "x$enable_libcryptsetup" != "xno"; then
|
||||
AC_SUBST(LIBCRYPTSETUP_CFLAGS)
|
||||
AC_SUBST(LIBCRYPTSETUP_LIBS)
|
||||
if test "x$have_libcryptsetup" = xno -a "x$enable_libcryptsetup" = xyes; then
|
||||
AC_MSG_ERROR([*** libcryptsetup support requested but libraries not found])
|
||||
AC_MSG_ERROR([*** libcryptsetup support requested but libraries not found])
|
||||
fi
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_LIBCRYPTSETUP, [test "$have_libcryptsetup" = "yes"])
|
||||
|
Loading…
Reference in New Issue
Block a user