X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=web%2Fmono-build-w32.sh;h=d9e1f963c7958adcc6f41cb9880a356ba7f03145;hb=66896ebced1d123619a97a75e3fea22cd4cd13a1;hp=97c921b9c5d3f1f6204584b8a2b79e9c5c1084c1;hpb=5e37acebe64591cb595b3e5aadcdcb49d3b71f2d;p=mono.git diff --git a/web/mono-build-w32.sh b/web/mono-build-w32.sh index 97c921b9c5d..d9e1f963c79 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!" @@ -59,6 +48,18 @@ fi cvs checkout mono || exit -1 +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 + +# 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}