# Substitutes:
#
-AC_DEFUN(RFX_CHECK_FONTCONFIG,
+AC_DEFUN([RFX_CHECK_FONTCONFIG],
[
OLDCPPFLAGS="${CPPFLAGS}"
OLDLIBS="${LIBS}"
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
fi
cat > conftest.c << EOF
+#include <string.h>
#include <fontconfig.h>
int main()
FcPattern *pattern, *match;
FcResult result;
FcChar8 *v;
+ char*s1="abc",*s2="ABC";
+ strcasecmp(s1,s2);
FcInit();
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
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
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