aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/INSTALL24
1 files changed, 18 insertions, 6 deletions
diff --git a/docs/INSTALL b/docs/INSTALL
index 8402043f8..6da338055 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -51,12 +51,12 @@ UNIX
path for your compiler/linker, you don't need to do anything special. If
you have OpenSSL installed in /usr/local/ssl, you can run configure like:
- ./configure --with-ssl
+ ./configure --with-ssl
If you have OpenSSL installed somewhere else (for example, /opt/OpenSSL,)
you can run configure like this:
- ./configure --with-ssl=/opt/OpenSSL
+ ./configure --with-ssl=/opt/OpenSSL
If you insist on forcing a build without SSL support, even though you may
have OpenSSL installed in your system, you can run configure like this:
@@ -148,12 +148,21 @@ 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
+ then run 'make mingw32' in the root dir. Use 'make mingw32-ssl' to build
curl SSL enabled.
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
- adjust as necessary.
+ adjust as necessary. It is also possible to override these paths with
+ 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
+
+ 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.
Cygwin
------
@@ -184,7 +193,7 @@ Win32
documentation on how to compile zlib. Define the ZLIB_PATH environment
variable to the location of zlib.h and zlib.lib, for example:
- set ZLIB_PATH=c:\zlib-1.2.1
+ set ZLIB_PATH=c:\zlib-1.2.3
Then run 'nmake vc-zlib' in curl's root directory.
@@ -198,7 +207,7 @@ Win32
Before running nmake define the OPENSSL_PATH environment variable with
the root/base directory of OpenSSL, for example:
- set OPENSSL_PATH=c:\openssl-0.9.7d
+ set OPENSSL_PATH=c:\openssl-0.9.8d
Then run 'nmake vc-ssl' or 'nmake vc-ssl-dll' in curl's root
directory. 'nmake vc-ssl' will create a libcurl static and dynamic
@@ -718,3 +727,6 @@ OpenSSL http://www.openssl.org
MingW http://www.mingw.org
OpenLDAP http://www.openldap.org
Zlib http://www.gzip.org/zlib/
+libssh2 http://www.libssh2.org
+
+