From f2f7c18245c015e50bc072bcf22c7b9191f0b9e8 Mon Sep 17 00:00:00 2001
From: Gunter Knauf <gk@gknw.de>
Date: Fri, 3 Aug 2007 11:46:00 +0000
Subject: [PATCH] Peteris Krumins pointed out some MingW32 related build
 issues.

---
 docs/INSTALL      | 17 +++++++++++------
 docs/README.win32 |  4 ++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/docs/INSTALL b/docs/INSTALL
index 4a6f41401..dadd7a74f 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -174,8 +174,13 @@ Win32
    -------
 
    Run the 'mingw32.bat' file to get the proper environment variables set,
-   then run 'make mingw32' in the root dir. Use 'make mingw32-ssl' to build
-   curl SSL enabled.
+   then run 'mingw32-make mingw32' in the root dir. There are other make
+   targets available to build libcurl with more features, use:
+   'mingw32-make mingw32-zlib' to build with Zlib support;
+   'mingw32-make mingw32-ssl-zlib' to build with SSL and Zlib enabled;
+   'mingw32-make mingw32-ssh2-ssl-zlib' to build with SSH2, SSL, Zlib;
+   'mingw32-make mingw32-ssh2-ssl-sspi-zlib' to build with SSH2, SSL, Zlib
+   and SSPI.
 
    If you have any problems linking libraries or finding header files, be sure
    to verify that the provided "Makefile.m32" files use the proper paths, and
@@ -183,12 +188,12 @@ Win32
    environment variables, for example:
 
      set ZLIB_PATH=c:\zlib-1.2.3
-     set OPENSSL_PATH=c:\openssl-0.9.8d
-     set LIBSSH2_PATH=c:\libssh2-0.15
+     set OPENSSL_PATH=c:\openssl-0.9.8e
+     set LIBSSH2_PATH=c:\libssh2-0.16
 
    ATTENTION: if you want to build with libssh2 support you have to use latest
-   sources fetched from CVS - the current 0.14 release will NOT work!
-   Use 'make mingw32-ssh2-ssl' to build curl with SSH2 and SSL enabled.
+   sources fetched from CVS - the current 0.15 release will NOT work!
+   Use 'mingw32-make mingw32-ssh2-ssl-zlib' to build with SSH2 and SSL enabled.
 
    Cygwin
    ------
diff --git a/docs/README.win32 b/docs/README.win32
index 110af3c72..ec7a268ee 100644
--- a/docs/README.win32
+++ b/docs/README.win32
@@ -20,3 +20,7 @@ README.win32
   command line similar to this in order to extract a separate text file:
 
         curl -M >manual.txt
+
+  Read the INSTALL file for instructions how to compile curl self.
+
+