walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix make check fail with freetype-2.7.1 and 2.8 with PCF_CONFIG_OPTION_LONG_FAMILY_NAMES enabled.

This commit is contained in:
Akira TAGOH 2017-05-31 18:25:01 +09:00
parent 3072f14bdd
commit d33be23029
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -307,8 +307,17 @@ dnl The outcome of the family property has been changed in freetype-2.7.1.
dnl Our test cases relies on it and need to update the dependency to get it success. dnl Our test cases relies on it and need to update the dependency to get it success.
dnl However it isn't exactly required to run fontconfig itself. dnl However it isn't exactly required to run fontconfig itself.
dnl so adding another test here for compatibility. it might be simplified in the future. dnl so adding another test here for compatibility. it might be simplified in the future.
PKG_CHECK_EXISTS([freetype2 >= 19.0.13], [have_freetype_2_7_1=yes], [have_freetype_2_7_1=no]) PKG_CHECK_EXISTS([freetype2 = 19.0.13], [have_freetype_2_7_1=yes], [have_freetype_2_7_1=no])
AM_CONDITIONAL(FREETYPE_2_7_1, test "x$have_freetype_2_7_1" = xyes) PKG_CHECK_EXISTS([freetype2 >= 20.0.14],
[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])],
[have_pcf_long_family_names=no])
AM_CONDITIONAL(FREETYPE_PCF_LONG_FAMILY_NAMES, test "x$have_freetype_2_7_1" = xyes -o "x$have_pcf_long_family_names" = xyes)
AC_SUBST(FREETYPE_LIBS) AC_SUBST(FREETYPE_LIBS)
AC_SUBST(FREETYPE_CFLAGS) AC_SUBST(FREETYPE_CFLAGS)

10
test/Makefile.am
View File

@ -1,4 +1,8 @@
if FREETYPE_PCF_LONG_FAMILY_NAMES
check_SCRIPTS=run-test271.sh
else
check_SCRIPTS=run-test.sh check_SCRIPTS=run-test.sh
endif
TEST_EXTENSIONS = \ TEST_EXTENSIONS = \
.sh \ .sh \
$(NULL) $(NULL)
@ -10,13 +14,13 @@ AM_TESTS_ENVIRONMENT= \
SH_LOG_COMPILER = sh SH_LOG_COMPILER = sh
if FREETYPE_2_7_1 if FREETYPE_PCF_LONG_FAMILY_NAMES
TESTS=run-test271.sh TESTS=run-test271.sh
else else
TESTS=run-test.sh TESTS=run-test.sh
endif endif
TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in TESTDATA=4x6.pcf 8x16.pcf out.expected out271.expected fonts.conf.in
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
@ -46,7 +50,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=$(check_SCRIPTS) $(TESTDATA) EXTRA_DIST=run-test.sh run-test271.sh $(TESTDATA)
CLEANFILES= CLEANFILES=