Re: Octave 3.1.50 available for ftp

[John W. Eaton]

On 21-Jul-2008, Michael Goffioul wrote:

| On Mon, Jul 21, 2008 at 5:52 PM, John W. Eaton <address@hidden> wrote:
| > I think this problem is fixed in my Mercurial archive now, so it
| > should be fixed in the 3.1.51 snapshot.
| 
| Does the FTGLTextureFont test work for you? On my system with
| ftgl-2.12, ftgl.h does not include FTGLTextureFont.h (ftgl-2.13 does
| include it).

The ftgl.h header from FTGL 2.1.3 includes FTGL/FTGLTextureFont.h.

So I guess we need a change like the attached?  Will this fail on a
system with case-insensitive filenames?  Does it need to be more
complex, or should we just require FTGL 2.1.3 once it is officially
released?

jwe

# HG changeset patch
# User John W. Eaton <address@hidden>
# Date 1216668442 14400
# Node ID 9939bb6332a395818b081b79c5d8a9207757c826
# Parent  ba2e00a216e8baadd7e26be233813c4034611b15
FTGL configure test fix

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-21  John W. Eaton  <address@hidden>
+
+       * configure.in: If FTGL.h is found, then also include
+       FTGLTextureFont.h in test code.
+
 2008-07-21  Michael Goffioul  <address@hidden>
 
        * configure.in: Remove GRAPHICS_OPENGL variable.
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -677,12 +677,14 @@
 #ifdef HAVE_FTGL_FTGL_H
 #ifdef HAVE_FTGL_UPPERCASE
 #include <FTGL/FTGL.h>
+#include <FTGL/FTGLTextureFont.h>
 #else
 #include <FTGL/ftgl.h>
 #endif
 #elif HAVE_FTGL_H
 #ifdef HAVE_FTGL_UPPERCASE
 #include <FTGL.h>
+#include <FTGLTextureFont.h>
 #else
 #include <ftgl.h>
 #endif