From e22db97a3a64c9c942fbabfb2a21244834cce1c9 Mon Sep 17 00:00:00 2001

From: Adam Jackson <ajax@redhat.com>

Date: Wed, 5 Feb 2014 11:06:10 -0500

Subject: [PATCH] configure: Don't add GLX_SYS_LIBS to Xorg's SYS_LIBS

libglx.so links libGL, but Xorg should not.

Signed-off-by: Adam Jackson <ajax@redhat.com>

---

 configure.ac | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac

index f62e705..e607a55 100644

--- a/configure.ac

+++ b/configure.ac

@@ -1868,7 +1868,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])

-- 

1.8.5.3