From 1c58f291ccc40e5b9719d9ab13fceb3300c55404 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Tue, 22 May 2012 04:15:37 +0200 Subject: [PATCH] Updated dependency libary versions. --- docs/INSTALL | 10 +++++----- docs/examples/Makefile.m32 | 8 ++++---- docs/examples/Makefile.netware | 6 +++--- lib/Makefile.Watcom | 6 +++--- lib/Makefile.b32 | 4 ++-- lib/Makefile.m32 | 8 ++++---- lib/Makefile.netware | 6 +++--- lib/Makefile.vc6 | 6 +++--- lib/Makefile.vxworks | 8 ++++---- src/Makefile.Watcom | 6 +++--- src/Makefile.b32 | 4 ++-- src/Makefile.m32 | 8 ++++---- src/Makefile.netware | 6 +++--- src/Makefile.vc6 | 4 ++-- 14 files changed, 45 insertions(+), 45 deletions(-) diff --git a/docs/INSTALL b/docs/INSTALL index 137b64c42..cb228091a 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -217,9 +217,9 @@ Win32 adjust as necessary. It is also possible to override these paths with environment variables, for example: - set ZLIB_PATH=c:\zlib-1.2.6 - set OPENSSL_PATH=c:\openssl-0.9.8w - set LIBSSH2_PATH=c:\libssh2-1.4.1 + set ZLIB_PATH=c:\zlib-1.2.7 + set OPENSSL_PATH=c:\openssl-0.9.8x + set LIBSSH2_PATH=c:\libssh2-1.4.2 ATTENTION: if you want to build with libssh2 support you have to use latest version 0.17 - previous versions will NOT work with 7.17.0 and later! @@ -320,7 +320,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.6 + set ZLIB_PATH=c:\zlib-1.2.7 Then run 'nmake vc-zlib' in curl's root directory. @@ -334,7 +334,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.8w + set OPENSSL_PATH=c:\openssl-0.9.8x 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 diff --git a/docs/examples/Makefile.m32 b/docs/examples/Makefile.m32 index 930d0017c..4327a64f8 100644 --- a/docs/examples/Makefile.m32 +++ b/docs/examples/Makefile.m32 @@ -27,18 +27,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 @@ -48,7 +48,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/docs/examples/Makefile.netware b/docs/examples/Makefile.netware index b2fc329a9..934f17aef 100644 --- a/docs/examples/Makefile.netware +++ b/docs/examples/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/lib/Makefile.Watcom b/lib/Makefile.Watcom index 9de52a8b1..decb0a11c 100644 --- a/lib/Makefile.Watcom +++ b/lib/Makefile.Watcom @@ -83,13 +83,13 @@ CFLAGS += -dWANT_IDN_PROTOTYPES !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 @@ -101,7 +101,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/lib/Makefile.b32 b/lib/Makefile.b32 index 4c45e910c..c71f651b5 100644 --- a/lib/Makefile.b32 +++ b/lib/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 libcurl static lib, dll and import lib diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index 0b04c19ef..a94eeb8b0 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -7,18 +7,18 @@ ## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-sspi-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_INCLUDE OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc @@ -31,7 +31,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/lib/Makefile.netware b/lib/Makefile.netware index c7d9bc655..0c339ceed 100644 --- a/lib/Makefile.netware +++ b/lib/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/lib/Makefile.vc6 b/lib/Makefile.vc6 index cf89c1644..e70b5f814 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -65,15 +65,15 @@ !INCLUDE ..\Makefile.msvc.names !IFNDEF OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8w +OPENSSL_PATH = ../../openssl-0.9.8x !ENDIF !IFNDEF LIBSSH2_PATH -LIBSSH2_PATH = ../../libssh2-1.4.1 +LIBSSH2_PATH = ../../libssh2-1.4.2 !ENDIF !IFNDEF ZLIB_PATH -ZLIB_PATH = ../../zlib-1.2.6 +ZLIB_PATH = ../../zlib-1.2.7 !ENDIF !IFNDEF MACHINE diff --git a/lib/Makefile.vxworks b/lib/Makefile.vxworks index 7e692ef76..4d2aaa0b8 100644 --- a/lib/Makefile.vxworks +++ b/lib/Makefile.vxworks @@ -33,10 +33,10 @@ BUILD_TYPE := debug USER_CFLAGS:= # directories where to seek for includes and libraries -OPENSSL_INC := D:/libraries/openssl/openssl-0.9.8w-vxWorks6.3/include -OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8w-vxWorks6.3 -ZLIB_INC := D:/libraries/zlib/zlib-1.2.6-VxWorks6.3/zlib-1.2.6 -ZLIB_LIB := D:/libraries/zlib/zlib-1.2.6-VxWorks6.3/binaries/vxworks_3.1_gnu/Debug/lib +OPENSSL_INC := D:/libraries/openssl/openssl-0.9.8x-vxWorks6.3/include +OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8x-vxWorks6.3 +ZLIB_INC := D:/libraries/zlib/zlib-1.2.7-VxWorks6.3/zlib-1.2.7 +ZLIB_LIB := D:/libraries/zlib/zlib-1.2.7-VxWorks6.3/binaries/vxworks_3.1_gnu/Debug/lib ARES_INC := ARES_LIB := 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