Commit 64895e71 authored by Akira TAGOH's avatar Akira TAGOH

Add the check of PCF_CONFIG_OPTION_LONG_FAMILY_NAMES back

This isn't enabled by default in freetype so need to check it for testsuites
parent e73b5dcb
...@@ -321,9 +321,22 @@ AC_SUBST(FREETYPE_LIBS) ...@@ -321,9 +321,22 @@ AC_SUBST(FREETYPE_LIBS)
AC_SUBST(FREETYPE_CFLAGS) AC_SUBST(FREETYPE_CFLAGS)
fontconfig_save_libs="$LIBS" fontconfig_save_libs="$LIBS"
fontconfig_save_cflags="$CFLAGS"
LIBS="$LIBS $FREETYPE_LIBS" LIBS="$LIBS $FREETYPE_LIBS"
CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
AC_CHECK_FUNCS(FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names FT_Get_X11_Font_Format) AC_CHECK_FUNCS(FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names FT_Get_X11_Font_Format)
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
#include <ft2build.h>
#include FT_CONFIG_OPTIONS_H
#ifndef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
# error "No pcf long family names support"
#endif
]])], [have_pcf_long_family_names=yes], [have_pcf_long_family_names=no])
AM_CONDITIONAL(FREETYPE_PCF_LONG_FAMILY_NAMES, test "x$have_pcf_long_family_names" = xyes)
LIBS="$fontconfig_save_libs" LIBS="$fontconfig_save_libs"
CFLAGS="$fontconfig_save_cflags"
# #
# Check expat configuration # Check expat configuration
......
...@@ -8,11 +8,21 @@ AM_TESTS_ENVIRONMENT= \ ...@@ -8,11 +8,21 @@ AM_TESTS_ENVIRONMENT= \
EXEEXT=${EXEEXT}; export EXEEXT; \ EXEEXT=${EXEEXT}; export EXEEXT; \
$(NULL) $(NULL)
BUILT_SOURCES = out.expected
SH_LOG_COMPILER = sh SH_LOG_COMPILER = sh
TESTS=run-test.sh TESTS=run-test.sh
TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in
if FREETYPE_PCF_LONG_FAMILY_NAMES
out.expected: $(srcdir)/out.expected-long-family-names
cp $(srcdir)/out.expected-long-family-names out.expected
else
out.expected: $(srcdir)/out.expected-no-long-family-names
cp $(srcdir)/out.expected-no-long-family-names out.expected
endif
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
check_PROGRAMS = check_PROGRAMS =
...@@ -45,7 +55,7 @@ check_PROGRAMS += test-bz96676 ...@@ -45,7 +55,7 @@ check_PROGRAMS += test-bz96676
test_bz96676_LDADD = $(top_builddir)/src/libfontconfig.la test_bz96676_LDADD = $(top_builddir)/src/libfontconfig.la
TESTS += test-bz96676 TESTS += test-bz96676
EXTRA_DIST=run-test.sh $(TESTDATA) EXTRA_DIST=run-test.sh $(TESTDATA) out.expected-long-family-names out.expected-no-long-family-names
CLEANFILES= CLEANFILES=
......
Fixed:pixelsize=16
Fixed:pixelsize=6
=
Fixed:pixelsize=16
Fixed:pixelsize=6
=
Fixed:pixelsize=16
Fixed:pixelsize=6
...@@ -46,7 +46,7 @@ check () { ...@@ -46,7 +46,7 @@ check () {
echo "=" >> out echo "=" >> out
$FCLIST - family pixelsize | sort >> out $FCLIST - family pixelsize | sort >> out
tr -d '\015' <out >out.tmp; mv out.tmp out tr -d '\015' <out >out.tmp; mv out.tmp out
if cmp out $TESTDIR/$EXPECTED > /dev/null ; then : ; else if cmp out $EXPECTED > /dev/null ; then : ; else
echo "*** Test failed: $TEST" echo "*** Test failed: $TEST"
echo "*** output is in 'out', expected output in '$EXPECTED'" echo "*** output is in 'out', expected output in '$EXPECTED'"
exit 1 exit 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment