From 0f548802775b01c26c4c263be86f3605310f6f35 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Fri, 20 Apr 2012 13:33:54 +0200 Subject: [PATCH] Updated dependency lib versions. --- docs/INSTALL | 4 ++-- docs/examples/Makefile.m32 | 8 ++++---- docs/examples/Makefile.netware | 6 +++--- lib/Makefile.Watcom | 2 +- lib/Makefile.b32 | 4 ++-- lib/Makefile.m32 | 2 +- lib/Makefile.netware | 2 +- lib/Makefile.vc6 | 2 +- lib/Makefile.vxworks | 8 ++++---- src/Makefile.Watcom | 2 +- src/Makefile.b32 | 4 ++-- src/Makefile.m32 | 2 +- src/Makefile.netware | 2 +- src/Makefile.vc6 | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/INSTALL b/docs/INSTALL index eb56e0d250..43f02f64ed 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -218,7 +218,7 @@ Win32 environment variables, for example: set ZLIB_PATH=c:\zlib-1.2.6 - set OPENSSL_PATH=c:\openssl-0.9.8u + set OPENSSL_PATH=c:\openssl-0.9.8v set LIBSSH2_PATH=c:\libssh2-1.4.1 ATTENTION: if you want to build with libssh2 support you have to use latest @@ -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.8u + set OPENSSL_PATH=c:\openssl-0.9.8v 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 3c3d121ede..469d7a1cd5 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.5 +## set ZLIB_PATH=c:/zlib-1.2.6 ## set ZLIB=1 # ########################################################################### # Edit the path below to point to the base of your Zlib sources. ifndef ZLIB_PATH -ZLIB_PATH = ../../../zlib-1.2.5 +ZLIB_PATH = ../../../zlib-1.2.6 endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../../openssl-0.9.8r +OPENSSL_PATH = ../../../openssl-0.9.8v 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.3.0 +LIBSSH2_PATH = ../../../libssh2-1.4.1 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 fdea6b81bf..cba66a7a08 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.5 +ZLIB_PATH = ../../../zlib-1.2.6 endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../../openssl-0.9.8r +OPENSSL_PATH = ../../../openssl-0.9.8v endif # Edit the path below to point to the base of your LibSSH2 package. ifndef LIBSSH2_PATH -LIBSSH2_PATH = ../../../libssh2-1.3.0 +LIBSSH2_PATH = ../../../libssh2-1.4.1 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 56f9947485..395fffbd92 100644 --- a/lib/Makefile.Watcom +++ b/lib/Makefile.Watcom @@ -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.8u +OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8v !endif !ifdef %ares_root diff --git a/lib/Makefile.b32 b/lib/Makefile.b32 index 487993a95b..37430acf21 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.5 +ZLIB_PATH = ..\..\zlib-1.2.6 !endif # Edit the path below to point to the base of your OpenSSL package. !ifndef OPENSSL_PATH -OPENSSL_PATH = ..\..\openssl-0.9.8q +OPENSSL_PATH = ..\..\openssl-0.9.8v !endif # Set libcurl static lib, dll and import lib diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index a6270b2188..adb5e5fe43 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -18,7 +18,7 @@ ZLIB_PATH = ../../zlib-1.2.6 endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8u +OPENSSL_PATH = ../../openssl-0.9.8v endif ifndef OPENSSL_INCLUDE OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc diff --git a/lib/Makefile.netware b/lib/Makefile.netware index 94e57c8c5c..32a1a84c31 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -19,7 +19,7 @@ endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8u +OPENSSL_PATH = ../../openssl-0.9.8v endif # Edit the path below to point to the base of your LibSSH2 package. diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6 index 63dd0eeb3b..e69f31a150 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -65,7 +65,7 @@ !INCLUDE ..\Makefile.msvc.names !IFNDEF OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8u +OPENSSL_PATH = ../../openssl-0.9.8v !ENDIF !IFNDEF LIBSSH2_PATH diff --git a/lib/Makefile.vxworks b/lib/Makefile.vxworks index 81a36cc0f9..3d555dd5c3 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.8a-vxWorks6.3/include -OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8a-vxWorks6.3 -ZLIB_INC := D:/libraries/zlib/zlib-1.2.3-VxWorks6.3/zlib-1.2.3 -ZLIB_LIB := D:/libraries/zlib/zlib-1.2.3-VxWorks6.3/binaries/vxworks_3.1_gnu/Debug/lib +OPENSSL_INC := D:/libraries/openssl/openssl-0.9.8v-vxWorks6.3/include +OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8v-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 ARES_INC := ARES_LIB := diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom index c88291e2cd..77fa91b4d1 100644 --- a/src/Makefile.Watcom +++ b/src/Makefile.Watcom @@ -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.8u +OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8v !endif !ifdef %ares_root diff --git a/src/Makefile.b32 b/src/Makefile.b32 index 37981b83c7..1a91c1461e 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.5 +ZLIB_PATH = ..\..\zlib-1.2.6 !endif # Edit the path below to point to the base of your OpenSSL package. !ifndef OPENSSL_PATH -OPENSSL_PATH = ..\..\openssl-0.9.8q +OPENSSL_PATH = ..\..\openssl-0.9.8v !endif # Set program's name diff --git a/src/Makefile.m32 b/src/Makefile.m32 index 29edc28393..17c6116c8e 100644 --- a/src/Makefile.m32 +++ b/src/Makefile.m32 @@ -18,7 +18,7 @@ ZLIB_PATH = ../../zlib-1.2.6 endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8u +OPENSSL_PATH = ../../openssl-0.9.8v endif ifndef OPENSSL_LIBPATH OPENSSL_LIBPATH = $(OPENSSL_PATH)/out diff --git a/src/Makefile.netware b/src/Makefile.netware index 9ea779935e..146d7e8e86 100644 --- a/src/Makefile.netware +++ b/src/Makefile.netware @@ -19,7 +19,7 @@ endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8u +OPENSSL_PATH = ../../openssl-0.9.8v endif # Edit the path below to point to the base of your LibSSH2 package. diff --git a/src/Makefile.vc6 b/src/Makefile.vc6 index 864e9b94df..4b52b1641b 100644 --- a/src/Makefile.vc6 +++ b/src/Makefile.vc6 @@ -57,7 +57,7 @@ PROGRAM_NAME = curl.exe !IFNDEF OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8u +OPENSSL_PATH = ../../openssl-0.9.8v !ENDIF !IFNDEF ZLIB_PATH