Mercurial > sdl-ios-xcode

comparison test/configure.in @ 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 c121d94672cb
children 0b6f51c29267
comparison
equal deleted inserted replaced
2137:e47e63af07df 2138:9af6717e676a
66 AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) 66 AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
67 ) 67 )
68 CFLAGS="$CFLAGS $SDL_CFLAGS" 68 CFLAGS="$CFLAGS $SDL_CFLAGS"
69 LIBS="$LIBS $SDL_LIBS" 69 LIBS="$LIBS $SDL_LIBS"
70 70
71 dnl Check for X11 path, needed for OpenGL on some systems
72 AC_PATH_X
73 if test x$have_x = xyes; then
74 if test x$ac_x_includes = xno || test x$ac_x_includes = x; then
75 :
76 else
77 CFLAGS="$CFLAGS -I$ac_x_includes"
78 fi
79 if test x$ac_x_libraries = xno || test x$ac_x_libraries = x; then
80 :
81 else
82 XPATH="-L$ac_x_libraries"
83 fi
84 fi
85
71 dnl Check for OpenGL 86 dnl Check for OpenGL
72 AC_MSG_CHECKING(for OpenGL support) 87 AC_MSG_CHECKING(for OpenGL support)
73 have_opengl=no 88 have_opengl=no
74 AC_TRY_COMPILE([ 89 AC_TRY_COMPILE([
75 #include "SDL_opengl.h" 90 #include "SDL_opengl.h"
78 have_opengl=yes 93 have_opengl=yes
79 ]) 94 ])
80 AC_MSG_RESULT($have_opengl) 95 AC_MSG_RESULT($have_opengl)
81 if test x$have_opengl = xyes; then 96 if test x$have_opengl = xyes; then
82 CFLAGS="$CFLAGS -DHAVE_OPENGL" 97 CFLAGS="$CFLAGS -DHAVE_OPENGL"
83 GLLIB="$SYS_GL_LIBS" 98 GLLIB="$XPATH $SYS_GL_LIBS"
84 else 99 else
85 GLLIB="" 100 GLLIB=""
86 fi 101 fi
87 AC_SUBST(GLLIB) 102 AC_SUBST(GLLIB)
88 103