[xiph-commits] r3434 - libannodex/trunk

[johnf at svn.annodex.net]

Author: johnf
Date: 2008-02-09 05:03:17 -0800 (Sat, 09 Feb 2008)
New Revision: 3434

Modified:
   libannodex/trunk/autogen.sh
Log:
Update autogoat

Modified: libannodex/trunk/autogen.sh
===================================================================
--- libannodex/trunk/autogen.sh	2008-02-09 13:00:04 UTC (rev 3433)
+++ libannodex/trunk/autogen.sh	2008-02-09 13:03:17 UTC (rev 3434)
@@ -17,7 +17,7 @@
   rm -f aclocal.m4 configure config.log
   rm -Rf autom4te.cache
   # remove old autotools extra cruft
-  rm -f config.guess config.sub missing compile depcomp install-sh
+  rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh
   # remove libtool cruft
   rm -f ltmain.sh libtool ltconfig
 }
@@ -41,7 +41,13 @@
 #
 
 automake_version="none"
-if automake-1.7 --version >/dev/null 2>&1; then
+if automake-1.10 --version >/dev/null 2>&1; then
+  automake_version="-1.10"
+elif automake-1.9 --version >/dev/null 2>&1; then
+  automake_version="-1.9"
+elif automake-1.8 --version >/dev/null 2>&1; then
+  automake_version="-1.8"
+elif automake-1.7 --version >/dev/null 2>&1; then
   automake_version="-1.7"
 elif automake-1.6 --version >/dev/null 2>&1; then
   automake_version="-1.6"
@@ -56,6 +62,7 @@
     1.7*)                             automake_version="-1.7" ;;
     1.8*)                             automake_version="-1.8" ;;
     1.9*)                             automake_version="-1.9" ;;
+    1.10*)                            automake_version="-1.10" ;;
   esac
 fi
 
@@ -74,6 +81,8 @@
   exit 1
 fi
 
+AUTOMAKE="automake${automake_version}"
+ACLOCAL="aclocal${automake_version}"
 
 #
 # do we need pkg-config?