Mercurial > octave-nkf
changeset 9176:7ea76c8a59f7
configure.in: put -lftgl ahead of $FT2_LIBS, and $FT2_LIBS ahead of $OPENGL_LIBS
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 04 May 2009 21:22:36 -0400 |
| parents | 5baa4d43a2ae |
| children | 39be2c4531c8 |
| files | ChangeLog configure.in |
| diffstat | 2 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon May 04 18:07:14 2009 -0400 +++ b/ChangeLog Mon May 04 21:22:36 2009 -0400 @@ -1,3 +1,8 @@ +2009-05-04 John W. Eaton <jwe@octave.org> + + * configure.in: Put -lftgl ahead of $FT2_LIBS, and $FT2_LIBS ahead + of $OPENGL_LIBS. + 2009-05-04 Peter O'Gorman <pogma@thewrittenword.com> * aclocal.m4 (OCTAVE_HAVE_C99_VSNPRINTF): New macro.
--- a/configure.in Mon May 04 18:07:14 2009 -0400 +++ b/configure.in Mon May 04 21:22:36 2009 -0400 @@ -698,18 +698,18 @@ save_LIBS="$LIBS" save_CXXFLAGS="$CXXFLAGS" save_CPPFLAGS="$CPPFLAGS" - LIBS="$LIBS $OPENGL_LIBS $FT2_LIBS" + 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]) + 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" + LIBS="$save_LIBS -lftgl $FT2_LIBS $OPENGL_LIBS" AC_TRY_LINK([ #ifdef HAVE_FTGL_FTGL_H #ifdef HAVE_FTGL_UPPERCASE @@ -727,12 +727,12 @@ #include <FTGLTextureFont.h> #endif], [ FTGLTextureFont font("");], [ - OPENGL_LIBS="$OPENGL_LIBS $FT2_LIBS -lftgl" + 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"],[ + XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"], [ AC_MSG_RESULT(no) warn_ftgl="FTGL library not found. Native renderer will not have on-screen text" ])