[ based on https://www-old.cae.wisc.edu/pipermail/octave-maintainers/2009-September/013381.html ] --- octave-3.2.2/configure.in~ 2009-09-22 11:14:44.902786285 +0200 +++ octave-3.2.2/configure.in 2009-09-22 11:18:11.702868210 +0200 @@ -680,13 +680,12 @@ ## 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) +## 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 @@ -697,48 +696,6 @@ LIBS="$LIBS $FT2_LIBS $OPENGL_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="$save_LIBS -lftgl $FT2_LIBS $OPENGL_LIBS" - AC_TRY_LINK([ -#ifdef HAVE_FTGL_FTGL_H -#ifdef HAVE_FTGL_UPPERCASE -#include -#else -#include -#endif -#include -#elif HAVE_FTGL_H -#ifdef HAVE_FTGL_UPPERCASE -#include -#else -#include -#endif -#include -#endif], [ -FTGLTextureFont font("");], [ - OPENGL_LIBS="-lftgl $FT2_LIBS $OPENGL_LIBS" - 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 @@ -2430,12 +2387,6 @@ warn_msg_printed=true fi -if test -n "$warn_ftgl"; then - AC_MSG_WARN("$warn_ftgl") - native_graphics=false - warn_msg_printed=true -fi - if test -n "$warn_fltk_config"; then AC_MSG_WARN("$warn_fltk_config") native_graphics=false