-
Notifications
You must be signed in to change notification settings - Fork 727
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
games/scourge: prepare for freetype2 update
- freetype2 will no longer ship freetype-config (which was a pkg-config wrapper) in the near future -- use pkg-config to gather the required flags. PR: 251512
- Loading branch information
Showing
2 changed files
with
21 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,25 @@ | ||
--- configure.in.orig 2008-12-22 23:38:10.000000000 +0000 | ||
+++ configure.in 2010-06-14 11:57:29.000000000 +0000 | ||
@@ -493,3 +493,6 @@ | ||
--- configure.in.orig 2008-12-22 23:38:10 UTC | ||
+++ configure.in | ||
@@ -421,8 +421,8 @@ if test "$FREETYPE" = "no"; then | ||
AC_MSG_ERROR(Cannot find freetype2: Is freetype-config in path?) | ||
have_FREETYPE=no | ||
else | ||
- FREETYPE_CFLAGS=`freetype-config --cflags` | ||
- FREETYPE_LIBS=`freetype-config --libs` | ||
+ FREETYPE_CFLAGS=`pkg-config freetype2 --cflags` | ||
+ FREETYPE_LIBS=`pkg-config freetype2 --libs` | ||
have_FREETYPE=yes | ||
fi | ||
fi | ||
@@ -491,7 +491,10 @@ if test "x$has_glx_get_proc" = "xyes" ; then | ||
fi | ||
|
||
dnl Check for glext.h | ||
-AC_CHECK_HEADERS( "GL/glext.h", have_glext_h=yes, have_glext_h=no ) | ||
+dnl XXX: which requires GL/gl.h, and autoconf > 2.64 is barfing on this | ||
+dnk XXX: use following check to cover the bases | ||
+dnl AC_CHECK_HEADERS( "GL/glext.h", have_glext_h=yes, have_glext_h=no ) | ||
+have_glext_h=yes | ||
|
||
if test "x$have_glext_h" = "xno" ; then | ||
AC_MSG_ERROR([ |