diff options
author | Dick Porter <dick@acm.org> | 2002-09-06 15:26:24 +0400 |
---|---|---|
committer | Dick Porter <dick@acm.org> | 2002-09-06 15:26:24 +0400 |
commit | 3b0393cb649cac459ee8a07ce166600e3b598963 (patch) | |
tree | 37bcdea864f4135209e80a9fb5a37e80bbc1cc58 /web/mono-build-w32.sh | |
parent | 332d2ced8ab19c7c184343cdb24221d378977491 (diff) |
Can't do the automake check until the mono dir has been checked out of CVS.
(Because automake-wrapper examines the dir to see which version of automake
to use.)
svn path=/trunk/mono/; revision=7281
Diffstat (limited to 'web/mono-build-w32.sh')
-rwxr-xr-x | web/mono-build-w32.sh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/web/mono-build-w32.sh b/web/mono-build-w32.sh index 97c921b9c5d..73e3fd17aca 100755 --- a/web/mono-build-w32.sh +++ b/web/mono-build-w32.sh @@ -17,17 +17,6 @@ echo "Building Mono and dependencies in $here, installing to $here/install" PATH=$here/install/bin:$here/install/lib:$PATH -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'` -echo "Found automake version $automake_version" -if expr $automake_version \< $automake_required > /dev/null; then - echo "Your automake is too old! You need version $automake_required or newer." - exit -1 -else - echo "Automake version new enough." -fi - # Make sure cygwin's libiconv is installed, or libtool blows its tiny mind if [ ! -f /usr/lib/libiconv.la ]; then echo "You need to install the cygwin \"libiconv\" package!" @@ -64,6 +53,17 @@ if [ ! -z "${AUTO_STABLE}" -o -e /usr/autotool/stable ]; then 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'` +echo "Found automake version $automake_version" +if expr $automake_version \< $automake_required > /dev/null; then + echo "Your automake is too old! You need version $automake_required or newer." + exit -1 +else + echo "Automake version new enough." +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. |