diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-24 18:34:17 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-24 18:34:17 +0000 |
| commit | 24bc15a386e37908396c3f6088f6fc98ceaa0f46 (patch) | |
| tree | c66f27ec96c869f10ef53d73ed7dd5e5e0860605 /xorg-server/configure.ac | |
| parent | 6f0a8e51f20073ea01ac5dae8e5c4d49076fc65e (diff) | |
| download | vcxsrv-24bc15a386e37908396c3f6088f6fc98ceaa0f46.tar.gz vcxsrv-24bc15a386e37908396c3f6088f6fc98ceaa0f46.tar.bz2 vcxsrv-24bc15a386e37908396c3f6088f6fc98ceaa0f46.zip | |
Git update 24/2/2010"
Diffstat (limited to 'xorg-server/configure.ac')
| -rw-r--r-- | xorg-server/configure.ac | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac index de252f323..b9c75742a 100644 --- a/xorg-server/configure.ac +++ b/xorg-server/configure.ac @@ -1056,16 +1056,11 @@ if test "x$XSELINUX" = xyes; then if test "x$XACE" != xyes; then AC_MSG_ERROR([cannot build SELinux extension without X-ACE]) fi - AC_CHECK_HEADERS([selinux/selinux.h selinux/avc.h], [], AC_MSG_ERROR([SELinux include files not found])) - AC_CHECK_LIB(selinux, avc_init, [], AC_MSG_ERROR([SELinux library not found])) 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])) - AC_CHECK_DECL(avc_netlink_acquire_fd, - [AC_DEFINE(HAVE_AVC_NETLINK_ACQUIRE_FD, 1, "Have avc_netlink_acquire_fd")], - [], - [#include <selinux/avc.h>]) + PKG_CHECK_MODULES([SELINUX], [libselinux >= 2.0.86]) + SELINUX_LIBS="$SELINUX_LIBS -laudit" AC_DEFINE(XSELINUX, 1, [Build SELinux extension]) - SELINUX_LIB="-lselinux -laudit" fi AM_CONDITIONAL(XCSECURITY, [test "x$XCSECURITY" = xyes]) @@ -1584,7 +1579,7 @@ if test "x$XORG" = xyes; then AC_CHECK_FUNCS([pci_device_vgaarb_init]) LIBS=$SAVE_LIBS CFLAGS=$SAVE_CFLAGS - XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $GLX_SYS_LIBS $SELINUX_LIB" + XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $GLX_SYS_LIBS $SELINUX_LIBS" XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" case $host_os in |