X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=autogen.sh;h=2c80b3c6b522b2aefdf39816960400711d9cc486;hb=68327e9c503c9ed31e033830793f0cfb35ce0752;hp=cff9ab10d77e69e24e6812ef2cbf095953e67589;hpb=4cdbd456933d24777467604a627974eb5acc65a1;p=mono.git

diff --git a/autogen.sh b/autogen.sh
index cff9ab10d77..2c80b3c6b52 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -31,7 +31,10 @@ fi
 }
 
 if [ -z "$LIBTOOL" ]; then
-  LIBTOOL=`which glibtool` || LIBTOOL=`which libtool`
+  LIBTOOL=`which glibtool 2>/dev/null` 
+  if [ ! -x "$LIBTOOL" ]; then
+    LIBTOOL=`which libtool`
+  fi
 fi
 
 (grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
@@ -79,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."
@@ -99,8 +102,8 @@ if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
   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"