[xiph-commits] r11597 - trunk/theora

[giles at svn.xiph.org]

Author: giles
Date: 2006-06-20 12:40:10 -0700 (Tue, 20 Jun 2006)
New Revision: 11597

Modified:
   trunk/theora/autogen.sh
Log:
Ubuntu 6.06 doesn't include automake 1.6, so our attempts to find a 
matching automake to invoke don't work. Check successively for 
automake-1.7, 1.8 and 1.9 and use those if they are appropriate. This
works if the user has one of those installed in addition to the default 
1.4.


Modified: trunk/theora/autogen.sh
===================================================================
--- trunk/theora/autogen.sh	2006-06-20 19:37:21 UTC (rev 11596)
+++ trunk/theora/autogen.sh	2006-06-20 19:40:10 UTC (rev 11597)
@@ -44,7 +44,8 @@
     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`
@@ -56,7 +57,8 @@
     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`