Restore CXXFLAGS and LIBS correctly when FTGL headers are not present.
1 Restore CXXFLAGS and LIBS correctly when FTGL headers are not present.
3 diff -r f30241d62414 ChangeLog
4 --- a/ChangeLog Mon Feb 11 10:11:56 2008 +0100
5 +++ b/ChangeLog Thu Jun 12 10:42:26 2008 +0200
7 +2008-06-12 Michael Goffioul <michael.goffioul@gmail.com>
9 + * configure.in: Restore CXXFLAGS and LIBS correctly when FTGL headers
12 2008-06-05 John W. Eaton <jwe@octave.org>
14 * configure.in: Add FT2_CFLAGS to XTRA_CXXFLAGS, not CXXFLAGS.
15 diff -r f30241d62414 configure.in
16 --- a/configure.in Mon Feb 11 10:11:56 2008 +0100
17 +++ b/configure.in Thu Jun 12 10:42:26 2008 +0200
19 #include <FTGL/FTGLTextureFont.h>], [
20 FTGLTextureFont font("");], [
21 OPENGL_LIBS="$OPENGL_LIBS $FT2_LIBS -lftgl"
23 AC_DEFINE(HAVE_FTGL, 1, [Define to 1 if FTGL is present])
25 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"],[
26 - AC_MSG_RESULT(no)])],[
27 - warn_graphics="FTGL library not found. Native renderer will not have on-screen text"])
29 - CXXFLAGS="$save_CXXFLAGS"
32 + CXXFLAGS="$save_CXXFLAGS"],[
33 + warn_graphics="FTGL library not found. Native renderer will not have on-screen text"])