# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1127355663 0
# Node ID 75e3fb8d706d673897ea8d0c65ee715953727cde
# Parent  171b428ee806c1f24b7f987dcd220bf985553c5d
Improved bootstrap script


diff -r 171b428ee806 -r 75e3fb8d706d bootstrap.sh
--- a/bootstrap.sh	Thu Sep 22 02:21:00 2005 +0000
+++ b/bootstrap.sh	Thu Sep 22 02:21:03 2005 +0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-WANT_AM_VERSION=1.7
+WANT_AM_VERSION=z1.9
 
 echo "***"
 echo "*** Now bootstrapping the package."
@@ -14,11 +14,13 @@
 
 ftest_am_package()
 {
-if test -x `which "$1-$WANT_AM_VERSION"`; then
+PRG1=`which "$1-$WANT_AM_VERSION"`
+PRG2=`which $1`
+if test -n "$PRG1"  && test -x "$PRG1"; then
 echo "* $1-$WANT_AM_VERSION $2"
 eval `$1-$WANT_AM_VERSION $2`
 else
-if test -x `which $1`; then
+if test -n "$PRG2"  && test -x "$PRG2"; then
 echo "* Warning! Could not find $1-$WANT_AM_VERSION!"
 echo "  Trying '$1', which may fail due to incompabilities."
 echo "* $1 $2"
@@ -32,7 +34,8 @@
 
 ftest_ac_package()
 {
-if test -x `which $1`; then
+PRG1=`which $1`
+if test -n "$PRG1"  && test -x "$PRG1"; then
 echo "* $1 $2"
 eval `$1 $2`
 else
@@ -43,7 +46,8 @@
 
 ftest_package()
 {
-if test -x `which $1`; then
+PRG1=`which $1`
+if test -n "$PRG1"  && test -x "$PRG1"; then
 echo "* $1 $2"
 eval `$1 $2`
 else
@@ -53,7 +57,7 @@
 fi
 }
 
-ftest_am_package "aclocal" "-I ."
+ftest_am_package "aclocal" "-I . -I /usr/share/aclocal -I /usr/local/share/aclocal"
 ftest_ac_package "libtoolize" "--automake --force"
 ftest_am_package "automake" "-a -c --foreign"
 ftest_ac_package "autoconf" ""