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

do the GLU check correctly

Browse Source
This commit is contained in:
Glenn Maynard
2004-01-27 06:09:27 +00:00
parent b5279e990d
commit 5548778cb1
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/autoconf/m4/opengl.m4
+25 -5
View File
@@ -4,11 +4,19 @@ AC_DEFUN(SM_OPENGL,
GL_LIBS= GL_LIBS=
if test "$enable_mesa" = "yes"; then if test "$enable_mesa" = "yes"; then
AC_CHECK_LIB(MesaGL, glPushMatrix, GL_LIBS=-lMesaGL) AC_CHECK_LIB(MesaGL, glPushMatrix, have_mesagl=yes)
AC_CHECK_LIB(MesaGLU, gluGetString, have_mesaglu=yes)
if test "$have_mesagl" = "yes" -a "$have_mesaglu" = "yes"; then
GL_LIBS="-lMesaGL -lMesaGLU"
fi
fi fi
if test "$GL_LIBS" = ""; then if test "$GL_LIBS" = ""; then
AC_CHECK_LIB(GL, glPushMatrix, GL_LIBS="-lGL") AC_CHECK_LIB(GL, glPushMatrix, have_gl=yes)
AC_CHECK_LIB(GLU, gluGetString, have_glu=yes)
if test "$have_gl" = "yes" -a "$have_glu" = "yes"; then
GL_LIBS="-lGL -lGLU"
fi
fi fi
# Some broken systems need us to link to X explicitly because # Some broken systems need us to link to X explicitly because
@@ -22,10 +30,23 @@ AC_DEFUN(SM_OPENGL,
LIBS="$LIBS $EXTRALIBS" LIBS="$LIBS $EXTRALIBS"
if test "$enable_mesa" = "yes"; then if test "$enable_mesa" = "yes"; then
AC_CHECK_LIB(MesaGL, glPushMatrix, GL_LIBS="-lMesaGL $EXTRALIBS") AC_CHECK_LIB(MesaGL, glPushMatrix, have_mesagl=yes)
AC_CHECK_LIB(MesaGLU, gluGetString, have_mesaglu=yes)
if test "$have_mesagl" = "yes" -a "$have_mesaglu" = "yes"; then
GL_LIBS="-lMesaGL -lMesaGLU"
fi
fi fi
if test "$GL_LIBS" = ""; then if test "$GL_LIBS" = ""; then
AC_CHECK_LIB(GL, glPushMatrix, GL_LIBS="-lGL $EXTRALIBS") AC_CHECK_LIB(GL, glPushMatrix, have_gl=yes)
AC_CHECK_LIB(GLU, gluGetString, have_glu=yes)
if test "$have_gl" = "yes" -a "$have_glu" = "yes"; then
GL_LIBS="-lGL -lGLU"
fi
fi
if test "$GL_LIBS" != ""; then
GL_LIBS="$GL_LIBS $EXTRALIBS"
fi fi
LIBS=$oldLIBS LIBS=$oldLIBS
oldLIBS= oldLIBS=
@@ -36,7 +57,6 @@ AC_DEFUN(SM_OPENGL,
AC_MSG_ERROR([No OpenGL libraries could be found. If you want AC_MSG_ERROR([No OpenGL libraries could be found. If you want
to search for MesaGL, pass the "--enable-mesa" flag to configure.]) to search for MesaGL, pass the "--enable-mesa" flag to configure.])
fi fi
AC_CHECK_LIB(GLU, gluGetString, GL_LIBS="$GL_LIBS -lGLU",, $GL_LIBS)
AC_SUBST(GL_LIBS) AC_SUBST(GL_LIBS)
]) ])