From cdc29deb3e7e284603513235e83e012a56dde072 Mon Sep 17 00:00:00 2001
From: Ralph Giles <giles@xiph.org>
Date: Tue, 20 Jun 2006 19:42:23 +0000
Subject: Propagate extended automake detection fix from theora-1.0alpha7.

svn path=/trunk/ogg/; revision=11598
---
 autogen.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'autogen.sh')

diff --git a/autogen.sh b/autogen.sh
index 232e1d4..46bd158 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -42,7 +42,8 @@ if test -r Makefile.am; then
     fi
   else
     echo -n "checking for automake $AM_NEEDED or later... "
-    for am in automake-$AM_NEEDED automake$AM_NEEDED automake; do
+    for am in automake-$AM_NEEDED automake$AM_NEEDED \
+	automake automake-1.7 automake-1.8 automake-1.9; do
       ($am --version < /dev/null > /dev/null 2>&1) || continue
       ver=`$am --version < /dev/null | head -n 1 | $VERSIONGREP | $VERSIONMKINT`
       verneeded=`echo $AM_NEEDED | $VERSIONMKINT`
@@ -54,7 +55,8 @@ if test -r Makefile.am; then
     done
     test -z $AUTOMAKE &&  echo "no"
     echo -n "checking for aclocal $AM_NEEDED or later... "
-    for ac in aclocal-$AM_NEEDED aclocal$AM_NEEDED aclocal; do
+    for ac in aclocal-$AM_NEEDED aclocal$AM_NEEDED \
+	aclocal aclocal-1.7 aclocal-1.8 aclocal-1.9; do
       ($ac --version < /dev/null > /dev/null 2>&1) || continue
       ver=`$ac --version < /dev/null | head -n 1 | $VERSIONGREP | $VERSIONMKINT`
       verneeded=`echo $AM_NEEDED | $VERSIONMKINT`
-- 
cgit v1.2.1