diff options
| author | panne <unknown> | 2003-12-18 21:34:31 +0000 |
|---|---|---|
| committer | panne <unknown> | 2003-12-18 21:34:31 +0000 |
| commit | 6e1f0ed78a48359bc65bc4d35973d61999e6f33c (patch) | |
| tree | dcd12633dc66059b765f35d199f85618d637648c /aclocal.m4 | |
| parent | e807565a9792b31ed02e37fd837375840be6a22f (diff) | |
| download | haskell-6e1f0ed78a48359bc65bc4d35973d61999e6f33c.tar.gz | |
[project @ 2003-12-18 21:34:31 by panne]
Synched with latest changes in Hugs' aclocal.m4 (wglGetProcAddress
fiddling)
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 5e5d4c91e8..ab6ec27b5e 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 |