2003-01-10 Duncan Mak <duncan@ximian.com>

[mono.git] / doc / mono-build-w32.sh

diff --git a/doc/mono-build-w32.sh b/doc/mono-build-w32.sh
index b73d3baf372034322b25cdb0583956da1ead93b9..d9e1f963c7958adcc6f41cb9880a356ba7f03145 100755 (executable)
--- a/doc/mono-build-w32.sh
+++ b/doc/mono-build-w32.sh
@@ -17,15 +17,10 @@ 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."
+# 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!"
+    exit -1
 fi
 
 # Check mono out first, so we can run aclocal from inside the mono dir (it
@@ -53,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}