[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 test/Makefile.am |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 5406919c5e186f74ccdade1a65344ce7b5c56a64
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Oct 11 19:31:22 2013 +0900

    do not build test-migration for Win32
    
    This testing code is for XDG base directory spec which may be not interesting for them

diff --git a/test/Makefile.am b/test/Makefile.am
index 52c63dc..f270b50 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -16,7 +16,7 @@ TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in
 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
 
-check_PROGRAMS = test-migration
+check_PROGRAMS =
 if HAVE_PTHREAD
 check_PROGRAMS += test-pthread
 test_pthread_LDADD = $(top_builddir)/src/libfontconfig.la
@@ -26,7 +26,10 @@ test_pthread_LDADD = $(top_builddir)/src/libfontconfig.la
 endif
 noinst_PROGRAMS = $(check_PROGRAMS)
 
+if !OS_WIN32
+check_PROGRAMS += test-migration
 test_migration_LDADD = $(top_builddir)/src/libfontconfig.la
+endif
 
 EXTRA_DIST=$(check_SCRIPTS) $(TESTDATA)