* bootstrap:

    + Run libtoolize before aclocal.
    + Support automake 1.8.

bootstrap

 #! /bin/sh
 
-##  bootstrap file for libdvbpsi -- Sam Hocevar <sam@zoy.org>
-##  $Id: bootstrap,v 1.5 2003/11/06 10:13:40 sam Exp $
+##  generic bootstrap file for libraries -- Sam Hocevar <sam@zoy.org>
+##  $Id$
 
 set -x
 set -e
@@ -14,7 +14,9 @@ export CYGWIN
 
 # Check for automake
 amvers="no"
-if automake-1.7 --version >/dev/null 2>&1; then
+if automake-1.8 --version >/dev/null 2>&1; then
+  amvers="-1.8"
+elif automake-1.7 --version >/dev/null 2>&1; then
   amvers="-1.7"
 elif automake-1.6 --version >/dev/null 2>&1; then
   amvers="-1.6"
@@ -37,10 +39,10 @@ fi
 
 # Check for libtool
 libtoolize="no"
-if libtoolize --version >/dev/null 2>&1; then
-  libtoolize="libtoolize"
-elif glibtoolize --version >/dev/null 2>&1; then
+if glibtoolize --version >/dev/null 2>&1; then
   libtoolize="glibtoolize"
+elif libtoolize --version >/dev/null 2>&1; then
+  libtoolize="libtoolize"
 fi
 
 if test "$libtoolize" = "no"; then
@@ -54,14 +56,13 @@ rm -f aclocal.m4 configure config.guess config.log config.sub config.cache confi
 rm -Rf autom4te.cache
 (cd autotools && rm -f config.guess config.sub missing mkinstalldirs compile ltmain.sh depcomp install-sh)
 
-aclocal${amvers}
 ${libtoolize} --copy --force
-
 if test -f "ltmain.sh"; then
   echo "$0: working around a minor libtool issue"
   mv ltmain.sh autotools/
 fi
 
+aclocal${amvers}
 autoconf
 autoheader
 automake${amvers} --add-missing --copy