projects / packages / octave.git / blame
| Commit | Line | Data |
|---|---|---|
| 2d3d314e AG |
1 | [ based on https://www-old.cae.wisc.edu/pipermail/octave-maintainers/2009-September/013381.html ] |
| 2 | --- octave-3.2.2/configure.in~ 2009-09-22 11:14:44.902786285 +0200 | |
| 3 | +++ octave-3.2.2/configure.in 2009-09-22 11:18:11.702868210 +0200 | |
| 4 | @@ -680,13 +680,12 @@ | |
| 5 | ## libraries needed for graphics | |
| 6 | ||
| 7 | warn_freetype="" | |
| 8 | -warn_ftgl="" | |
| 9 | ||
| 10 | OCTAVE_OPENGL | |
| 11 | if test -n "$OPENGL_LIBS"; then | |
| 12 | AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is available]) | |
| 13 | ||
| 14 | -## ftgl (needs freetype 2) | |
| 15 | +## freetype 2 | |
| 16 | AC_CHECK_FT2([9.0.3],[], | |
| 17 | [warn_freetype="FreeType library not found. Native renderer will not have on-screen text"]) | |
| 18 | if test -z "$warn_freetype"; then | |
| 19 | @@ -697,48 +696,6 @@ | |
| 20 | LIBS="$LIBS $FT2_LIBS $OPENGL_LIBS" | |
| 21 | CXXFLAGS="$CXXFLAGS $FT2_CFLAGS" | |
| 22 | CPPFLAGS="$CPPFLAGS $FT2_CFLAGS" | |
| 23 | - has_ftgl_h=yes | |
| 24 | - AC_CHECK_HEADERS([FTGL/ftgl.h ftgl.h], break, [ | |
| 25 | - AC_CHECK_HEADERS([FTGL/FTGL.h FTGL.h], [ | |
| 26 | - AC_DEFINE(HAVE_FTGL_UPPERCASE, 1, [Define to 1 if you have FTGL.h or FTGL/FTGL.h]) | |
| 27 | - break | |
| 28 | - ], has_ftgl_h=no)]) | |
| 29 | - if test "$has_ftgl_h" = yes; then | |
| 30 | - AC_MSG_CHECKING([for FTGLTextureFont in -lftgl]) | |
| 31 | - LIBS="$save_LIBS -lftgl $FT2_LIBS $OPENGL_LIBS" | |
| 32 | - AC_TRY_LINK([ | |
| 33 | -#ifdef HAVE_FTGL_FTGL_H | |
| 34 | -#ifdef HAVE_FTGL_UPPERCASE | |
| 35 | -#include <FTGL/FTGL.h> | |
| 36 | -#else | |
| 37 | -#include <FTGL/ftgl.h> | |
| 38 | -#endif | |
| 39 | -#include <FTGL/FTGLTextureFont.h> | |
| 40 | -#elif HAVE_FTGL_H | |
| 41 | -#ifdef HAVE_FTGL_UPPERCASE | |
| 42 | -#include <FTGL.h> | |
| 43 | -#else | |
| 44 | -#include <ftgl.h> | |
| 45 | -#endif | |
| 46 | -#include <FTGLTextureFont.h> | |
| 47 | -#endif], [ | |
| 48 | -FTGLTextureFont font("");], [ | |
| 49 | - OPENGL_LIBS="-lftgl $FT2_LIBS $OPENGL_LIBS" | |
| 50 | - LIBS="$save_LIBS" | |
| 51 | - CPPFLAGS="$save_CPPFLAGS" | |
| 52 | - AC_DEFINE(HAVE_FTGL, 1, [Define to 1 if FTGL is present]) | |
| 53 | - AC_MSG_RESULT(yes) | |
| 54 | - XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"], [ | |
| 55 | - AC_MSG_RESULT(no) | |
| 56 | - warn_ftgl="FTGL library not found. Native renderer will not have on-screen text" | |
| 57 | - ]) | |
| 58 | - LIBS="$save_LIBS" | |
| 59 | - CXXFLAGS="$save_CXXFLAGS" | |
| 60 | - CPPFLAGS="$save_CPPFLAGS" | |
| 61 | - else | |
| 62 | - warn_ftgl="FTGL headers not found. Native renderer will not have on-screen text" | |
| 63 | - fi | |
| 64 | - AC_LANG_POP(C++) | |
| 65 | fi | |
| 66 | fi | |
| 67 | ||
| 68 | @@ -2430,12 +2387,6 @@ | |
| 69 | warn_msg_printed=true | |
| 70 | fi | |
| 71 | ||
| 72 | -if test -n "$warn_ftgl"; then | |
| 73 | - AC_MSG_WARN("$warn_ftgl") | |
| 74 | - native_graphics=false | |
| 75 | - warn_msg_printed=true | |
| 76 | -fi | |
| 77 | - | |
| 78 | if test -n "$warn_fltk_config"; then | |
| 79 | AC_MSG_WARN("$warn_fltk_config") | |
| 80 | native_graphics=false |