From: kramm Date: Tue, 23 Nov 2004 18:44:43 +0000 (+0000) Subject: fixed freetype-config detection. X-Git-Tag: release-0-6-3~132 X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=1bf3af9b2db2552fbaa5a02e2a824f0946499aec fixed freetype-config detection. --- diff --git a/m4/freetype.m4 b/m4/freetype.m4 index 709de3f..df9e412 100644 --- a/m4/freetype.m4 +++ b/m4/freetype.m4 @@ -17,11 +17,13 @@ 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 - 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 @@ -54,7 +56,7 @@ fi 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