[xiph-commits] r11599 - trunk/vorbis

[giles at svn.xiph.org]

Author: giles
Date: 2006-06-20 12:43:44 -0700 (Tue, 20 Jun 2006)
New Revision: 11599

Modified:
   trunk/vorbis/Makefile.am
   trunk/vorbis/autogen.sh
Log:
Propagate extended automake detection from theora 1.0alpha7. Also, we 
appear to now require and automake version greater than 1.4. I've 
specified 1.6, but only tested with 1.9.


Modified: trunk/vorbis/Makefile.am
===================================================================
--- trunk/vorbis/Makefile.am	2006-06-20 19:42:23 UTC (rev 11598)
+++ trunk/vorbis/Makefile.am	2006-06-20 19:43:44 UTC (rev 11599)
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign dist-zip
+AUTOMAKE_OPTIONS = 1.6 foreign dist-zip
 
 SUBDIRS = lib include doc examples vq
 

Modified: trunk/vorbis/autogen.sh
===================================================================
--- trunk/vorbis/autogen.sh	2006-06-20 19:42:23 UTC (rev 11598)
+++ trunk/vorbis/autogen.sh	2006-06-20 19:43:44 UTC (rev 11599)
@@ -42,7 +42,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`
@@ -54,7 +55,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`