diff options
Diffstat (limited to 'm4/opengl.m4')
| -rw-r--r-- | m4/opengl.m4 | 73 |
1 files changed, 32 insertions, 41 deletions
diff --git a/m4/opengl.m4 b/m4/opengl.m4 index c8ec7bd1b..fdc30751e 100644 --- a/m4/opengl.m4 +++ b/m4/opengl.m4 @@ -12,48 +12,39 @@ AC_DEFUN([AM_PATH_OPENGL], [ ) if test x$enableopengl = "xyes"; then - case "$host" in - *darwin*) dnl Use native interface - OPENGL_LIBS="-framework Carbon -framework AGL -framework OpenGL -framework AppKit" - OPENGL_CFLAGS="-framework Carbon -framework AGL -framework OpenGL -framework AppKit" - ac_use_opengl="yes" - ;; - *) - AC_CHECK_LIB(GL, glBegin, - [AC_CHECK_HEADER(GL/gl.h, - [ac_have_opengl="yes" - OPENGL_LIBS="-lGL" - dnl check for glut - AC_CHECK_LIB(glut, glutInit, - [ac_have_glut="yes" - GLUT_LIBS="-lglut" - AC_DEFINE(HAVE_GLUT,1,[Define this if you have GLut support available]) - AC_DEFINE(HAVE_OPENGL,1,[Define this if you have OpenGL support available]) - ], - [ac_have_glut="no" - dnl fallback, check for GLU - AC_CHECK_LIB(GLU, gluPerspective, - [ac_have_glu="yes" - GLU_LIBS="-lGLU -lm" - AC_DEFINE(HAVE_GLU,1,[Define this if you have GLU support available]) - AC_DEFINE(HAVE_OPENGL,1,[Define this if you have OpenGL support available]) - ], - [ac_have_glu="no"], - [$X_LIBS $X_PRE_LIBS $OPENGL_LIBS -lGLU -lm $X_EXTRA_LIBS] - ) - ], - [$X_LIBS $X_PRE_LIBS -lglut $X_EXTRA_LIBS] - ) - ] - )], - [], - [$X_LIBS $X_PRE_LIBS -lGL $X_EXTRA_LIBS] + AC_CHECK_LIB(GL, glBegin, + [AC_CHECK_HEADER(GL/gl.h, + [ac_have_opengl="yes" + OPENGL_LIBS="-lGL" + dnl check for glut + AC_CHECK_LIB(glut, glutInit, + [ac_have_glut="yes" + GLUT_LIBS="-lglut" + AC_DEFINE(HAVE_GLUT,1,[Define this if you have GLut support available]) + AC_DEFINE(HAVE_OPENGL,1,[Define this if you have OpenGL support available]) + ], + [ac_have_glut="no" + dnl fallback, check for GLU + AC_CHECK_LIB(GLU, gluPerspective, + [ac_have_glu="yes" + GLU_LIBS="-lGLU -lm" + AC_DEFINE(HAVE_GLU,1,[Define this if you have GLU support available]) + AC_DEFINE(HAVE_OPENGL,1,[Define this if you have OpenGL support available]) + ], + [ac_have_glu="no"], + [$X_LIBS $X_PRE_LIBS $OPENGL_LIBS -lGLU -lm $X_EXTRA_LIBS] + ) + ], + [$X_LIBS $X_PRE_LIBS -lglut $X_EXTRA_LIBS] ) - if test x$ac_have_opengl = "xyes" -a x$ac_have_glut = "xyes" -o x$ac_have_opengl = "xyes" -a x$ac_have_glu = "xyes"; then - ac_use_opengl=yes - fi - ;; - esac + ] + )], + [], + [$X_LIBS $X_PRE_LIBS -lGL $X_EXTRA_LIBS] + ) + if test x$ac_have_opengl = "xyes" -a x$ac_have_glut = "xyes" -o x$ac_have_opengl = "xyes" -a x$ac_have_glu = "xyes"; then + ac_use_opengl=yes + fi fi AC_SUBST(OPENGL_CFLAGS) |