[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

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

New commits:
commit 2146b0307a3476892723104481f27f8484451c52
Author: Quentin Glidic <sardemff7+git at sardemff7.net>
Date:   Sat Feb 2 17:01:07 2013 +0100

    test: Use SH_LOG_COMPILER and AM_TESTS_ENVIRONMENT
    
    TESTS_ENVIRONMENT is deprecated and should be reserved to the user to
    override the test environment
    
    <ext>_LOG_COMPILER is meant to contain the program that runs the test
    with <ext> extension
    AM_TESTS_ENVIRONMENT is meant to set the environment for the tests
    
      https://bugs.freedesktop.org/show_bug.cgi?id=60192
    
    Signed-off-by: Quentin Glidic <sardemff7+git at sardemff7.net>

diff --git a/test/Makefile.am b/test/Makefile.am
index 664138a..3d47da3 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,5 +1,15 @@
 check_SCRIPTS=run-test.sh
-TESTS_ENVIRONMENT=src=${srcdir} EXEEXT=${EXEEXT} sh
+TEST_EXTENSIONS = \
+	.sh
+
+AM_TESTS_ENVIRONMENT= \
+	src=${srcdir}; \
+	EXEEXT=${EXEEXT}; \
+	export src; \
+	export EXEEXT;
+
+SH_LOG_COMPILER = sh
+
 TESTS=run-test.sh
 
 TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in