xserver: Branch 'master'

[Remi Cardona]

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

New commits:
commit 2c69deb92e11542f615df0f24fdc03e3b4415475
Author: Rémi Cardona <remi at gentoo.org>
Date:   Fri Jul 3 10:51:50 2009 +0200

    configure: libXinerama isn't needed anymore
    
    since libXinerama commit 90d4d23bf2e94721149ddc0a80093b10a82e8845 and
    xineramaproto commit 21477147613c28c968b5e1eb9d8aea7017dd399d, the
    server no longer needs libXinerama.
    
    Signed-off-by: Rémi Cardona <remi at gentoo.org>

diff --git a/configure.ac b/configure.ac
index 150ecd2..8f00e28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -935,7 +935,7 @@ AM_CONDITIONAL(XINERAMA, [test "x$XINERAMA" = xyes])
 if test "x$XINERAMA" = xyes; then
 	AC_DEFINE(XINERAMA, 1, [Support Xinerama extension])
 	AC_DEFINE(PANORAMIX, 1, [Internal define for Xinerama])
-	REQUIRED_MODULES="$REQUIRED_MODULES xineramaproto xinerama"
+	REQUIRED_MODULES="$REQUIRED_MODULES xineramaproto"
 fi
 
 AM_CONDITIONAL(XACE, [test "x$XACE" = xyes])