X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=m4%2Ffontconfig.m4;h=98da5a2caaf2d63699e981b3d19a902dd32ed1b6;hp=9e0d6fb24c9590f5dd94d95b0e6553824c24168a;hb=HEAD;hpb=f2cc9fc482e1921f71dbe3ecc91c94be1dcb8c1b

diff --git a/m4/fontconfig.m4 b/m4/fontconfig.m4
index 9e0d6fb..98da5a2 100644
--- a/m4/fontconfig.m4
+++ b/m4/fontconfig.m4
@@ -15,7 +15,7 @@
 # Substitutes:
 #
 
-AC_DEFUN(RFX_CHECK_FONTCONFIG,
+AC_DEFUN([RFX_CHECK_FONTCONFIG],
 [
 OLDCPPFLAGS="${CPPFLAGS}"
 OLDLIBS="${LIBS}"
@@ -24,8 +24,8 @@ if test -d /usr/include/fontconfig; then
     CPPFLAGS="$CPPFLAGS -I/usr/include/fontconfig"
 fi
 
-AC_CHECK_LIB(fontconfig, FcInit,HAVE_LIB_FONTCONFIG=1,)
-AC_CHECK_HEADERS(fontconfig.h,HAVE_FONTCONFIG_H=1)
+AC_CHECK_LIB(fontconfig, FcInit, [HAVE_LIB_FONTCONFIG=1],)
+AC_CHECK_HEADERS(fontconfig.h,[HAVE_FONTCONFIG_H=1])
 
 if test "x${HAVE_LIB_FONTCONFIG}" != "x";then
 if test "x${HAVE_FONTCONFIG_H}" != "x";then
@@ -58,13 +58,24 @@ int main()
     pattern = FcPatternBuild(0, FC_FAMILY, FcTypeString, "", 0);
     FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
     FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
+
+    FcConfig*c = FcConfigCreate();
+    FcConfigParseAndLoad(c, (FcChar8*)"", 1);
+    FcConfigBuildFonts(c);
+    FcConfigSetCurrent(c);
+	
+    FcFontSet * set =  FcConfigGetFonts(c, FcSetSystem);
+    FcFontSetDestroy(set);
+
     FcConfigSubstitute(0, pattern, FcMatchPattern); 
     FcDefaultSubstitute(pattern);
     match = FcFontMatch(0, pattern, &result);
     FcPatternGetString(match, "family", 0, &v) == FcResultMatch;
+    FcPatternGetBool(match, "family", 0, &v) == FcResultMatch;
     FcPatternPrint(pattern);
     FcPatternDestroy(pattern);
     FcPatternDestroy(match);
+    FcFini();
     return 0;
 }
 EOF
@@ -72,7 +83,7 @@ EOF
     ac_link='$CC $CPPFLAGS $CFLAGS conftest.c $LDFLAGS $LIBS -o conftest${ac_exeext}'
     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_FONTCONFIG, 1)
+	AC_DEFINE([HAVE_FONTCONFIG], [1], [Define if fontconfig is available])
     else
 	echo "configure: failed program was:" >&5
 	cat conftest.c >&5
@@ -83,7 +94,7 @@ EOF
 fi
 
 # if the above didn't work out, reset all changes to the compiler variables.
-if test "x${HAVE_FREETYPE}" "!=" "x1"; then 
+if test "x${HAVE_FONTCONFIG}" "!=" "x1"; then 
     CPPFLAGS=$OLDCPPFLAGS
     LIBS=$OLDLIBS
 fi