From: panne <unknown>
Date: Sun, 17 Feb 2002 14:03:10 +0000 (+0000)
Subject: [project @ 2002-02-17 14:03:10 by panne]
X-Git-Tag: Approximately_9120_patches~12
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=bebf95f8ede42cb3e3c6e9819a2c03dee6797162;p=ghc-hetmet.git

[project @ 2002-02-17 14:03:10 by panne]
Automagically determine the flags for compiling/linking OpenGL
programs at configuration time, and stuff the relevant info into
OpenGL's package configuration file. This still mixes up compilation
time vs. installation time, but it's much better than hardcoded flags.
---

diff --git a/configure.in b/configure.in
index 0cbd799..36ccd58 100644
--- a/configure.in
+++ b/configure.in
@@ -953,6 +953,8 @@ mingw32)  ;;
 *) AC_PATH_XTRA() ;;
 esac
 
+FPTOOLS_HAVE_OPENGL
+
 dnl ################################################################
 dnl Check for libraries
 dnl ################################################################
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 3dc1f9e..83e2886 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -332,6 +332,8 @@ LIBM=@LIBM@
 # Build the Haskell OpenGL/GLUT binding?
 #
 GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
+GL_CFLAGS=@GL_CFLAGS@
+GL_LIBS=@GL_LIBS@
 
 X_CFLAGS=@X_CFLAGS@
 X_LIBS=@X_LIBS@