build-sys: fix AC_COMPILE_IFELSE tests

[elogind.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1eb931da3da1d668d06df59cad4097d65ef299d2..08f36469a9a16f28c38607d0f09c02c4ac2e296d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 
 AC_PREREQ(2.63)
 
-AC_INIT([systemd],[16],[systemd-devel@lists.freedesktop.org])
+AC_INIT([systemd],[17],[systemd-devel@lists.freedesktop.org])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
@@ -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"])
@@ -263,7 +260,7 @@ if test "$have_gtk" = "yes"; then
 fi
 AM_CONDITIONAL(LIBNOTIFY07, [ test "$libnotify07" = "yes" ])
 
-AM_PROG_VALAC([0.11])
+AM_PROG_VALAC([0.10])
 AC_SUBST(VAPIDIR)
 AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x)