# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1103475421 0
# Node ID 7bb9e20e30924f77d7610065fac834a20a231abb
# Parent  a9a5924eb10cce8b1673713204a2f5b2b45ff728
Few more adjustments.


diff -r a9a5924eb10c -r 7bb9e20e3092 bootstrap.sh
--- a/bootstrap.sh	Sun Dec 19 16:54:04 2004 +0000
+++ b/bootstrap.sh	Sun Dec 19 16:57:01 2004 +0000
@@ -1,24 +1,30 @@
 #! /bin/sh
 WANT_AM_VERSION=1.7
 
-echo "**"
-echo "** Now bootstrapping the package."
-echo "** This may take a while, please be patient ..."
-echo "**"
+echo "***"
+echo "*** Now bootstrapping the package."
+echo "*** This may take a while, please be patient ..."
+echo "***"
+ftest_msg()
+{
+echo "You do not have required GNU Autotools installed, please install"
+echo "recent version of GNU autoconf, automake and libtool packages."
+echo "(Could not find runnable $1)"
+}
 
 ftest_am_package()
 {
 if test -x `which "$1-$WANT_AM_VERSION"`; then
-echo "** $1-$WANT_AM_VERSION $2"
+echo "* $1-$WANT_AM_VERSION $2"
 eval `$1-$WANT_AM_VERSION $2`
 else
 if test -x `which $1`; then
-echo "** $1 $2"
+echo "* Warning! Could not find $1-$WANT_AM_VERSION!"
+echo "  Trying '$1', which may fail due to incompabilities."
+echo "* $1 $2"
 eval `$1 $2`
 else
-echo "You do not have required GNU Autotools installed, please install"
-echo "recent version of GNU autoconf, automake and libtool packages."
-echo "(Could not find runnable '$1-$WANT_AM_VERSION' or '$1')"
+ftest_msg "'$1-$WANT_AM_VERSION' or '$1'"
 exit 1
 fi
 fi
@@ -27,12 +33,10 @@
 ftest_ac_package()
 {
 if test -x `which $1`; then
-echo "** $1 $2"
+echo "* $1 $2"
 eval `$1 $2`
 else
-echo "You do not have required GNU Autotools installed, please install"
-echo "recent version of GNU autoconf, automake and libtool packages."
-echo "(Could not find runnable '$1')"
+ftest_msg "'$1'"
 exit 1
 fi
 }
@@ -40,18 +44,17 @@
 ftest_package()
 {
 if test -x `which $1`; then
-echo "** $1 $2"
+echo "* $1 $2"
 eval `$1 $2`
 else
-echo "Could not find runnable '$1'."
+echo "Could not find runnable '$1', perhaps $3 package is not installed"
+echo "or it is not in the PATH. Please install $4."
 exit 1
 fi
 }
 
 ftest_am_package "aclocal" "-I ."
 ftest_am_package "automake" "-a -c --foreign"
-ftest_ac_package "autoheader" ""
 ftest_ac_package "autoconf" ""
 ftest_ac_package "libtoolize" "--automake --force"
-ftest_package "glade" "-w xmms-sid.glade"
-
+ftest_package "glade" "-w xmms-sid.glade" "Glade" "Glade for Gtk+1 applications (Glade v0.6.4)"