--- bootstrap.sh	2003/03/17 23:24:20	1.1.2.1
+++ bootstrap.sh	2005/05/23 09:29:43	1.7
@@ -1,9 +1,13 @@
 #!/bin/sh
 #
+# - Bootstrap script -
+#
+# Copyright(C) 2003-2004 Edouard Gomez <ed.gomez@free.fr>
+#
 # This file builds the configure script and copies all needed files
 # provided by automake/libtoolize
 #
-# $Id: bootstrap.sh,v 1.1.2.1 2003/03/17 23:24:20 edgomez Exp $
+# $Id: bootstrap.sh,v 1.7 2005/05/23 09:29:43 Skal Exp $
 
 
 ##############################################################################
@@ -12,14 +16,14 @@
 
 # Find a suitable autoconf
 AUTOCONF="autoconf2.50"
-$AUTOCONF --version 2>/dev/null 1>/dev/null
+$AUTOCONF --version 1>/dev/null 2>&1
 
 if [ $? -ne 0 ] ; then
     AUTOCONF="autoconf"
-	$AUTOCONF --version 2>/dev/null 1>/dev/null
+    $AUTOCONF --version 1>/dev/null 2>&1
 
-    if [ $? -ne 0 ] ; then
-        echo "Autoconf not found"
+	if [ $? -ne 0 ] ; then
+        echo "ERROR: 'autoconf' not found"
         exit -1
     fi
 fi
@@ -30,15 +34,36 @@
 AC_MINORVER=`echo $AC_VER | cut -f2 -d'.'`
 
 if [ "$AC_MAJORVER" -lt "2" ]; then
-    echo "This bootstrapper needs Autoconf >= 2.50 (detected $AC_VER)"
+    echo "ERROR: This bootstrapper requires Autoconf >= 2.50 (detected $AC_VER)"
     exit -1
 fi
 
 if [ "$AC_MINORVER" -lt "50" ]; then
-    echo "This bootstrapper needs Autoconf >= 2.50 (detected $AC_VER)"
+    echo "ERROR: This bootstrapper requires Autoconf >= 2.50 (detected $AC_VER)"
     exit -1
 fi
 
+LIBTOOLIZE="libtoolize"
+$LIBTOOLIZE --version 1>/dev/null 2>&1
+
+if [ $? -ne 0 ] ; then
+    LIBTOOLIZE="glibtoolize"
+    $LIBTOOLIZE --version 1>/dev/null 2>&1
+
+    if [ $? -ne 0 ] ; then
+        echo "ERROR: 'libtoolize' not found"
+        exit -1
+    fi
+fi
+
+AUTOMAKE="automake"
+$AUTOMAKE --version 1>/dev/null 2>&1
+
+if [ $? -ne 0 ] ; then
+    echo "ERROR: 'automake' not found"
+	exit -1
+fi
+
 ##############################################################################
 # Bootstraps the configure script
 ##############################################################################
@@ -47,11 +72,12 @@
 $AUTOCONF
 
 echo "Copying files provided by automake"
-automake -c -a 1>/dev/null 2>/dev/null
+$AUTOMAKE -c -a 1>/dev/null 2>&1
 
 echo "Copying files provided by libtool"
-libtoolize -f -c 1>/dev/null 2>/dev/null
+$LIBTOOLIZE -f -c 1>/dev/null 2>&1
 
 echo "Removing files that are not needed"
-rm -rf autom4*
-rm -rf ltmain.sh
+rm -rf autom4* 1>/dev/null 2>&1 
+rm -rf ltmain.sh 1>/dev/null 2>&1 
+rm -rf *.m4 1>/dev/null 2>&1
\ No newline at end of file