diff options
author | Dick Porter <dick@acm.org> | 2002-09-06 16:02:45 +0400 |
---|---|---|
committer | Dick Porter <dick@acm.org> | 2002-09-06 16:02:45 +0400 |
commit | e7086535fc39cac7d348872aca1187b40a28d667 (patch) | |
tree | 5938170aaf628fb1c206ba0f3c2bc614e2dc47da /web/mono-build-w32.sh | |
parent | 3b0393cb649cac459ee8a07ce166600e3b598963 (diff) |
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
Diffstat (limited to 'web/mono-build-w32.sh')
-rwxr-xr-x | web/mono-build-w32.sh | 11 |
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. |