[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

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

New commits:
commit 241cd53ff62599ecf557c6a4f975fc427dad9700
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Feb 5 11:33:47 2013 +0900

    Revert "test: Use SH_LOG_COMPILER and AM_TESTS_ENVIRONMENT"
    
    This reverts commit 2146b0307a3476892723104481f27f8484451c52.
    
    That change introduces incompatibility and seems not working with
    older releases of automake, including automake 1.12.2.

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