view src/ftgl-1-gl-m4.patch @ 6037:99125d7343bf release octave-rc-7.0.90

Update version numbers and build rules for Octave 7.0.90 release candidate. * src/stable-octave.mk: Update version to 7.0.91. * src/release-octave.mk: Update version to 7.0.90. Update checksum for release candidate. Merge build rule changes from stable-octave.mk.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 06 Jan 2022 13:10:12 +0100
parents 3a42978c7bc6
children
line wrap: on
line source

--- ftgl-2.1.3~rc5/m4/gl.m4	2008-05-05 16:48:57.000000000 +0200
+++ ftgl-2.1.3~rc5/m4/gl.m4.new	2010-09-20 14:55:27.000000000 +0200
@@ -63,6 +63,8 @@
     LIBS="-lGL"
 fi
 AC_LINK_IFELSE([AC_LANG_CALL([],[glBegin])],[HAVE_GL=yes], [HAVE_GL=no])
+HAVE_GL=yes
+LIBS="-lopengl32"
 if test "x$HAVE_GL" = xno ; then
     if test "x$GL_X_LIBS" != x ; then
         LIBS="-lGL $GL_X_LIBS"
@@ -105,6 +107,8 @@
 AC_MSG_CHECKING([for GLU library])
 LIBS="-lGLU $GL_LIBS"
 AC_LINK_IFELSE([AC_LANG_CALL([],[gluNewTess])],[HAVE_GLU=yes], [HAVE_GLU=no])
+LIBS="-lglu32 $GL_LIBS"
+HAVE_GLU=yes
 if test "x$HAVE_GLU" = xno ; then
     if test "x$GL_X_LIBS" != x ; then
         LIBS="-lGLU $GL_LIBS $GL_X_LIBS"