some minor Makefile tweaks.

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 1b8a9675fbb743455b924cc90dae35670e37b954..8604618260f49f2ac0fafdc7ec966022df39f693 100644 (file)
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -1,8 +1,8 @@
 #########################################################################
 # $Id$
 #
-## Makefile for building libcurl.a with MingW32 (GCC-3.2)
-## and optionally OpenSSL (0.9.8), libssh2 (0.18), zlib (1.2.3)
+## Makefile for building libcurl.a with MingW32 (GCC-3.2 or later)
+## and optionally OpenSSL (0.9.8), libssh2 (1.0), zlib (1.2.3)
 ##
 ## Usage:
 ## mingw32-make -f Makefile.m32 [SSL=1] [SSH2=1] [ZLIB=1] [IDN=1] [SSPI=1] [IPV6=1] [LDAPS=1] [DYN=1]
@@ -21,15 +21,15 @@ ZLIB_PATH = ../../zlib-1.2.3
 endif
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.8i
+OPENSSL_PATH = ../../openssl-0.9.8k
 endif
 # Edit the path below to point to the base of your LibSSH2 package.
 ifndef LIBSSH2_PATH
-LIBSSH2_PATH = ../../libssh2-0.18
+LIBSSH2_PATH = ../../libssh2-1.0
 endif
 # Edit the path below to point to the base of your libidn package.
 ifndef LIBIDN_PATH
-LIBIDN_PATH = ../../libidn-1.11
+LIBIDN_PATH = ../../libidn-1.13
 endif
 # Edit the path below to point to the base of your Novell LDAP NDK.
 ifndef LDAP_SDK

diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index ffe42a885b6ade26c1baa0b4f12c5a26e0dfd35b..491a4f6193956ddcf7ef5ec129475df0fe81b016 100644 (file)
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -20,17 +20,17 @@ endif
 
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.8i
+OPENSSL_PATH = ../../openssl-0.9.8k
 endif
 
 # Edit the path below to point to the base of your LibSSH2 package.
 ifndef LIBSSH2_PATH
-LIBSSH2_PATH = ../../libssh2-0.18
+LIBSSH2_PATH = ../../libssh2-1.0
 endif
 
 # Edit the path below to point to the base of your libidn package.
 ifndef LIBIDN_PATH
-LIBIDN_PATH = ../../libidn-1.11
+LIBIDN_PATH = ../../libidn-1.13
 endif
 
 ifndef INSTDIR

diff --git a/src/Makefile.m32 b/src/Makefile.m32
index cf9c56ce55d1ca49872b74a93a2c0398b4169cc4..eb1c59d75100b30e65fd155b5addbd0e43a186ed 100644 (file)
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -1,8 +1,8 @@
 #########################################################################
 # $Id$
 #
-## Makefile for building curl.exe with MingW32 (GCC-3.2)
-## and optionally OpenSSL (0.9.8), libssh2 (0.18), zlib (1.2.3)
+## Makefile for building curl.exe with MingW32 (GCC-3.2 or later)
+## and optionally OpenSSL (0.9.8), libssh2 (1.0), zlib (1.2.3)
 ##
 ## Usage:
 ## mingw32-make -f Makefile.m32 [SSL=1] [SSH2=1] [ZLIB=1] [IDN=1] [SSPI=1] [IPV6=1] [LDAPS=1] [DYN=1]
@@ -21,15 +21,15 @@ ZLIB_PATH = ../../zlib-1.2.3
 endif
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.8i
+OPENSSL_PATH = ../../openssl-0.9.8k
 endif
 # Edit the path below to point to the base of your LibSSH2 package.
 ifndef LIBSSH2_PATH
-LIBSSH2_PATH = ../../libssh2-0.18
+LIBSSH2_PATH = ../../libssh2-1.0
 endif
 # Edit the path below to point to the base of your libidn package.
 ifndef LIBIDN_PATH
-LIBIDN_PATH = ../../libidn-1.11
+LIBIDN_PATH = ../../libidn-1.13
 endif
 # Edit the path below to point to the base of your Novell LDAP NDK.
 ifndef LDAP_SDK

diff --git a/src/Makefile.netware b/src/Makefile.netware
index 2b1929ceaa9d1b4525e240fcd39844842dddc9d9..c4cd338c7fa6204afa193b53c0031ca4cdec1b4d 100644 (file)
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -20,17 +20,17 @@ endif
 
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.8i
+OPENSSL_PATH = ../../openssl-0.9.8k
 endif
 
 # Edit the path below to point to the base of your LibSSH2 package.
 ifndef LIBSSH2_PATH
-LIBSSH2_PATH = ../../libssh2-0.18
+LIBSSH2_PATH = ../../libssh2-1.0
 endif
 
 # Edit the path below to point to the base of your libidn package.
 ifndef LIBIDN_PATH
-LIBIDN_PATH = ../../libidn-1.11
+LIBIDN_PATH = ../../libidn-1.13
 endif
 
 ifndef INSTDIR