From: panne <unknown>
Date: Sun, 5 Oct 2003 20:14:49 +0000 (+0000)
Subject: [project @ 2003-10-05 20:14:49 by panne]
X-Git-Tag: Approx_11550_changesets_converted~390
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=049481ee9713acd755376033c3f131f6babbffff;p=ghc-hetmet.git

[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.
---

diff --git a/aclocal.m4 b/aclocal.m4
index 9c1bc92..01e5c4f 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)