Mercurial > octave-nkf
changeset 7915:d74e515cb535
configure.in: check for ftgl.h instead of FTGL.h
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 10 Jul 2008 10:01:18 -0400 |
| parents | e998e81224b5 |
| children | f805e026c481 |
| files | ChangeLog configure.in |
| diffstat | 2 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jul 10 08:59:18 2008 -0400 +++ b/ChangeLog Thu Jul 10 10:01:18 2008 -0400 @@ -1,3 +1,8 @@ +2008-07-10 John W. Eaton <jwe@octave.org> + + * configure.in: Look for FTGL/ftgl.h instead of FTGL/FTGL.h. Also + look for ftgl.h. + 2008-07-10 Michael Goffioul <michael.goffioul@gmail.com> * configure.in: new substituted variables GL_RENDER_SRC and
--- a/configure.in Thu Jul 10 08:59:18 2008 -0400 +++ b/configure.in Thu Jul 10 10:01:18 2008 -0400 @@ -654,14 +654,18 @@ [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_CHECK_HEADERS([FTGL/ftgl.h 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>], [ +#ifdef HAVE_FTGL_FTGL_H +#include <FTGL/ftgl.h> +#elif HAVE_FTGL_H +#include <ftgl.h> +#fi], [ FTGLTextureFont font("");], [ OPENGL_LIBS="$OPENGL_LIBS $FT2_LIBS -lftgl" LIBS="$save_LIBS"