From e5cced55a6a9060626fd3037d40399c283479e5a Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 24 Sep 2010 14:49:48 +0100
Subject: Require automake 1.11 unconditionally

---
 Makefile.am | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index ab23ce650..159797fb5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,17 +47,6 @@ upload-branch-docs: all
 	rsync -rtzvPp --chmod=a+rX docs/reference/html/ \
 		$(UPLOAD_BRANCH_TO)-$(BRANCH)/
 
-if HAVE_AUTOMAKE_FOR_DIST
-# automake is new enough to make dist
-else
-dist-hook: dist-hook-check-am
-dist-hook-check-am:
-	@echo "*** Your automake is too old to compile Vala.">&2
-	@echo "*** You can build telepathy-glib with this automake, but you">&2
-	@echo "*** should not use it to make tarball releases.">&2
-	@exit 1
-endif
-
 include tools/lcov.am
 
 CHANGELOG_RANGE = telepathy-glib-0.8.0..
-- 
cgit v1.2.1