xserver: Branch 'master'

[Dave Airlie]

 configure.ac |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 0a4e9311158ed3ecda0722640f860ace2f87a97e (from b2f9ca6ac400d426d7a1ef0162f7e7ce28288dd1)
Author: Hanno Boeck <hanno at gentoo.org>
Date:   Thu Jul 12 10:17:07 2007 +1000

    xnest: fix linking since dbus
    
    Fixes bug 8955

diff --git a/configure.ac b/configure.ac
index 760db87..be8878a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1164,7 +1164,7 @@ AC_MSG_RESULT([$XNEST])
 AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
 
 if test "x$XNEST" = xyes; then
-	XNEST_LIBS="$XSERVER_LIBS $FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB $LIBS"
+	XNEST_LIBS="$MI_LIB $CONFIG_LIB $XSERVER_LIBS $FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB $LIBS"
 	AC_SUBST([XNEST_LIBS])
 fi