walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Drop required automake version back to 1.11.3 

Work around broken automake-1.13 changes.
This commit is contained in:
Behdad Esfahbod 2013-12-05 18:19:35 -05:00
parent 860fc9aa7b
commit 2646aec1e6
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -9,7 +9,8 @@ AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([src/harfbuzz.pc.in]) AC_CONFIG_SRCDIR([src/harfbuzz.pc.in])
AC_CONFIG_HEADERS([config.h]) 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]) AM_SILENT_RULES([yes])
# Initialize libtool # Initialize libtool

7
test/shaping/Makefile.am
View File

@ -49,6 +49,13 @@ AM_TESTS_ENVIRONMENT = \
export builddir; \ export builddir; \
$(NULL) $(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 TESTS_LOG_COMPILER = sh $(srcdir)/run-tests.sh
.PHONY: manifests .PHONY: manifests