From: panne <unknown>
Date: Thu, 18 Dec 2003 21:34:31 +0000 (+0000)
Subject: [project @ 2003-12-18 21:34:31 by panne]
X-Git-Tag: Approx_11550_changesets_converted~173
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=6e1f0ed78a48359bc65bc4d35973d61999e6f33c

[project @ 2003-12-18 21:34:31 by panne]
Synched with latest changes in Hugs' aclocal.m4 (wglGetProcAddress
fiddling)
---

diff --git a/aclocal.m4 b/aclocal.m4
index 5e5d4c9..ab6ec27 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -999,16 +999,19 @@ else
 
     FP_CHECK_GL_HELPER([GL], [-lGL -lopengl32], [@%:@include <GL/gl.h>], [glEnd()])
 
-    # Ugly: To get wglGetProcAddress on Windows, we have to link with
-    # opengl32.dll, too, even when we are using Cygwin with X11.
-    case "$GL_LIBS" in
-      *-lopengl32*|*opengl32.lib*) ;;
-      *) fp_save_LIBS="$LIBS"
-         LIBS="$LIBS -lopengl32"
-         AC_TRY_LINK([@%:@include <GL/gl.h>], [glEnd()], [GL_LIBS="$GL_LIBS -lopengl32"])
-         LIBS="$fp_save_LIBS"
-         ;;
-    esac
+    if test x"$no_GL" != xyes; then
+      # Ugly: To get wglGetProcAddress on Windows, we have to link with
+      # opengl32.dll, too, even when we are using Cygwin with X11.
+      case "$GL_LIBS" in
+        *-lopengl32*|*opengl32.lib*) ;;
+        *) fp_save_LIBS="$LIBS"
+           LIBS="$LIBS -lopengl32"
+           AC_TRY_LINK([@%:@include <GL/gl.h>], [glEnd()],
+             [GL_LIBS="$GL_LIBS -lopengl32"; GL_LIBS0="$GL_LIBS0 -lopengl32"])
+           LIBS="$fp_save_LIBS"
+           ;;
+      esac
+    fi
   fi
 fi