picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

build-sys: ensure selinux configure check follows logic of other optional features

Browse source
This commit is contained in:
Lennart Poettering 2011-02-08 11:44:38 +01:00
parent 990d8b885b
commit 591622d7ef
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
configure.ac
View file

@ -115,15 +115,18 @@ PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 1.3.2 ])
AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS) AC_SUBST(DBUS_LIBS)
PKG_CHECK_MODULES(SELINUX, libselinux, have_selinux=no
have_selinux=yes, AC_ARG_ENABLE(selinux, AS_HELP_STRING([--disable-selinux], [Disable optional SELINUX support]))
have_selinux=no) if test "x$enable_selinux" != "xno"; then
if test "x$have_selinux" = "xyes" ; then PKG_CHECK_MODULES(SELINUX, [ libselinux ],
AC_DEFINE(HAVE_SELINUX, [], [Define if SELINUX is available]) [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 fi
AM_CONDITIONAL(HAVE_SELINUX, test x$have_selinux = xyes) AM_CONDITIONAL(HAVE_SELINUX, [test "$have_selinux" = "yes"])
AC_SUBST(SELINUX_CFLAGS)
AC_SUBST(SELINUX_LIBS)
AC_ARG_ENABLE([tcpwrap], AC_ARG_ENABLE([tcpwrap],
AS_HELP_STRING([--disable-tcpwrap],[Disable optional TCP wrappers support]), 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_CFLAGS)
AC_SUBST(LIBCRYPTSETUP_LIBS) AC_SUBST(LIBCRYPTSETUP_LIBS)
if test "x$have_libcryptsetup" = xno -a "x$enable_libcryptsetup" = xyes; then 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
fi fi
AM_CONDITIONAL(HAVE_LIBCRYPTSETUP, [test "$have_libcryptsetup" = "yes"]) AM_CONDITIONAL(HAVE_LIBCRYPTSETUP, [test "$have_libcryptsetup" = "yes"])