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