1 --- a/series Wed Jun 11 15:03:20 2008 +0200
2 +++ b/series Thu Jun 12 10:43:14 2008 +0200
3 @@ -1,2 +1,3 @@
4 mkoctfile_cpp
5 mkoctfile_cpp_cleanup_o_files
6 +configure_CXXFLAGS_restore
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/configure_CXXFLAGS_restore Thu Jun 12 10:43:14 2008 +0200
1.3 @@ -0,0 +1,36 @@
1.4 +Restore CXXFLAGS and LIBS correctly when FTGL headers are not present.
1.5 +
1.6 +diff -r f30241d62414 ChangeLog
1.7 +--- a/ChangeLog Mon Feb 11 10:11:56 2008 +0100
1.8 ++++ b/ChangeLog Thu Jun 12 10:42:26 2008 +0200
1.9 +@@ -1,3 +1,8 @@
1.10 ++2008-06-12 Michael Goffioul <michael.goffioul@gmail.com>
1.11 ++
1.12 ++ * configure.in: Restore CXXFLAGS and LIBS correctly when FTGL headers
1.13 ++ are not present.
1.14 ++
1.15 + 2008-06-05 John W. Eaton <jwe@octave.org>
1.16 +
1.17 + * configure.in: Add FT2_CFLAGS to XTRA_CXXFLAGS, not CXXFLAGS.
1.18 +diff -r f30241d62414 configure.in
1.19 +--- a/configure.in Mon Feb 11 10:11:56 2008 +0100
1.20 ++++ b/configure.in Thu Jun 12 10:42:26 2008 +0200
1.21 +@@ -662,14 +662,13 @@
1.22 + #include <FTGL/FTGLTextureFont.h>], [
1.23 + FTGLTextureFont font("");], [
1.24 + OPENGL_LIBS="$OPENGL_LIBS $FT2_LIBS -lftgl"
1.25 +- LIBS="$save_LIBS"
1.26 + AC_DEFINE(HAVE_FTGL, 1, [Define to 1 if FTGL is present])
1.27 + AC_MSG_RESULT(yes)
1.28 + XTRA_CXXFLAGS="$XTRA_CXXFLAGS $FT2_CFLAGS"],[
1.29 +- AC_MSG_RESULT(no)])],[
1.30 +- warn_graphics="FTGL library not found. Native renderer will not have on-screen text"])
1.31 +- LIBS="$save_LIBS"
1.32 +- CXXFLAGS="$save_CXXFLAGS"
1.33 ++ AC_MSG_RESULT(no)])
1.34 ++ LIBS="$save_LIBS"
1.35 ++ CXXFLAGS="$save_CXXFLAGS"],[
1.36 ++ warn_graphics="FTGL library not found. Native renderer will not have on-screen text"])
1.37 + AC_LANG_POP(C++)
1.38 + fi
1.39 + fi