[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[patch] Use FT2_CFLAGS when checking for FTGL headers.
From: |
Jason Riedy |
Subject: |
[patch] Use FT2_CFLAGS when checking for FTGL headers. |
Date: |
Tue, 21 Oct 2008 23:02:22 -0400 |
User-agent: |
Gnus/5.110011 (No Gnus v0.11) Emacs/23.0.60 (gnu/linux) |
# HG changeset patch
# User Jason Riedy <address@hidden>
# Date 1224643038 14400
# Node ID 24b6a8dabe396bfc8099c3153424023640d5fea7
# Parent 873ea2c72f16b4f089d721809b419c3c5cc522bb
Use FT2_CFLAGS when checking for FTGL headers.
The flags need added to both CXXFLAGS and CPPFLAGS to pass
all of AC_CHECK_HEADERS's tests.
diff -r 873ea2c72f16 -r 24b6a8dabe39 ChangeLog
--- a/ChangeLog Tue Oct 21 15:49:13 2008 -0400
+++ b/ChangeLog Tue Oct 21 22:37:18 2008 -0400
@@ -1,3 +1,8 @@
+2008-10-21 Jason Riedy <address@hidden>
+
+ * configure.in: Take care to use FT2_CFLAGS when checking
+ for FTGL headers.
+
2008-10-16 David Bateman <address@hidden>
* NEWS: Minor update.
diff -r 873ea2c72f16 -r 24b6a8dabe39 configure.in
--- a/configure.in Tue Oct 21 15:49:13 2008 -0400
+++ b/configure.in Tue Oct 21 22:37:18 2008 -0400
@@ -654,6 +654,12 @@
[warn_freetype="FreeType library not found. Native renderer will not have
on-screen text"])
if test -z "$warn_freetype"; then
AC_LANG_PUSH(C++)
+ save_LIBS="$LIBS"
+ save_CXXFLAGS="$CXXFLAGS"
+ save_CPPFLAGS="$CPPFLAGS"
+ LIBS="$LIBS $OPENGL_LIBS $FT2_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], [
@@ -662,10 +668,7 @@
], has_ftgl_h=no)])
if test "$has_ftgl_h" = yes; then
AC_MSG_CHECKING([for FTGLTextureFont in -lftgl])
- save_LIBS="$LIBS"
- save_CXXFLAGS="$CXXFLAGS"
- LIBS="$LIBS $OPENGL_LIBS $FT2_LIBS -lftgl"
- CXXFLAGS="$CXXFLAGS $FT2_CFLAGS"
+ LIBS="$LIBS -lftgl"
AC_TRY_LINK([
#ifdef HAVE_FTGL_FTGL_H
#ifdef HAVE_FTGL_UPPERCASE
@@ -685,6 +688,7 @@
FTGLTextureFont font("");], [
OPENGL_LIBS="$OPENGL_LIBS $FT2_LIBS -lftgl"
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"],[
@@ -693,6 +697,7 @@
])
LIBS="$save_LIBS"
CXXFLAGS="$save_CXXFLAGS"
+ CPPFLAGS="$save_CPPFLAGS"
else
warn_ftgl="FTGL headers not found. Native renderer will not have
on-screen text"
fi
- [patch] Use FT2_CFLAGS when checking for FTGL headers.,
Jason Riedy <=