Continuing autotools creeping feature infection. Have autogen.sh fall

back to glibtoolize (as it's shipped by apple on macosx) if libtoolize
is not available. This commit propagates the same change made to
libvorbis. Bug 363.

Also corrects missing closing quotes.

svn path=/trunk/ogg/; revision=5498

1 files changed, 17 insertions, 5 deletions

diff --git a/autogen.sh b/autogen.sh
index e5fe1f8..ccdc164 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -11,6 +11,7 @@ test -z "$srcdir" && srcdir=.
 cd "$srcdir"
 DIE=0
 
+echo "checking for autoconf... "
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
         echo
         echo "You must have autoconf installed to compile $package."
@@ -19,19 +20,30 @@ DIE=0
         DIE=1
 }
 
+echo "checking for automake... "
 (automake --version) < /dev/null > /dev/null 2>&1 || {
         echo
         echo "You must have automake installed to compile $package."
-	echo "Download the appropriate package for your system,
+	echo "Download the appropriate package for your system,"
 	echo "or get the source from one of the GNU ftp sites"
 	echo "listed in http://www.gnu.org/order/ftp.html"
         DIE=1
 }
 
-(libtoolize --version) < /dev/null > /dev/null 2>&1 || {
+echo -n "checking for libtool... "
+for LIBTOOLIZE in libtoolize glibtoolize nope; do
+  (which $LIBTOOLIZE) > /dev/null 2>&1 && break
+done
+if test x$LIBTOOLIZE = xnope; then
+  echo "nope."
+  LIBTOOLIZE=libtoolize
+else
+  echo $LIBTOOLIZE
+fi
+($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have libtool installed to compile $package."
-	echo "Download the appropriate package for your system,
+	echo "Download the appropriate package for your system,"
 	echo "or get the source from one of the GNU ftp sites"
 	echo "listed in http://www.gnu.org/order/ftp.html"
 	DIE=1
@@ -52,8 +64,8 @@ echo "  aclocal $ACLOCAL_FLAGS"
 aclocal $ACLOCAL_FLAGS
 #echo "  autoheader"
 #autoheader
-echo "  libtoolize --automake"
-libtoolize --automake
+echo "  $LIBTOOLIZE --automake"
+$LIBTOOLIZE --automake
 echo "  automake --add-missing $AUTOMAKE_FLAGS"
 automake --add-missing $AUTOMAKE_FLAGS 
 echo "  autoconf"