Mercurial > octave-nkf
changeset 7863:2a62d45fa21d
added check for FTGL library
* * *
imporve FTGL tests
| author | Shai Ayal <shaiay@users.sourceforge.net> |
|---|---|
| date | Fri, 04 Apr 2008 22:18:01 +0300 |
| parents | 8f3459a90bf3 |
| children | 56f781f38f0b |
| files | ChangeLog aclocal.m4 configure.in |
| diffstat | 3 files changed, 41 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Mar 23 16:45:45 2008 +0100 +++ b/ChangeLog Fri Apr 04 22:18:01 2008 +0300 @@ -1,5 +1,12 @@ 2008-06-04 Shai Ayal <shaiay@users.sourceforge.net> + * configure.in: Use AC_TRY_LINK in FTGL test. + Include FT_CFLAGS in CXXFLAGS. + + * aclocal.m4 (OCTAVE_OPENGL): Note FIXME for apple. + + * configure.in: Check for FTGL library. + * configure.in: Remove check for Fl/glu.h header. * aclocal.m4 (AC_CHECK_FT2): New macro to check for freetype2.
--- a/aclocal.m4 Sun Mar 23 16:45:45 2008 +0100 +++ b/aclocal.m4 Fri Apr 04 22:18:01 2008 +0300 @@ -1056,6 +1056,8 @@ dnl dnl Check for OpenGL. If found, define OPENGL_LIBS dnl +dnl FIXME -- add tests for apple +dnl AC_DEFUN([OCTAVE_OPENGL], [ OPENGL_LIBS= case $canonical_host_type in
--- a/configure.in Sun Mar 23 16:45:45 2008 +0100 +++ b/configure.in Fri Apr 04 22:18:01 2008 +0300 @@ -640,13 +640,39 @@ ## libraries needed for graphics +warn_graphics="" + GRAPHICS_OPENGL= OCTAVE_OPENGL if test "x$OPENGL_LIBS" != "x"; then GRAPHICS_OPENGL="opengl" + +## ftgl (needs freetype 2) + AC_CHECK_FT2([9.0.3],[], + [warn_graphics="FreeType library not found. Native renderer will not have on-screen text"]) + if test "x$warn_graphics" = "x" ; then + AC_LANG_PUSH(C++) + AC_CHECK_HEADERS([FTGL/FTGL.h], [ + AC_MSG_CHECKING([for FTGLTextureFont in -lftgl]) + save_LIBS="$LIBS" + save_CXXFLAGS="$CXXFLAGS" + LIBS="$LIBS $OPENGL_LIBS $FT2_LIBS -lftgl" + CXXFLAGS="$CXXFLAGS $FT2_CFLAGS" + AC_TRY_LINK([ +#include <FTGL/FTGLTextureFont.h>], [ +FTGLTextureFont font("");], [ + OPENGL_LIBS="$OPENGL_LIBS $FT2_LIBS -lftgl" + LIBS="$save_LIBS" + AC_DEFINE(HAVE_FTGL, 1, [Define to 1 if FTGL is present]) + AC_MSG_RESULT(yes)],[ + LIBS="$save_LIBS" + CXXFLAGS="$save_CXXFLAGS" + AC_MSG_RESULT(no)])],[ + warn_graphics="FTGL library not found. Native renderer will not have on-screen text"]) + AC_LANG_POP(C++) + fi fi - GRAPHICS_LIBS= GRAPHICS_CFLAGS= @@ -676,7 +702,6 @@ AC_PATH_PROG(FLTK_CONFIG, fltk-config, no) -warn_graphics="" if test "$FLTK_CONFIG" = "no" ; then warn_graphics="fltk library (www.fltk.org) not found. Native graphics will be disabled." else @@ -693,13 +718,9 @@ if test "x$warn_graphics" = "x" ; then AC_MSG_RESULT(yes) - ## FTGL flags - AC_CHECK_FT2([9.0.3],[], - [warn_graphics="FreeType library not found. Native graphics will be disabled."]) - - GRAPHICS_CFLAGS="$FLTK_CFLAGS $FT2_CFLAGS" - GRAPHICS_LIBS="$FLTK_LDFLAGS $FT2_LIBS" - GRAPHICS_OPENGL="$GRAPHICS_OPENGL fltk_backend" + GRAPHICS_CFLAGS="$FLTK_CFLAGS" + GRAPHICS_LIBS="$FLTK_LDFLAGS" + GRAPHICS_OPENGL="$GRAPHICS_OPENGL fltk_backend" else AC_MSG_RESULT(no) fi @@ -1979,10 +2000,11 @@ CURL libraries: $CURL_LIBS REGEX libraries: $REGEX_LIBS QHULL libraries: $QHULL_LIBS - GRAPHICS libraries $GRAPHICS_LIBS LIBS: $LIBS Default pager: $DEFAULT_PAGER gnuplot: $GNUPLOT + OPENGL libraries: $OPENGL_LIBS + fltk backend libs: $GRAPHICS_LIBS Do internal array bounds checking: $BOUNDS_CHECKING Build static libraries: $STATIC_LIBS