Require automake 1.13

Fix tests build.

https://bugs.freedesktop.org/show_bug.cgi?id=71353
This commit is contained in:
Behdad Esfahbod 2013-12-04 19:59:48 -05:00
parent 205bf834d8
commit d913f98d88
2 changed files with 15 additions and 6 deletions

View File

@ -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

View File

@ -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