qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-26 05:40:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed detection and defining of XMESA.

Browse source
This commit is contained in:
Marcus Sundberg 2000-01-08 21:20:02 +00:00
parent 529ba80f9a
commit 9f6a386d6d
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
configure.in
View file

@ -338,18 +338,24 @@ fi
dnl Make sure -lGL or -lMesaGL works dnl Make sure -lGL or -lMesaGL works
if test "x$HAS_OGL" = xyes; then if test "x$HAS_OGL" = xyes; then
AC_CHECK_LIB(GL, glColor4f, OGL_LIBS="$OGL_LIBS -lGL" AC_CHECK_LIB(GL, glColor4f, OGL_LIBS="$OGL_LIBS -lGL"
HAS_OGL=yes, HAS_OGL=no, HAS_OGL=yes
[$OGL_LIBS $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS]) AC_CHECK_LIB(GL, XMesaSetFXmode, , HAS_XMESA=no,
[ $OGL_LIBS $X_LIBS -lXext -lX11 $X_EXTRA_LIBS]),
HAS_OGL=no,
[$OGL_LIBS $X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
if test "x$HAS_OGL" != xyes; then if test "x$HAS_OGL" != xyes; then
AC_CHECK_LIB(MesaGL, glColor4f, OGL_LIBS="$OGL_LIBS -lMesaGL" AC_CHECK_LIB(MesaGL, glColor4f, OGL_LIBS="$OGL_LIBS -lMesaGL"
HAS_OGL=yes, HAS_OGL=no, HAS_OGL=yes
[$OGL_LIBS $X_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS]) AC_CHECK_LIB(MesaGL, XMesaSetFXmode, , HAS_XMESA=no,
[ $OGL_LIBS $X_LIBS -lXext -lX11 $X_EXTRA_LIBS]),
HAS_OGL=no,
[$OGL_LIBS $X_LIBS -lXext -lX11 $X_EXTRA_LIBS])
fi fi
fi fi
if test "x$HAS_OGL" != xyes; then if test "x$HAS_OGL" != xyes; then
OGL_CFLAGS="" OGL_LIBS="" OGL_CFLAGS="" OGL_LIBS=""
else else
if test "xHAS_XMESA" = xyes; then if test "x$HAS_XMESA" = xyes; then
AC_DEFINE(XMESA) AC_DEFINE(XMESA)
fi fi
fi fi