More automake lines rearranging: select the "stable" version _after_ we've

checked the automake version.

It seems a bit daft to make sure we've got the latest "unstable" automake
and then not use it, but we have seen builds fail when a slightly older
"unstable" version is installed on the system.

svn path=/trunk/mono/; revision=7282

1 files changed, 6 insertions, 5 deletions

diff --git a/web/mono-build-w32.sh b/web/mono-build-w32.sh
index 73e3fd17aca..d9e1f963c79 100755
--- a/web/mono-build-w32.sh
+++ b/web/mono-build-w32.sh
@@ -48,11 +48,6 @@ fi
 
 cvs checkout mono || exit -1
 
-if [ ! -z "${AUTO_STABLE}" -o -e /usr/autotool/stable ]; then
-    export AUTO_STABLE=${AUTO_STABLE:-/usr/autotool/stable}
-    export AUTO_DEVEL=${AUTO_STABLE}
-fi
-
 echo "Checking automake version"
 automake_required="1.6.2"
 automake_version=`automake --version | head -1 | awk '{print $4}' | tr -d '[a-zA-Z]' | sed 's/-.*$//g'`
@@ -64,6 +59,12 @@ else
 	echo "Automake version new enough."
 fi
 
+# Select the stable version anyway...
+if [ ! -z "${AUTO_STABLE}" -o -e /usr/autotool/stable ]; then
+    export AUTO_STABLE=${AUTO_STABLE:-/usr/autotool/stable}
+    export AUTO_DEVEL=${AUTO_STABLE}
+fi
+
 # Need to install pkgconfig and set ACLOCAL_FLAGS if there is not a
 # pkgconfig installed already.  Otherwise set PKG_CONFIG_PATH to the
 # glib we're about to install in $here/install.