From 1c58f291ccc40e5b9719d9ab13fceb3300c55404 Mon Sep 17 00:00:00 2001
From: Guenter Knauf <lists@gknw.net>
Date: Tue, 22 May 2012 04:15:37 +0200
Subject: Updated dependency libary versions.

---
 src/Makefile.Watcom  | 6 +++---
 src/Makefile.b32     | 4 ++--
 src/Makefile.m32     | 8 ++++----
 src/Makefile.netware | 6 +++---
 src/Makefile.vc6     | 4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index b09ec6b0b..6f7e8b261 100644
--- a/src/Makefile.Watcom
+++ b/src/Makefile.Watcom
@@ -72,13 +72,13 @@ CFLAGS += -d_WIN32_WINNT=0x0501 -dENABLE_IPV6
 !ifdef %zlib_root
 ZLIB_ROOT = $(%zlib_root)
 !else
-ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.6
+ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.7
 !endif
 
 !ifdef %libssh2_root
 LIBSSH2_ROOT = $(%libssh2_root)
 !else
-LIBSSH2_ROOT = ..$(DS)..$(DS)libssh2-1.4.1
+LIBSSH2_ROOT = ..$(DS)..$(DS)libssh2-1.4.2
 !endif
 
 !ifdef %librtmp_root
@@ -90,7 +90,7 @@ LIBRTMP_ROOT = ..$(DS)..$(DS)rtmpdump-2.3
 !ifdef %openssl_root
 OPENSSL_ROOT = $(%openssl_root)
 !else
-OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8w
+OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8x
 !endif
 
 !ifdef %ares_root
diff --git a/src/Makefile.b32 b/src/Makefile.b32
index ce1b766aa..29d30dfeb 100644
--- a/src/Makefile.b32
+++ b/src/Makefile.b32
@@ -22,12 +22,12 @@ BCCDIR = $(MAKEDIR)\..
 
 # Edit the path below to point to the base of your Zlib sources.
 !ifndef ZLIB_PATH
-ZLIB_PATH = ..\..\zlib-1.2.6
+ZLIB_PATH = ..\..\zlib-1.2.7
 !endif
 
 # Edit the path below to point to the base of your OpenSSL package.
 !ifndef OPENSSL_PATH
-OPENSSL_PATH = ..\..\openssl-0.9.8w
+OPENSSL_PATH = ..\..\openssl-0.9.8x
 !endif
 
 # Set program's name
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index c07aa3e04..cd3611f53 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -7,18 +7,18 @@
 ## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-spi-winidn
 ##
 ## Hint: you can also set environment vars to control the build, f.e.:
-## set ZLIB_PATH=c:/zlib-1.2.6
+## set ZLIB_PATH=c:/zlib-1.2.7
 ## set ZLIB=1
 #
 ###########################################################################
 
 # Edit the path below to point to the base of your Zlib sources.
 ifndef ZLIB_PATH
-ZLIB_PATH = ../../zlib-1.2.6
+ZLIB_PATH = ../../zlib-1.2.7
 endif
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.8w
+OPENSSL_PATH = ../../openssl-0.9.8x
 endif
 ifndef OPENSSL_LIBPATH
 OPENSSL_LIBPATH = $(OPENSSL_PATH)/out
@@ -28,7 +28,7 @@ OPENSSL_LIBS = -leay32 -lssl32
 endif
 # Edit the path below to point to the base of your LibSSH2 package.
 ifndef LIBSSH2_PATH
-LIBSSH2_PATH = ../../libssh2-1.4.1
+LIBSSH2_PATH = ../../libssh2-1.4.2
 endif
 # Edit the path below to point to the base of your librtmp package.
 ifndef LIBRTMP_PATH
diff --git a/src/Makefile.netware b/src/Makefile.netware
index 504a68a56..09044f64c 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -14,17 +14,17 @@ endif
 
 # Edit the path below to point to the base of your Zlib sources.
 ifndef ZLIB_PATH
-ZLIB_PATH = ../../zlib-1.2.6
+ZLIB_PATH = ../../zlib-1.2.7
 endif
 
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.8w
+OPENSSL_PATH = ../../openssl-0.9.8x
 endif
 
 # Edit the path below to point to the base of your LibSSH2 package.
 ifndef LIBSSH2_PATH
-LIBSSH2_PATH = ../../libssh2-1.4.1
+LIBSSH2_PATH = ../../libssh2-1.4.2
 endif
 
 # Edit the path below to point to the base of your axTLS package.
diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index 036e9e3b8..650246fe6 100644
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -57,11 +57,11 @@ PROGRAM_NAME = curl.exe
 
 
 !IFNDEF OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.8w
+OPENSSL_PATH = ../../openssl-0.9.8x
 !ENDIF
 
 !IFNDEF ZLIB_PATH
-ZLIB_PATH = ../../zlib-1.2.6
+ZLIB_PATH = ../../zlib-1.2.7
 !ENDIF
 
 !IFNDEF MACHINE
-- 
cgit v1.2.3