diff options
| author | panne <unknown> | 2003-10-05 20:14:49 +0000 |
|---|---|---|
| committer | panne <unknown> | 2003-10-05 20:14:49 +0000 |
| commit | 049481ee9713acd755376033c3f131f6babbffff (patch) | |
| tree | d314ec3671d0b794e466acc5c94335e015ab02ac /aclocal.m4 | |
| parent | 10b68ffeaa642b8b61b85096052b18227ff3c83b (diff) | |
| download | haskell-049481ee9713acd755376033c3f131f6babbffff.tar.gz | |
[project @ 2003-10-05 20:14:49 by panne]
Merged Ross' patch for Hugs:
Tweak to the FPTOOLS_HAVE_OPENGL: when testing for the GLUT lib,
include the GL/GLU/GLX libs just discovered. While most platforms
don't require this, mysteriously some (e.g. OpenBSD) do.
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 9c1bc925be..01e5c4fb40 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1057,7 +1057,9 @@ dnl and GL_X_LIBS/GLUT_X_LIBS. GL_CFLAGS= fi - LIBS="$GLUT_X_LIBS" + dnl Keep the GL/GLU/GLX libs, but expand the rest to what GLUT needs. + dnl (Some systems, like OpenBSD, need the GL/GLU libs.) + LIBS=`echo "$LIBS" | sed "s@$GL_X_LIBS@$GLUT_X_LIBS@"` FPTOOLS_SEARCH_LIBS([#include <GL/glut.h>], glutMainLoop, glut32 glut, have_glut=yes, have_glut=no) |