-if test "x${enable_opengl}" != "xno"; then
- # grumbel: xlib path is needed on my system to get OpenGL right,
- # else I end up with a black screen, might be a debian issue or a
- # local issue on my system, not sure
- AC_PATH_XTRA
- CXXFLAGS="$CXXFLAGS $X_CFLAGS"
- LDFLAGS="$LDFLAGS $X_LIBS"
-
- AC_CHECK_LIB(GL, glBegin,,
- [CXXFLAGS="$CXXFLAGS -DNOOPENGL"
- enable_opengl="no"])
+if test "$enable_opengl" = "yes"; then
+ AX_CHECK_GL
+fi
+if test "$no_gl" = "yes" -o "$enable_opengl" = "no"; then
+ CXXFLAGS="$CXXFLAGS -DNOOPENGL"
+ enable_opengl=no
+else
+ CFLAGS="$CFLAGS $GL_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $GL_CFLAGS"
+ LIBS="$LIBS $GL_LIBS"