X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=autogen.sh;h=ce0c26c87ac5999e2cd4ae0993bbefee669b41ab;hb=d755781cb0138b65ff59887fd1cab7107634fd10;hp=23b38bb076fb31ac6fea69abf68f6e10d34d7012;hpb=da356f957b05d64f71b7d029a94d3aeef6ab1eb4;p=mono.git

diff --git a/autogen.sh b/autogen.sh
index 23b38bb076f..ce0c26c87ac 100755
--- 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
 
@@ -21,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"
@@ -82,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 $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"
@@ -108,6 +124,12 @@ automake --add-missing --gnu $am_opt ||
 echo "Running autoconf ..."
 autoconf || { echo "**Error**: autoconf failed."; exit 1; }
 
+if test -d $srcdir/libgc; then
+  echo Running libgc/autogen.sh ...
+  (cd $srcdir/libgc ; NOCONFIGURE=1 ./autogen.sh "$@")
+  echo Done running libgc/autogen.sh ...
+fi
+
 
 conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c