xserver: Branch 'master'

[Dan Nicholson]

 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c73cd3b265c301b8a54ffe484d6c696f2abefb46
Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Sun Aug 16 18:07:49 2009 -0700

    xfree86: Link libselinux with Xorg system libraries
    
    Put the reference to -lselinux in XORG_SYS_LIBS so it isn't added as a
    make dependency for libxorg.la. Otherwise, make goes looking for a file
    -lselinux in the current directory, which it obviously won't find.
    
    Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>
    Tested-by: Justin P. Mattock <justinmattock at gmail.com>

diff --git a/configure.ac b/configure.ac
index a8a093b..50ed4cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1337,7 +1337,7 @@ if test "x$XORG" = xyes; then
 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
 	XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
 	XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
-	XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $SELINUX_LIB"
+	XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB"
 
 	dnl ==================================================================
 	dnl symbol visibility
@@ -1390,7 +1390,7 @@ if test "x$XORG" = xyes; then
 	AC_CHECK_FUNCS([pci_device_is_boot_vga])
 	LIBS=$SAVE_LIBS
 	CFLAGS=$SAVE_CFLAGS
-	XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS"
+	XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS $SELINUX_LIB"
 	XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
 
 	case $host_os in