diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-03-04 15:41:53 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-03-04 15:43:04 +1000 |
| commit | 402668251135b63b7329722397fe7885e065f27c (patch) | |
| tree | 57ac9b817164e2c0b175e1d2dfc8372ad75709ed | |
| parent | 351d11fd466fae731df860a6ff4cf50ad565f43f (diff) | |
configure: move libselinux requirement up to the common section.
Let's have all version-specific requirements in one block.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit cab99b947c66a42dbf8a906bdb02e23aa7cab519)
Conflicts:
configure.ac
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 558de8759..562111c24 100644 --- a/configure.ac +++ b/configure.ac @@ -759,6 +759,7 @@ LIBXI="xi >= 1.2.99.1" LIBXTST="xtst >= 1.0.99.2" LIBPCIACCESS="pciaccess >= 0.8.0" LIBGLIB="glib-2.0 >= 2.16" +LIBSELINUX="libselinux >= 2.0.86" dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas dnl CONFIG_DBUS_API is true if we want to enable the D-Bus config @@ -1014,7 +1015,7 @@ if test "x$XSELINUX" = xyes; then fi AC_CHECK_HEADERS([libaudit.h], [], AC_MSG_ERROR([SELinux extension requires audit system headers])) AC_CHECK_LIB(audit, audit_open, [], AC_MSG_ERROR([SELinux extension requires audit system library])) - PKG_CHECK_MODULES([SELINUX], [libselinux >= 2.0.86]) + PKG_CHECK_MODULES([SELINUX], $LIBSELINUX) SELINUX_LIBS="$SELINUX_LIBS -laudit" AC_DEFINE(XSELINUX, 1, [Build SELinux extension]) fi |