# HG changeset patch
# User Sam Lantinga <slouken@libsdl.org>
# Date 1183191062 0
# Node ID 9af6717e676aa1b3521a4c584a2389269ee9d787
# Parent  e47e63af07df7b1b56e4c1c41e0b3a7521d0e079
Merged change from 1.2 to add X11 path for OpenGL detection

diff -r e47e63af07df -r 9af6717e676a test/configure.in
--- a/test/configure.in	Fri Jun 29 11:08:53 2007 +0000
+++ b/test/configure.in	Sat Jun 30 08:11:02 2007 +0000
@@ -68,6 +68,21 @@
 CFLAGS="$CFLAGS $SDL_CFLAGS"
 LIBS="$LIBS $SDL_LIBS"
 
+dnl Check for X11 path, needed for OpenGL on some systems
+AC_PATH_X
+if test x$have_x = xyes; then
+    if test x$ac_x_includes = xno || test x$ac_x_includes = x; then
+        :
+    else
+        CFLAGS="$CFLAGS -I$ac_x_includes"
+    fi
+    if test x$ac_x_libraries = xno || test x$ac_x_libraries = x; then
+        :
+    else
+        XPATH="-L$ac_x_libraries"
+    fi
+fi
+
 dnl Check for OpenGL
 AC_MSG_CHECKING(for OpenGL support)
 have_opengl=no
@@ -80,7 +95,7 @@
 AC_MSG_RESULT($have_opengl)
 if test x$have_opengl = xyes; then
     CFLAGS="$CFLAGS -DHAVE_OPENGL"
-    GLLIB="$SYS_GL_LIBS"
+    GLLIB="$XPATH $SYS_GL_LIBS"
 else
     GLLIB=""
 fi