[xiph-commits] r16375 - trunk/ezstream

[moritz at svn.xiph.org]

Author: moritz
Date: 2009-08-01 06:52:20 -0700 (Sat, 01 Aug 2009)
New Revision: 16375

Modified:
   trunk/ezstream/autogen.sh
Log:
Update to what I use everywhere else now.


Modified: trunk/ezstream/autogen.sh
===================================================================
--- trunk/ezstream/autogen.sh	2009-08-01 13:50:08 UTC (rev 16374)
+++ trunk/ezstream/autogen.sh	2009-08-01 13:52:20 UTC (rev 16375)
@@ -1,20 +1,35 @@
 #!/bin/sh
 
-PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
+PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/usr/pkg/bin:/usr/pkg/sbin"
 
+_ac_version="2.61"
+_am_version="1.10"
+
 if [ ! -f "./`basename $0`" ]; then
 	echo "Please chdir into `basename $0`'s directory first."
 	exit 1
 fi
 
 EXTRA=
+if [ -d m4 ]; then
+	EXTRA="-I m4"
+fi
+
 if [ -d /usr/local/share/aclocal ]; then
-	EXTRA="-I /usr/local/share/aclocal"
+	EXTRA="${EXTRA} -I /usr/local/share/aclocal"
 fi
 
-AUTOCONF_VERSION=2.61 AUTOMAKE_VERSION=1.9 aclocal -I m4 ${EXTRA}
-AUTOCONF_VERSION=2.61 AUTOMAKE_VERSION=1.9 autoconf
-AUTOCONF_VERSION=2.61 AUTOMAKE_VERSION=1.9 autoheader
-# AUTOCONF_VERSION=2.61 AUTOMAKE_VERSION=1.9 libtoolize --automake -c -f
-AUTOCONF_VERSION=2.61 AUTOMAKE_VERSION=1.9 automake -a -c
+AUTOCONF_VERSION="${_ac_version}" AUTOMAKE_VERSION="${_am_version}" \
+	aclocal ${EXTRA} || exit 1
+AUTOCONF_VERSION="${_ac_version}" AUTOMAKE_VERSION="${_am_version}" \
+	autoconf || exit 1
+AUTOCONF_VERSION="${_ac_version}" AUTOMAKE_VERSION="${_am_version}" \
+	autoheader || exit 1
+AUTOCONF_VERSION="${_ac_version}" AUTOMAKE_VERSION="${_am_version}" \
+	libtoolize --automake -c -f || exit 1
+AUTOCONF_VERSION="${_ac_version}" AUTOMAKE_VERSION="${_am_version}" \
+	automake -a -c || exit 1
+
 rm -r autom4te.cache
+
+exit 0