From 5be2499e164ed017181ee7c320752cb1ffe196f5 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Sat, 9 Feb 2013 01:35:11 +0100 Subject: Updated dependency libs. --- 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 c13a66094..9e3c226a4 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -221,7 +221,7 @@ Win32 environment variables, for example: set ZLIB_PATH=c:\zlib-1.2.7 - set OPENSSL_PATH=c:\openssl-0.9.8x + set OPENSSL_PATH=c:\openssl-0.9.8y set LIBSSH2_PATH=c:\libssh2-1.4.3 ATTENTION: if you want to build with libssh2 support you have to use latest @@ -337,7 +337,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.8x + set OPENSSL_PATH=c:\openssl-0.9.8y 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 4e93093d6..10ad698ad 100644 --- a/docs/examples/Makefile.m32 +++ b/docs/examples/Makefile.m32 @@ -38,7 +38,7 @@ 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.8x +OPENSSL_PATH = ../../../openssl-0.9.8y endif # Edit the path below to point to the base of your LibSSH2 package. ifndef LIBSSH2_PATH diff --git a/docs/examples/Makefile.netware b/docs/examples/Makefile.netware index e1a48b7d5..44fde7e99 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.8x +OPENSSL_PATH = ../../../openssl-0.9.8y 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 c5e05523c..ff991dc31 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.8x +OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8y !endif !ifdef %ares_root diff --git a/lib/Makefile.b32 b/lib/Makefile.b32 index c71f651b5..fbd584fb6 100644 --- a/lib/Makefile.b32 +++ b/lib/Makefile.b32 @@ -27,7 +27,7 @@ ZLIB_PATH = ..\..\zlib-1.2.7 # Edit the path below to point to the base of your OpenSSL package. !ifndef OPENSSL_PATH -OPENSSL_PATH = ..\..\openssl-0.9.8x +OPENSSL_PATH = ..\..\openssl-0.9.8y !endif # Set libcurl static lib, dll and import lib diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index 0a69a877f..1de5af893 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -18,7 +18,7 @@ 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.8x +OPENSSL_PATH = ../../openssl-0.9.8y endif # Edit the path below to point to the base of your LibSSH2 package. ifndef LIBSSH2_PATH diff --git a/lib/Makefile.netware b/lib/Makefile.netware index 4b5cf34a5..cd87c8d18 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.8x +OPENSSL_PATH = ../../openssl-0.9.8y 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 34fb30c7f..acd9f7fac 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -65,7 +65,7 @@ !INCLUDE ..\winbuild\Makefile.msvc.names !IFNDEF OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8x +OPENSSL_PATH = ../../openssl-0.9.8y !ENDIF !IFNDEF LIBSSH2_PATH diff --git a/lib/Makefile.vxworks b/lib/Makefile.vxworks index 4d2aaa0b8..0860df8e7 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.8x-vxWorks6.3/include -OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8x-vxWorks6.3 +OPENSSL_INC := D:/libraries/openssl/openssl-0.9.8y-vxWorks6.3/include +OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8y-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 := diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom index a65924e1b..761ceb515 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.8x +OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8y !endif !ifdef %ares_root diff --git a/src/Makefile.b32 b/src/Makefile.b32 index 31d89f6e2..4622868ab 100644 --- a/src/Makefile.b32 +++ b/src/Makefile.b32 @@ -27,7 +27,7 @@ ZLIB_PATH = ..\..\zlib-1.2.7 # Edit the path below to point to the base of your OpenSSL package. !ifndef OPENSSL_PATH -OPENSSL_PATH = ..\..\openssl-0.9.8x +OPENSSL_PATH = ..\..\openssl-0.9.8y !endif # Set program's name diff --git a/src/Makefile.m32 b/src/Makefile.m32 index b56e206ca..891a000a5 100644 --- a/src/Makefile.m32 +++ b/src/Makefile.m32 @@ -18,7 +18,7 @@ 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.8x +OPENSSL_PATH = ../../openssl-0.9.8y endif # Edit the path below to point to the base of your LibSSH2 package. ifndef LIBSSH2_PATH diff --git a/src/Makefile.netware b/src/Makefile.netware index 82d24b94c..2b252c908 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.8x +OPENSSL_PATH = ../../openssl-0.9.8y 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 4a23c98cc..02665c9e2 100644 --- a/src/Makefile.vc6 +++ b/src/Makefile.vc6 @@ -56,7 +56,7 @@ PROGRAM_NAME = curl.exe !IFNDEF OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8x +OPENSSL_PATH = ../../openssl-0.9.8y !ENDIF !IFNDEF ZLIB_PATH -- cgit v1.2.3