2010-02-28 Miguel de Icaza <miguel@novell.com>

[mono.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index e9127cc2a49a0c1095c6f9615b8fa0caadd6f22a..2c80b3c6b522b2aefdf39816960400711d9cc486 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -31,8 +31,8 @@ fi
 }
 
 if [ -z "$LIBTOOL" ]; then
-  LIBTOOL=`which glibtool` 
-  if [ ! -x $LIBTOOL ]; then
+  LIBTOOL=`which glibtool 2>/dev/null` 
+  if [ ! -x "$LIBTOOL" ]; then
     LIBTOOL=`which libtool`
   fi
 fi
@@ -82,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."
@@ -102,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"