git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a4aa49c
)
fixed freetype-config detection.
author
kramm
<kramm>
Tue, 23 Nov 2004 18:44:43 +0000
(18:44 +0000)
committer
kramm
<kramm>
Tue, 23 Nov 2004 18:44:43 +0000
(18:44 +0000)
m4/freetype.m4
patch
|
blob
|
history
diff --git
a/m4/freetype.m4
b/m4/freetype.m4
index
709de3f
..
df9e412
100644
(file)
--- a/
m4/freetype.m4
+++ b/
m4/freetype.m4
@@
-17,11
+17,13
@@
AC_DEFUN(RFX_CHECK_FREETYPE,
[
AC_DEFUN(RFX_CHECK_FREETYPE,
[
-AC_CHECK_PROGS(FREETYPE_CONFIG, freetype-config,)
+
+AC_PATH_PROG(FREETYPE_CONFIG, freetype-config,, "$PATH:/usr/local/bin:/sw/bin:/opt/local/bin")
+
OLDCPPFLAGS="${CPPFLAGS}"
OLDLIBS="${LIBS}"
if test "x${FREETYPE_CONFIG}" '!=' "x"; then
OLDCPPFLAGS="${CPPFLAGS}"
OLDLIBS="${LIBS}"
if test "x${FREETYPE_CONFIG}" '!=' "x"; then
- CPPFLAGS="$CPPFLAGS "`freetype-config --cflags`
+ CPPFLAGS="$CPPFLAGS "`$FREETYPE_CONFIG --cflags`
else if test -d /usr/include/freetype2; then
CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
else if test -d /usr/local/include/freetype2; then
else if test -d /usr/include/freetype2; then
CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
else if test -d /usr/local/include/freetype2; then
@@
-54,7
+56,7
@@
fi
if test "x${HAVE_FREETYPE}" = "x1"; then
if test "x${FREETYPE_CONFIG}" '!=' "x"; then
if test "x${HAVE_FREETYPE}" = "x1"; then
if test "x${FREETYPE_CONFIG}" '!=' "x"; then
- LIBS="$LIBS "`freetype-config --libs`
+ LIBS="$LIBS "`$FREETYPE_CONFIG --libs`
else
LIBS="$LIBS -lfreetype"
fi
else
LIBS="$LIBS -lfreetype"
fi