[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 configure.ac             |    3 ++-
 test/shaping/Makefile.am |    7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 2646aec1e67cd6e09f5f7859c9d5898917acc2d5
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Dec 5 18:19:35 2013 -0500

    Drop required automake version back to 1.11.3
    
    Work around broken automake-1.13 changes.

diff --git a/configure.ac b/configure.ac
index 42b8b5f..5c52c89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,8 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src/harfbuzz.pc.in])
 AC_CONFIG_HEADERS([config.h])
 
-AM_INIT_AUTOMAKE([1.13 gnits tar-pax dist-bzip2 no-dist-gzip -Wall no-define color-tests -Wno-portability])
+AM_INIT_AUTOMAKE([1.11.1 gnits tar-pax dist-bzip2 no-dist-gzip -Wall no-define color-tests -Wno-portability])
+AM_CONDITIONAL(AUTOMAKE_OLDER_THAN_1_13, test $am__api_version = 1.11 -o $am__api_version = 1.12)
 AM_SILENT_RULES([yes])
 
 # Initialize libtool
diff --git a/test/shaping/Makefile.am b/test/shaping/Makefile.am
index 3d3943a..db3ebbc 100644
--- a/test/shaping/Makefile.am
+++ b/test/shaping/Makefile.am
@@ -49,6 +49,13 @@ AM_TESTS_ENVIRONMENT = \
 	export builddir; \
 	$(NULL)
 
+if AUTOMAKE_OLDER_THAN_1_13
+TESTS_ENVIRONMENT = \
+	$(AM_TESTS_ENVIRONMENT) \
+	$(TESTS_LOG_COMPILER) \
+	$(NULL)
+endif
+
 TESTS_LOG_COMPILER = sh $(srcdir)/run-tests.sh
 
 .PHONY: manifests