actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove mesa junk; symlink it to libGL if you really want to do that

Browse Source 
handle broken systems that need -lGLU to link -lGL
This commit is contained in:
Glenn Maynard
2004-01-30 05:19:22 +00:00
parent bc3e405877
commit c812ac2ec9
1 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/autoconf/m4/opengl.m4
+7 -24
View File
@@ -1,19 +1,9 @@
AC_DEFUN(SM_OPENGL, AC_DEFUN(SM_OPENGL,
[ [
AC_ARG_ENABLE(mesa, AC_HELP_STRING([--enable-mesa], [Use libMesaGL]), enable_mesa=$enableval, enable_mesa=no)
GL_LIBS= GL_LIBS=
if test "$enable_mesa" = "yes"; then
AC_CHECK_LIB(MesaGL, glPushMatrix, have_mesagl=yes)
AC_CHECK_LIB(MesaGLU, gluGetString, have_mesaglu=yes,, -lMesaGL)
if test "$have_mesagl" = "yes" -a "$have_mesaglu" = "yes"; then
GL_LIBS="-lMesaGL -lMesaGLU"
fi
fi
if test "$GL_LIBS" = ""; then if test "$GL_LIBS" = ""; then
AC_CHECK_LIB(GL, glPushMatrix, have_gl=yes) AC_CHECK_LIB(GL, glPushMatrix, have_gl=yes)
AC_CHECK_LIB(GLU, gluGetString, have_glu=yes,, -lGL) AC_CHECK_LIB(GLU, gluGetString, have_glu=yes, , [-lGL])
if test "$have_gl" = "yes" -a "$have_glu" = "yes"; then if test "$have_gl" = "yes" -a "$have_glu" = "yes"; then
GL_LIBS="-lGL -lGLU" GL_LIBS="-lGL -lGLU"
fi fi
@@ -29,17 +19,9 @@ AC_DEFUN(SM_OPENGL,
EXTRALIBS="$X_LIBS $X_EXTRA_LIBS $X_PRE_LIBS -lX11" EXTRALIBS="$X_LIBS $X_EXTRA_LIBS $X_PRE_LIBS -lX11"
LIBS="$LIBS $EXTRALIBS" LIBS="$LIBS $EXTRALIBS"
if test "$enable_mesa" = "yes"; then
AC_CHECK_LIB(MesaGL, glPushMatrix, have_mesagl=yes)
AC_CHECK_LIB(MesaGLU, gluGetString, have_mesaglu=yes,, -lMesaGL)
if test "$have_mesagl" = "yes" -a "$have_mesaglu" = "yes"; then
GL_LIBS="-lMesaGL -lMesaGLU"
fi
fi
if test "$GL_LIBS" = ""; then if test "$GL_LIBS" = ""; then
AC_CHECK_LIB(GL, glPushMatrix, have_gl=yes) AC_CHECK_LIB(GL, glPushMatrix, have_gl=yes)
AC_CHECK_LIB(GLU, gluGetString, have_glu=yes,, -lGL) AC_CHECK_LIB(GLU, gluGetString, have_glu=yes, , [-lGL])
if test "$have_gl" = "yes" -a "$have_glu" = "yes"; then if test "$have_gl" = "yes" -a "$have_glu" = "yes"; then
GL_LIBS="-lGL -lGLU" GL_LIBS="-lGL -lGLU"
fi fi
@@ -54,11 +36,12 @@ AC_DEFUN(SM_OPENGL,
fi fi
if test "$GL_LIBS" = ""; then if test "$GL_LIBS" = ""; then
AC_MSG_ERROR([No OpenGL libraries could be found. If you want if test "$have_gl" != "yes"; then
to search for MesaGL, pass the "--enable-mesa" flag to configure.]) AC_MSG_ERROR([No OpenGL library could be found.])
else
AC_MSG_ERROR([No GLU library could be found.])
fi
fi fi
AC_SUBST(GL_LIBS) AC_SUBST(GL_LIBS)
]) ])