X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=autogen.sh;h=2c80b3c6b522b2aefdf39816960400711d9cc486;hb=a031f1d112b344929e4817432958ae9776a18eca;hp=82cf19e90f141c466f56de403b70ac945975a2be;hpb=5e2afe9a5f155785617c4f4119f578a8d83331d4;p=mono.git diff --git a/autogen.sh b/autogen.sh index 82cf19e90f1..2c80b3c6b52 100755 --- a/autogen.sh +++ b/autogen.sh @@ -30,8 +30,15 @@ fi DIE=1 } +if [ -z "$LIBTOOL" ]; then + LIBTOOL=`which glibtool 2>/dev/null` + if [ ! -x "$LIBTOOL" ]; then + LIBTOOL=`which libtool` + fi +fi + (grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && { - (libtool --version) < /dev/null > /dev/null 2>&1 || { + ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || { echo echo "**Error**: You must have \`libtool' installed to compile Mono." echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz" @@ -75,7 +82,7 @@ if test "$DIE" -eq 1; then exit 1 fi -if test -z "$*"; then +if test x$NOCONFIGURE = x && test -z "$*"; then echo "**Warning**: I am going to run \`configure' with no arguments." echo "If you wish to pass any to it, please specify them on the" echo \`$0\'" command line." @@ -91,12 +98,12 @@ esac if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then if test -z "$NO_LIBTOOLIZE" ; then echo "Running libtoolize..." - libtoolize --force --copy + ${LIBTOOL}ize --force --copy fi fi -echo "Running aclocal $ACLOCAL_FLAGS ..." -aclocal $ACLOCAL_FLAGS || { +echo "Running aclocal -I . $ACLOCAL_FLAGS ..." +aclocal -I . $ACLOCAL_FLAGS || { echo echo "**Error**: aclocal failed. This may mean that you have not" echo "installed all of the packages you need, or you may need to"