Mercurial > mxe-octave
view src/ftgl-1-gl-m4.patch @ 3721:933b99febcf1
Expand options to support 3 possible sources of octave
* configure.ac: modify --enable-stable rule to --enable-octave=source (stable,alpha,default)
* Makefile.am: modify OCTAVE_TARGET based on octave build value set in configure.
* index.html: added master-octave information.
* src/default-octave.mk: new file.
* src/default-octave-1-docinstall.patch
* dist-files.mk: add default-octave-1-docinstall.patch default-octave.mk
* binary-dist-rules.mk: use OCTAVE_TARGET to decide on tarball/installer name
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Sun, 19 Oct 2014 22:58:20 -0400 |
| 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"