Require automake 1.13

Fix tests build.

https://bugs.freedesktop.org/show_bug.cgi?id=71353

diff --git a/configure.ac b/configure.ac
index 7b804b2..93b3bca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src/harfbuzz.pc.in])
 AC_CONFIG_HEADERS([config.h])
 
-AM_INIT_AUTOMAKE([1.11.1 gnits tar-pax dist-bzip2 no-dist-gzip -Wall no-define color-tests -Wno-portability])
+AM_INIT_AUTOMAKE([1.13 gnits tar-pax dist-bzip2 no-dist-gzip -Wall no-define color-tests -Wno-portability])
 AM_SILENT_RULES([yes])
 
 # Initialize libtool

diff --git a/test/shaping/Makefile.am b/test/shaping/Makefile.am
index 42c37c3..3d3943a 100644 (file)
--- a/test/shaping/Makefile.am
+++ b/test/shaping/Makefile.am
@@ -35,13 +35,22 @@ CLEANFILES += \
        $(NULL)
 
 TESTS = tests/context-matching.tests
-TESTS_ENVIRONMENT = \
-       EXEEXT="$(EXEEXT)" \
-       srcdir="$(srcdir)" \
-       builddir="$(builddir)" \
-       $(srcdir)/run-tests.sh \
+
+TEST_EXTENSIONS = \
+       .tests \
+       $(NULL)
+
+AM_TESTS_ENVIRONMENT = \
+       EXEEXT="$(EXEEXT)"; \
+       export EXEECT; \
+       srcdir="$(srcdir)"; \
+       export srcdir; \
+       builddir="$(builddir)"; \
+       export builddir; \
        $(NULL)
 
+TESTS_LOG_COMPILER = sh $(srcdir)/run-tests.sh
+
 .PHONY: manifests
 
 -include $(top_srcdir)/git.mk