Add msys packages and instructions to run autoreconf under Windows

2 files changed, 27 insertions, 9 deletions

diff --git a/README.windows b/README.windows
index 723c25e..e4ae433 100644
--- a/README.windows
+++ b/README.windows
@@ -31,19 +31,17 @@ and a tar that supports the -J option, which probably rules out OSX.
 
 Run install-mingw.sh specifying the destination directory, e.g.
 
-  $ etc/install-mingw.sh /tmp/mingw
+  $ etc/install-mingw.sh mingw
 
 Python is needed for the rabbitmq-c build, so you will also need to
 install python under Windows.  The Windows installer from python.org
 will do fine.
 
-You will need to get the rabbitmq-c and rabbitmq-codegen source code.
-If you are getting it from Mercurial, you will need to run "autoreconf
--i" within rabbitmq-c somewhere other than under MinGW first (perhaps
-this can be done under MinGW/MSYS, but the packages installed by
-install-mingw.sh are not sufficient).
+You will need to copy the source code for rabbitmq-c and
+rabbitmq-codegen somewhere under your mingw directory.
 
-Open a cmd window, and ensure that both the MinGW bin directory and the python install directory are in the path, e.g.
+Open a cmd window, and ensure that both the MinGW bin directory and
+the python install directory are in the path, e.g.
 
   C:\>set PATH=%PATH%;C:\mingw\bin;C:\Python26
 
@@ -53,7 +51,17 @@ Windows path of your MinGW install):
   C:\>bash
   bash-3.1$ mount 'C:\mingw' /mingw
 
-Then go to the rabbitmq-c directory, and configure and make as normal:
+Then go to the rabbitmq-c directory.  If you got the rabbitmq-c
+directory from Mercurial (which is the only way to get it at the
+moment), you will need to run autoreconf to produce the configuration
+scripts:
+
+  bash-3.1$ autoreconf -i
+
+This will produce a few lines of informational output while it runs,
+but as long as it doesn't mention any errors, you are ok.
+
+Finally, configure and make:
 
   bash-3.1$ ./configure && make
   [...]
diff --git a/etc/install-mingw.sh b/etc/install-mingw.sh
index 7fdd339..891c6fe 100755
--- a/etc/install-mingw.sh
+++ b/etc/install-mingw.sh
@@ -7,7 +7,7 @@ fi
 
 unpack_dir=$1
 
-if [ -eb "$unpack_dir" ] ; then
+if [ -e "$unpack_dir" ] ; then
     echo "Destination directory already exists; please delete it if you are sure" 1>&2
     exit 1
 fi
@@ -47,6 +47,16 @@ MinGW/gettext/gettext-0.17-1/gettext-0.17-1-mingw32-dev.tar.lzma
 MinGW/libiconv/libiconv-1.13.1-1/libiconv-1.13.1-1-mingw32-dll-2.tar.lzma
 MinGW/libiconv/libiconv-1.13.1-1/libiconv-1.13.1-1-mingw32-dev.tar.lzma
 MinGW/libiconv/libiconv-1.13.1-1/libcharset-1.13.1-1-mingw32-dll-1.tar.lzma
+MSYS/autoconf/autoconf-2.65-1/autoconf-2.65-1-msys-1.0.13-bin.tar.lzma
+MSYS/automake/automake-1.11.1-1/automake-1.11.1-1-msys-1.0.13-bin.tar.lzma
+MSYS/m4/m4-1.4.14-1/m4-1.4.14-1-msys-1.0.13-bin.tar.lzma
+MSYS/libtool/libtool-2.2.7a-2/libtool-2.2.7a-2-msys-1.0.13-bin.tar.lzma
+MSYS/tar/tar-1.23-1/tar-1.23-1-msys-1.0.13-bin.tar.lzma
+MSYS/regex/regex-1.20090805-2/libregex-1.20090805-2-msys-1.0.13-dll-1.tar.lzma
+MSYS/libiconv/libiconv-1.13.1-2/libiconv-1.13.1-2-msys-1.0.13-dll-2.tar.lzma
+MSYS/gettext/gettext-0.17-2/libintl-0.17-2-msys-dll-8.tar.lzma
+MSYS/perl/perl-5.6.1_2-2/perl-5.6.1_2-2-msys-1.0.13-bin.tar.lzma
+MSYS/crypt/crypt-1.1_1-3/libcrypt-1.1_1-3-msys-1.0.13-dll-0.tar.lzma
 EOF
 
 for f in $download_dir/* ; do