vorbis:

 * Use autoheader and config.h.in again (basically revert changeset:8766)
 * Use 'type' shell builtin instead of 'which' to locate libtoolize, since it's more portable and less prone to different behaviour


svn path=/trunk/vorbis/; revision=8767

1 files changed, 3 insertions, 1 deletions

diff --git a/autogen.sh b/autogen.sh
index 0f1545f6..a7349228 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -32,7 +32,7 @@ echo "checking for automake... "
 
 echo -n "checking for libtool... "
 for LIBTOOLIZE in libtoolize glibtoolize nope; do
-  (which $LIBTOOLIZE) > /dev/null 2>&1 && break
+  (type $LIBTOOLIZE) > /dev/null 2>&1 && break
 done
 if test x$LIBTOOLIZE = xnope; then
   echo "nope."
@@ -62,6 +62,8 @@ echo "Generating configuration files for $package, please wait...."
 
 echo "  aclocal $ACLOCAL_FLAGS"
 aclocal $ACLOCAL_FLAGS || exit 1
+echo "  autoheader"
+autoheader || exit 1
 echo "  $LIBTOOLIZE --automake"
 $LIBTOOLIZE --automake || exit 1
 echo "  automake --add-missing $AUTOMAKE_FLAGS"