[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[patch] Re: No FTGL, says configure script?
From: |
Jason Riedy |
Subject: |
[patch] Re: No FTGL, says configure script? |
Date: |
Fri, 24 Oct 2008 17:31:57 -0400 |
User-agent: |
Gnus/5.110011 (No Gnus v0.11) Emacs/23.0.60 (gnu/linux) |
Could you try this? It seems to work for me...
Jason, possibly without network access for a few days (Starband sucks).
# HG changeset patch
# User Jason Riedy <address@hidden>
# Date 1224883819 14400
# Node ID ab6182b1c8925569441545865feb79e5a716ab1a
# Parent 2c1ba965b486994c619a508e0fb7c12df473a739
Building after removing the configure references to FTGL still displays
text when plotting. I have no idea where FTGL is necessary; it is not
used explicitly anywhere in the current sources.
diff -r 2c1ba965b486 -r ab6182b1c892 ChangeLog
--- a/ChangeLog Thu Oct 23 16:01:06 2008 -0400
+++ b/ChangeLog Fri Oct 24 17:30:19 2008 -0400
@@ -1,3 +1,8 @@
+2008-10-24 Jason Riedy <address@hidden>
+
+ * configure.in: Completely remove FTGL references. FTGL is
+ not included or used directly anywhere in the sources.
+
2008-10-23 Jason Riedy <address@hidden>
* configure.in: Take care to use FT2_CFLAGS when checking
diff -r 2c1ba965b486 -r ab6182b1c892 configure.in
--- a/configure.in Thu Oct 23 16:01:06 2008 -0400
+++ b/configure.in Fri Oct 24 17:30:19 2008 -0400
@@ -643,66 +643,10 @@
## libraries needed for graphics
warn_freetype=""
-warn_ftgl=""
OCTAVE_OPENGL
if test -n "$OPENGL_LIBS"; then
AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is available])
-
-## ftgl (needs freetype 2)
- AC_CHECK_FT2([9.0.3],[],
- [warn_freetype="FreeType library not found. Native renderer will not have
on-screen text"])
- if test -z "$warn_freetype"; then
- AC_LANG_PUSH(C++)
- save_LIBS="$LIBS"
- save_CXXFLAGS="$CXXFLAGS"
- save_CPPFLAGS="$CPPFLAGS"
- LIBS="$LIBS $OPENGL_LIBS $FT2_LIBS"
- CXXFLAGS="$CXXFLAGS $FT2_CFLAGS"
- CPPFLAGS="$CPPFLAGS $FT2_CFLAGS"
- has_ftgl_h=yes
- AC_CHECK_HEADERS([FTGL/ftgl.h ftgl.h], break, [
- AC_CHECK_HEADERS([FTGL/FTGL.h FTGL.h], [
- AC_DEFINE(HAVE_FTGL_UPPERCASE,1,[Define to 1 if you have FTGL.h or
FTGL/FTGL.h])
- break
- ], has_ftgl_h=no)])
- if test "$has_ftgl_h" = yes; then
- AC_MSG_CHECKING([for FTGLTextureFont in -lftgl])
- LIBS="$LIBS -lftgl"
- AC_TRY_LINK([
-#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
-#endif], [
-FTGLTextureFont font("");], [
- OPENGL_LIBS="$OPENGL_LIBS $FT2_LIBS -lftgl"
- LIBS="$save_LIBS"
- CPPFLAGS="$save_CPPFLAGS"
- AC_DEFINE(HAVE_FTGL, 1, [Define to 1 if FTGL is present])
- AC_MSG_RESULT(yes)
- XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"],[
- AC_MSG_RESULT(no)
- warn_ftgl="FTGL library not found. Native renderer will not have
on-screen text"
- ])
- LIBS="$save_LIBS"
- CXXFLAGS="$save_CXXFLAGS"
- CPPFLAGS="$save_CPPFLAGS"
- else
- warn_ftgl="FTGL headers not found. Native renderer will not have
on-screen text"
- fi
- AC_LANG_POP(C++)
- fi
fi
GRAPHICS_LIBS=
- No FTGL, says configure script?, (continued)
- No FTGL, says configure script?, John W. Eaton, 2008/10/22
- Re: No FTGL, says configure script?, Ben Abbott, 2008/10/23
- Re: No FTGL, says configure script?, Ben Abbott, 2008/10/23
- Re: No FTGL, says configure script?, Ben Abbott, 2008/10/24
- Re: No FTGL, says configure script?, Jason Riedy, 2008/10/24
- [patch] Re: No FTGL, says configure script?,
Jason Riedy <=
- Re: No FTGL, says configure script?, Shai Ayal, 2008/10/25
- Re: No FTGL, says configure script?, Jason Riedy, 2008/10/25
- Re: No FTGL, says configure script?, John W. Eaton, 2008/10/25
- Re: No FTGL, says configure script?, Jason Riedy, 2008/10/25