From bc3e405877ec202308e3b0e3c795c716f762c2e1 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Fri, 30 Jan 2004 05:14:02 +0000 Subject: [PATCH] Don't depend on the linker being smart enough to pull in -lGL. See my e-mail to the dev list for more details. --- stepmania/autoconf/m4/opengl.m4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/autoconf/m4/opengl.m4 b/stepmania/autoconf/m4/opengl.m4 index 07d76f61be..c0985ce44b 100644 --- a/stepmania/autoconf/m4/opengl.m4 +++ b/stepmania/autoconf/m4/opengl.m4 @@ -5,7 +5,7 @@ AC_DEFUN(SM_OPENGL, GL_LIBS= if test "$enable_mesa" = "yes"; then AC_CHECK_LIB(MesaGL, glPushMatrix, have_mesagl=yes) - AC_CHECK_LIB(MesaGLU, gluGetString, have_mesaglu=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 @@ -13,7 +13,7 @@ AC_DEFUN(SM_OPENGL, if test "$GL_LIBS" = ""; then AC_CHECK_LIB(GL, glPushMatrix, have_gl=yes) - AC_CHECK_LIB(GLU, gluGetString, have_glu=yes) + AC_CHECK_LIB(GLU, gluGetString, have_glu=yes,, -lGL) if test "$have_gl" = "yes" -a "$have_glu" = "yes"; then GL_LIBS="-lGL -lGLU" fi @@ -31,7 +31,7 @@ AC_DEFUN(SM_OPENGL, if test "$enable_mesa" = "yes"; then AC_CHECK_LIB(MesaGL, glPushMatrix, have_mesagl=yes) - AC_CHECK_LIB(MesaGLU, gluGetString, have_mesaglu=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 @@ -39,7 +39,7 @@ AC_DEFUN(SM_OPENGL, if test "$GL_LIBS" = ""; then AC_CHECK_LIB(GL, glPushMatrix, have_gl=yes) - AC_CHECK_LIB(GLU, gluGetString, have_glu=yes) + AC_CHECK_LIB(GLU, gluGetString, have_glu=yes,, -lGL) if test "$have_gl" = "yes" -a "$have_glu" = "yes"; then GL_LIBS="-lGL -lGLU" fi