Makefile and docs: update automake version requirement

Conflicts:
	Makefile
This commit is contained in:
Niels Kristian Bech Jensen 2013-12-26 13:30:54 +11:00 committed by Tony Theodore
parent 37c6bfca7a
commit e80e2aae74
2 changed files with 2 additions and 2 deletions

View File

@ -134,7 +134,7 @@ $(PREFIX)/installed/check-requirements: $(MAKEFILE)
@echo '[check requirements]'
$(foreach REQUIREMENT,$(REQUIREMENTS),$(call CHECK_REQUIREMENT,$(REQUIREMENT)))
$(call CHECK_REQUIREMENT_VERSION,autoconf,2\.6[4-9]\|2\.[7-9][0-9])
$(call CHECK_REQUIREMENT_VERSION,automake,1\.[1-9][2-9]\(\.[0-9]\+\)\?)
$(call CHECK_REQUIREMENT_VERSION,automake,1\.11\.[3-9]\|1\.[1-9][2-9]\(\.[0-9]\+\)\?)
@[ -d '$(PREFIX)/installed' ] || mkdir -p '$(PREFIX)/installed'
@touch '$@'

View File

@ -660,7 +660,7 @@ USE_OSGPLUGIN(<plugin2>)
</tr>
<tr>
<td><a href="http://sources.redhat.com/automake/">Automake</a></td>
<td>≥ 1.12</td>
<td>≥ 1.11.3</td>
</tr>
<tr>
<td><a href="http://www.gnu.org/software/bash/">Bash</a></td>