# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1335966196 -7200
# Node ID 64ee707dd1195a0ed760ef8a54128baf06ab285d
# Parent  145b67adfecf5581abcf1e257402a2e0cd716a19# Parent  9e60296cb20dd635800285472fc20834944b1f79
Merge branch 'stable'

diff -r 145b67adfecf -r 64ee707dd119 Makefile
--- a/Makefile	Wed May 02 23:32:07 2012 +1000
+++ b/Makefile	Wed May 02 15:43:16 2012 +0200
@@ -101,7 +101,7 @@
 	@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][0-9]\.[0-9]\+)
+	$(call CHECK_REQUIREMENT_VERSION,automake,1\.[1-9][0-9]\(\.[0-9]\+\)\?)
 	@[ -d '$(PREFIX)/installed' ] || mkdir -p '$(PREFIX)/installed'
 	@touch '$@'