Tue Apr 29 16:53:56 CEST 2003 Paolo Molaro <lupus@ximian.com>

[mono.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 23b38bb076fb31ac6fea69abf68f6e10d34d7012..837932c6113f4d6004b41d6eb05cd412370ecb52 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,8 +8,17 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 if [ -n "$MONO_PATH" ]; then
-       ACLOCAL_FLAGS="-I $MONO_PATH/share/aclocal $ACLOCAL_FLAGS"
-       PATH="$MONO_PATH/bin:$PATH"
+       # from -> /mono/lib:/another/mono/lib
+       # to -> /mono /another/mono
+       for i in `echo ${MONO_PATH} | tr ":" " "`; do
+               i=`dirname ${i}`
+               if [ -n "{i}" -a -d "${i}/share/aclocal" ]; then
+                       ACLOCAL_FLAGS="-I ${i}/share/aclocal $ACLOCAL_FLAGS"
+               fi
+               if [ -n "{i}" -a -d "${i}/bin" ]; then
+                       PATH="${i}/bin:$PATH"
+               fi
+       done
        export PATH
 fi
 
@@ -86,8 +95,8 @@ if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
   fi
 fi
 
-echo "Running aclocal $aclocalinclude ..."
-aclocal $aclocalinclude || {
+echo "Running aclocal $ACLOCAL_FLAGS ..."
+aclocal $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"