Correct automake version check to require 1.5, heads-up from Glynn Foster.

* autogen.sh: Correct automake version check to require 1.5, heads-up from
	Glynn Foster.

2 files changed, 8 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index b29ca916..4bb031e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-2002-06-17 nalin
+2002-06-18 nalin
+	* autogen.sh: Correct automake version check to require 1.5, heads
+	up from Glynn Foster.
+2002-06-18 nalin
 	* src/trie.c (vte_trie_match, vte_trie_match_x): Sort out greedy vs.
 	non-greedy pattern matching.
 	* src/vte.c (vte_sequence_handler_decset_internal): Make 1047 an alias
diff --git a/autogen.sh b/autogen.sh
index 46db892a..2866bbdd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -38,9 +38,9 @@ fi
 
 have_automake=false
 if automake --version < /dev/null > /dev/null 2>&1 ; then
-	automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
+	automake_version=`automake --version | grep 'automake (GNU automake.*)' | sed 's/^[^0-9]*\(.*\)/\1/'`
 	case $automake_version in
-	   1.2*|1.3*|1.4) 
+	   1.2*|1.3*|1.4*)
 		;;
 	   *)
 		have_automake=true
@@ -49,8 +49,8 @@ if automake --version < /dev/null > /dev/null 2>&1 ; then
 fi
 if $have_automake ; then : ; else
 	echo
-	echo "You must have automake 1.4-p1 installed to compile $PROJECT."
-	echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.4-p1.tar.gz"
+	echo "You must have automake 1.5 installed to compile $PROJECT."
+	echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.5.tar.gz"
 	echo "(or a newer version if it is available)"
 	DIE=1
 fi