Rev 169: Refactor detection of automake, support 1.10. in file:///home/jelmer/bzr/pqm/

Jelmer Vernooij jelmer at samba.org
Mon May 21 13:24:19 BST 2007


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

------------------------------------------------------------
revno: 169
revision-id: jelmer at samba.org-20070521122401-6izcfka7bc0jw48q
parent: jelmer at samba.org-20070521010846-h1ajsyewfvizu2kj
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pqm
timestamp: Mon 2007-05-21 13:24:01 +0100
message:
  Refactor detection of automake, support 1.10.
modified:
  autogen.sh                     i_script_to_rerun_autotools
=== modified file 'autogen.sh'
--- a/autogen.sh	2007-05-19 17:37:08 +0000
+++ b/autogen.sh	2007-05-21 12:24:01 +0000
@@ -34,16 +34,17 @@
 	DIE=1
 fi
 
-if automake-1.7 --version < /dev/null > /dev/null 2>&1; then
-  AUTOMAKE=automake-1.7
-  ACLOCAL=aclocal-1.7
-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
+AUTOMAKE=no
+ACLOCAL=no
+for VERSION in 1.7 1.8 1.9 1.10
+do
+	if automake-$VERSION --version < /dev/null > /dev/null 2>&1; then
+		AUTOMAKE=automake-$VERSION
+		ACLOCAL=aclocal-$VERSION
+	fi
+done
+
+if $AUTOMAKE = no; then
 	echo
 	echo "You must have automake >= 1.7 installed to compile $PROJECT."
 	echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.7.2.tar.gz"




More information about the bazaar-commits mailing list