bugfixes

[swftools.git] / m4 / freetype.m4

diff --git a/m4/freetype.m4 b/m4/freetype.m4
index 3ffbea0..03b74df 100644 (file)
--- 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
@@ -30,11 +32,20 @@ fi
 fi
 fi
 
-AC_CHECK_LIB(freetype, FT_Init_FreeType,HAVE_LIB_FREETYPE=1,)
-AC_CHECK_HEADERS(freetype/freetype.h,HAVE_FREETYPE_FREETYPE_H=1)
+if test "x${FREETYPE_CONFIG}" '=' "x";then
+    # if we didn't find the freetype-config program, we won't
+    # know where the libs are expected to be. So just blindly
+    # try to link against them.
+    AC_CHECK_LIB(freetype, FT_Init_FreeType,HAVE_LIB_FREETYPE=1,)
+fi
+
 AC_CHECK_HEADERS(ft2build.h,HAVE_FT2BUILD_H=1)
+if test "x${HAVE_FT2BUILD_H}" '=' "x";then
+    AC_CHECK_HEADERS(freetype/freetype.h,HAVE_FREETYPE_FREETYPE_H=1)
+fi
 
-if test "x${HAVE_LIB_FREETYPE}" '!=' "x";then
+if test "x${HAVE_LIB_FREETYPE}" '!=' "x" -o \
+        "x${FREETYPE_CONFIG}" '!=' "x";then
     if test "x${HAVE_FREETYPE_FREETYPE_H}" '!=' "x";then
        HAVE_FREETYPE=1
     fi
@@ -44,15 +55,15 @@ if test "x${HAVE_LIB_FREETYPE}" '!=' "x";then
 fi
 
 if test "x${HAVE_FREETYPE}" = "x1"; then 
-    if test "x{$FREETYPE_CONFIG}" '!=' "x"; then
-       LIBS="$LIBS "`freetype-config --libs`
+    if test "x${FREETYPE_CONFIG}" '!=' "x"; then
+       LIBS="$LIBS "`$FREETYPE_CONFIG --libs`
     else
        LIBS="$LIBS -lfreetype"
     fi
 
-if test "x${HAVE_FT2BUILD_H}" = "x1"; then
-    HAVE_FT2BUILD_H_DEFINE='#define HAVE_FT2BUILD_H'
-fi
+    if test "x${HAVE_FT2BUILD_H}" = "x1"; then
+       HAVE_FT2BUILD_H_DEFINE='#define HAVE_FT2BUILD_H'
+    fi
 
     AC_MSG_CHECKING([whether we can compile the freetype test program])
 
@@ -116,6 +127,7 @@ EOF
     if { (eval echo freetype.m4:71: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
        AC_MSG_RESULT(yes)
        AC_DEFINE_UNQUOTED(HAVE_FREETYPE, 1)
+       AC_DEFINE_UNQUOTED(HAVE_FREETYPE_FREETYPE_H, 1)
        AC_DEFINE_UNQUOTED(USE_FREETYPE, 1)  # for ttf2tp1
     else
        echo "configure: failed program was:" >&5