Commit a304f049 authored by Sam Lantinga's avatar Sam Lantinga

OpenGL is in the X11 directory on some systems.

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402394
parent b8cfbcff
...@@ -68,6 +68,21 @@ AM_PATH_SDL($SDL_VERSION, ...@@ -68,6 +68,21 @@ AM_PATH_SDL($SDL_VERSION,
CFLAGS="$CFLAGS $SDL_CFLAGS" CFLAGS="$CFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS" 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 dnl Check for OpenGL
AC_MSG_CHECKING(for OpenGL support) AC_MSG_CHECKING(for OpenGL support)
have_opengl=no have_opengl=no
...@@ -80,7 +95,7 @@ have_opengl=yes ...@@ -80,7 +95,7 @@ have_opengl=yes
AC_MSG_RESULT($have_opengl) AC_MSG_RESULT($have_opengl)
if test x$have_opengl = xyes; then if test x$have_opengl = xyes; then
CFLAGS="$CFLAGS -DHAVE_OPENGL" CFLAGS="$CFLAGS -DHAVE_OPENGL"
GLLIB="$SYS_GL_LIBS" GLLIB="$XPATH $SYS_GL_LIBS"
else else
GLLIB="" GLLIB=""
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment