xserver: Branch 'master'

[Keith Packard]

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

New commits:
commit 7305153643622269e14f3564f7a8a66ecaf49f78
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Feb 5 11:10:47 2014 -0500

    configure: Don't add GLX_SYS_LIBS to XORG_SYS_LIBS
    
    libglx.so is linked against libGL.so, but Xorg itself should not be.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index c6764f5..93f7316 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1853,7 +1853,7 @@ if test "x$XORG" = xyes; then
 	if test "x$PCI" = xyes; then
 		PKG_CHECK_MODULES([PCIACCESS], $LIBPCIACCESS)
 		SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $LIBPCIACCESS"
-		XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $GLX_SYS_LIBS $LIBDRM_LIBS"
+		XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $LIBDRM_LIBS"
 		XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS $LIBDRM_CFLAGS"
 
 		AC_DEFINE(XSERVER_LIBPCIACCESS, 1, [Use libpciaccess for all pci manipulation])