Rev 163: Support more recent versions of automake and autoconf. in file:///home/jelmer/bzr/pqm/

[Jelmer Vernooij]

At file:///home/jelmer/bzr/pqm/

------------------------------------------------------------
revno: 163
revision-id: jelmer at samba.org-20070519173708-q0czfs3nqfejxixc
parent: robertc at robertcollins.net-20070426001026-ngqd5w0ti74xeb39
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pqm
timestamp: Sat 2007-05-19 18:37:08 +0100
message:
  Support more recent versions of automake and autoconf.
modified:
  autogen.sh                     i_script_to_rerun_autotools
=== modified file 'autogen.sh'
--- a/autogen.sh	2006-01-08 22:10:12 +0000
+++ b/autogen.sh	2007-05-19 17:37:08 +0000
@@ -21,7 +21,7 @@
 if autoconf --version < /dev/null > /dev/null 2>&1 ; then
 	autoconf_version=`autoconf --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
 	case $autoconf_version in
-	    2.5*)
+	    2.5*|2.6*)
 		have_autoconf=true
 		;;
 	esac
@@ -40,6 +40,9 @@
 elif automake-1.8 --version < /dev/null > /dev/null 2>&1; then
   AUTOMAKE=automake-1.8
   ACLOCAL=aclocal-1.8
+elif automake-1.9 --version < /dev/null > /dev/null 2>&1; then
+  AUTOMAKE=automake-1.9
+  ACLOCAL=aclocal-1.9
 else
 	echo
 	echo "You must have automake >= 1.7 installed to compile $PROJECT."