Skip to content
Snippets Groups Projects
Commit b5cb91bb authored by Claus-Justus Heine's avatar Claus-Justus Heine
Browse files

Properly check for the version of the gltools package in use:
gltools-2.5 has glrGetPOV(), gltools-2.4 has not. gltools-2.5 require
glRender() to be invoked with NULL arguments, gltools-2.4 breaks if
this is done. Fix that mess.
parent 40fd1303
No related branches found
No related tags found
No related merge requests found
...@@ -23,6 +23,18 @@ if ! test "z${GLTOOLS_LIBS}" = "z"; then ...@@ -23,6 +23,18 @@ if ! test "z${GLTOOLS_LIBS}" = "z"; then
[AC_MSG_RESULT([using vanilla gltools version]) [AC_MSG_RESULT([using vanilla gltools version])
AC_DEFINE([HAVE_GLMLOOPCALLBACK_COORDS_ONLY], 0, AC_DEFINE([HAVE_GLMLOOPCALLBACK_COORDS_ONLY], 0,
[Define if glmLoopCallback accepts an "coords_only" argument.])]) [Define if glmLoopCallback accepts an "coords_only" argument.])])
ac_al_save_LIBS="${LIBS}"
LIBS="`eval eval eval echo ${GLTOOLS_ALL_LIBS}` ${LIBS}"
AC_CHECK_FUNC([glrGetPOV], [GLTOOLS_VERSION="25"], [GLTOOLS_VERSION="24"])
LIBS="${ac_al_save_LIBS}"
if test "$GLTOOLS_VERSION" = "24"; then
AC_MSG_RESULT([Using gltools 2.4])
else
AC_MSG_RESULT([Using gltools 2.5 or later])
fi
AC_SUBST([GLTOOLS_VERSION])
AC_DEFINE_UNQUOTED([GLTOOLS_VERSION], ${GLTOOLS_VERSION},
[Define to 24 if using gltools 2.4 and to 25 when using gltools-2.5])
CPPFLAGS="${ac_al_save_CPPFLAGS}" CPPFLAGS="${ac_al_save_CPPFLAGS}"
fi fi
AC_LANG_POP([C]) AC_LANG_POP([C])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment