Mercurial > sdl-ios-xcode

changeset 2138:9af6717e676a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged change from 1.2 to add X11 path for OpenGL detection
author Sam Lantinga <slouken@libsdl.org>
date Sat, 30 Jun 2007 08:11:02 +0000
parents e47e63af07df
children c2a276a27381
files test/configure.in
diffstat 1 files changed, 16 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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