Mercurial > hg > octave-thorsten

changeset 8723:0899370cce9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include FTGLTextureFont.h when FTGL_UPPER_CASE is not defined.
author Ben Abbott <bpabbott@mac.com>
date Wed, 11 Feb 2009 19:14:42 -0500
parents 3cedb606145d
children a50228129dba
files ChangeLog configure.in
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-11 Ben Abbott <bpabbott@mac.com>
+
+	* configure.in: Include FTGLTextureFont.h when FTGL_UPPER_CASE is
+	not defined.
+
 2009-02-11  John W. Eaton  <jwe@octave.org>
 
 	* configure.in (octetcdir): New default value.
--- a/configure.in
+++ b/configure.in
@@ -708,17 +708,17 @@
 #ifdef HAVE_FTGL_FTGL_H
 #ifdef HAVE_FTGL_UPPERCASE
 #include <FTGL/FTGL.h>
-#include <FTGL/FTGLTextureFont.h>
 #else
 #include <FTGL/ftgl.h>
 #endif
+#include <FTGL/FTGLTextureFont.h>
 #elif HAVE_FTGL_H
 #ifdef HAVE_FTGL_UPPERCASE
 #include <FTGL.h>
-#include <FTGLTextureFont.h>
 #else
 #include <ftgl.h>
 #endif
+#include <FTGLTextureFont.h>
 #endif], [
 FTGLTextureFont font("");], [
           OPENGL_LIBS="$OPENGL_LIBS $FT2_LIBS -lftgl"