From 740454eff05c1f20c1c3976fe68d0e3b5375d757 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Thu, 7 Jul 2011 00:49:26 -0400
Subject: [PATCH] Apply patch from issue 349.

Someone more versed on the Linux side, please check.
---
 autoconf/m4/opengl.m4 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/autoconf/m4/opengl.m4 b/autoconf/m4/opengl.m4
index e213addf18..bc6187698b 100644
--- a/autoconf/m4/opengl.m4
+++ b/autoconf/m4/opengl.m4
@@ -11,9 +11,11 @@ AC_DEFUN([SM_X_WITH_OPENGL],
 	fi
 
 	if test -n "$x_libraries"; then
-	    XLIBS="-L$x_libraries -lX11"
+	    XLIBS="-L$x_libraries"
 	fi
 
+	XLIBS +="-lX11"
+
 	if test -n "$x_includes"; then
 	    # See if we can compile X applications without using $XCFLAGS.
 	    AC_MSG_CHECKING(if $XCFLAGS is really necessary)