From 1beda0cbb76358559b23fe59a8fd2fabaf7b6340 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Thu, 26 Apr 2012 14:40:50 +0200 Subject: Updated dependency lib versions. --- docs/INSTALL | 4 ++-- docs/examples/Makefile.m32 | 2 +- docs/examples/Makefile.netware | 2 +- lib/Makefile.Watcom | 2 +- lib/Makefile.b32 | 2 +- lib/Makefile.m32 | 2 +- lib/Makefile.netware | 2 +- lib/Makefile.vc6 | 2 +- lib/Makefile.vxworks | 4 ++-- src/Makefile.Watcom | 2 +- src/Makefile.b32 | 2 +- src/Makefile.m32 | 2 +- src/Makefile.netware | 2 +- src/Makefile.vc6 | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/INSTALL b/docs/INSTALL index 43f02f64e..137b64c42 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.8v + set OPENSSL_PATH=c:\openssl-0.9.8w 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.8v + set OPENSSL_PATH=c:\openssl-0.9.8w 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 469d7a1cd..930d0017c 100644 --- a/docs/examples/Makefile.m32 +++ b/docs/examples/Makefile.m32 @@ -38,7 +38,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.8v +OPENSSL_PATH = ../../../openssl-0.9.8w endif ifndef OPENSSL_LIBPATH OPENSSL_LIBPATH = $(OPENSSL_PATH)/out diff --git a/docs/examples/Makefile.netware b/docs/examples/Makefile.netware index cba66a7a0..b2fc329a9 100644 --- a/docs/examples/Makefile.netware +++ b/docs/examples/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.8v +OPENSSL_PATH = ../../../openssl-0.9.8w endif # Edit the path below to point to the base of your LibSSH2 package. diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom index 395fffbd9..9de52a8b1 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.8v +OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8w !endif !ifdef %ares_root diff --git a/lib/Makefile.b32 b/lib/Makefile.b32 index 37430acf2..4c45e910c 100644 --- a/lib/Makefile.b32 +++ b/lib/Makefile.b32 @@ -27,7 +27,7 @@ ZLIB_PATH = ..\..\zlib-1.2.6 # Edit the path below to point to the base of your OpenSSL package. !ifndef OPENSSL_PATH -OPENSSL_PATH = ..\..\openssl-0.9.8v +OPENSSL_PATH = ..\..\openssl-0.9.8w !endif # Set libcurl static lib, dll and import lib diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index adb5e5fe4..0b04c19ef 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.8v +OPENSSL_PATH = ../../openssl-0.9.8w endif ifndef OPENSSL_INCLUDE OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc diff --git a/lib/Makefile.netware b/lib/Makefile.netware index 32a1a84c3..c7d9bc655 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.8v +OPENSSL_PATH = ../../openssl-0.9.8w 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 e69f31a15..cf89c1644 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.8v +OPENSSL_PATH = ../../openssl-0.9.8w !ENDIF !IFNDEF LIBSSH2_PATH diff --git a/lib/Makefile.vxworks b/lib/Makefile.vxworks index 3d555dd5c..7e692ef76 100644 --- a/lib/Makefile.vxworks +++ b/lib/Makefile.vxworks @@ -33,8 +33,8 @@ BUILD_TYPE := debug USER_CFLAGS:= # directories where to seek for includes and libraries -OPENSSL_INC := D:/libraries/openssl/openssl-0.9.8v-vxWorks6.3/include -OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8v-vxWorks6.3 +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 ARES_INC := diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom index 77fa91b4d..b09ec6b0b 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.8v +OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8w !endif !ifdef %ares_root diff --git a/src/Makefile.b32 b/src/Makefile.b32 index 1a91c1461..ce1b766aa 100644 --- a/src/Makefile.b32 +++ b/src/Makefile.b32 @@ -27,7 +27,7 @@ ZLIB_PATH = ..\..\zlib-1.2.6 # Edit the path below to point to the base of your OpenSSL package. !ifndef OPENSSL_PATH -OPENSSL_PATH = ..\..\openssl-0.9.8v +OPENSSL_PATH = ..\..\openssl-0.9.8w !endif # Set program's name diff --git a/src/Makefile.m32 b/src/Makefile.m32 index 17c6116c8..c07aa3e04 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.8v +OPENSSL_PATH = ../../openssl-0.9.8w endif ifndef OPENSSL_LIBPATH OPENSSL_LIBPATH = $(OPENSSL_PATH)/out diff --git a/src/Makefile.netware b/src/Makefile.netware index 146d7e8e8..504a68a56 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.8v +OPENSSL_PATH = ../../openssl-0.9.8w 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 4b52b1641..036e9e3b8 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.8v +OPENSSL_PATH = ../../openssl-0.9.8w !ENDIF !IFNDEF ZLIB_PATH -- cgit v1.2.1