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

[elogind.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1879dd97807a8af43e6775f92e33e1b4c2530e49..08f36469a9a16f28c38607d0f09c02c4ac2e296d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -118,15 +118,12 @@ AC_SUBST(DBUS_LIBS)
 have_selinux=no
 AC_ARG_ENABLE(selinux, AS_HELP_STRING([--disable-selinux], [Disable optional SELINUX support]))
 if test "x$enable_selinux" != "xno"; then
-       # not using PKG_CHECK_MODULES as for some reason libselinux didn't
-       # install any pkg-config modules here
-       AC_SEARCH_LIBS([getcon], [selinux],
-                [AC_DEFINE(HAVE_SELINUX, 1, [Define if SELINUX is available]) have_selinux=yes],
-               have_selinux=no)
+        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])
+                AC_MSG_ERROR([*** SELinux support requested but libraries not found])
         fi
 fi
 AM_CONDITIONAL(HAVE_SELINUX, [test "$have_selinux" = "yes"])
@@ -236,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"])