From ccfa139c71ae6f6c1557a71d4873fad4487c5233 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Fri, 5 Dec 2014 14:54:25 +0100 Subject: [PATCH] build: updated dependencies in makefiles. --- docs/INSTALL | 4 ++-- docs/examples/Makefile.m32 | 2 +- docs/examples/Makefile.netware | 2 +- lib/Makefile.Watcom | 2 +- lib/Makefile.b32 | 2 +- lib/Makefile.m32 | 4 ++-- lib/Makefile.netware | 4 ++-- lib/Makefile.vc6 | 2 +- lib/Makefile.vxworks | 4 ++-- src/Makefile.Watcom | 2 +- src/Makefile.b32 | 2 +- src/Makefile.m32 | 4 ++-- src/Makefile.netware | 4 ++-- src/Makefile.vc6 | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/INSTALL b/docs/INSTALL index ea1f0decd..48c2e6c1f 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -209,7 +209,7 @@ Win32 environment variables, for example: set ZLIB_PATH=c:\zlib-1.2.8 - set OPENSSL_PATH=c:\openssl-0.9.8y + set OPENSSL_PATH=c:\openssl-0.9.8zc set LIBSSH2_PATH=c:\libssh2-1.4.3 ATTENTION: if you want to build with libssh2 support you have to use latest @@ -317,7 +317,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.8y + set OPENSSL_PATH=c:\openssl-0.9.8zc 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 8f99461df..f607013c2 100644 --- a/docs/examples/Makefile.m32 +++ b/docs/examples/Makefile.m32 @@ -38,7 +38,7 @@ ZLIB_PATH = ../../../zlib-1.2.8 endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../../openssl-0.9.8y +OPENSSL_PATH = ../../../openssl-0.9.8zc 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 2f1776c58..3fd6b3e77 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.8y +OPENSSL_PATH = ../../../openssl-0.9.8zc 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 3b519c3e4..14f5ac844 100644 --- a/lib/Makefile.Watcom +++ b/lib/Makefile.Watcom @@ -113,7 +113,7 @@ LIBRTMP_ROOT = ../../rtmpdump-2.3 !ifdef %openssl_root OPENSSL_ROOT = $(%openssl_root) !else -OPENSSL_ROOT = ../../openssl-0.9.8y +OPENSSL_ROOT = ../../openssl-0.9.8zc !endif !ifdef %ares_root diff --git a/lib/Makefile.b32 b/lib/Makefile.b32 index 9ad586af1..b9531fdf4 100644 --- a/lib/Makefile.b32 +++ b/lib/Makefile.b32 @@ -27,7 +27,7 @@ ZLIB_PATH = ..\..\zlib-1.2.8 # Edit the path below to point to the base of your OpenSSL package. !ifndef OPENSSL_PATH -OPENSSL_PATH = ..\..\openssl-0.9.8y +OPENSSL_PATH = ..\..\openssl-0.9.8zc !endif # Set libcurl static lib, dll and import lib diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index f6ef0a30f..f3673c5a3 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -18,7 +18,7 @@ ZLIB_PATH = ../../zlib-1.2.8 endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8y +OPENSSL_PATH = ../../openssl-0.9.8zc endif # Edit the path below to point to the base of your LibSSH2 package. ifndef LIBSSH2_PATH @@ -44,7 +44,7 @@ LDAP_SDK = c:/novell/ndk/cldapsdk/win32 endif # Edit the path below to point to the base of your nghttp2 package. ifndef NGHTTP2_PATH -NGHTTP2_PATH = ../../nghttp2-0.6.4 +NGHTTP2_PATH = ../../nghttp2-0.6.7 endif PROOT = .. diff --git a/lib/Makefile.netware b/lib/Makefile.netware index d6be53799..2481003a8 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.8y +OPENSSL_PATH = ../../openssl-0.9.8zc endif # Edit the path below to point to the base of your LibSSH2 package. @@ -44,7 +44,7 @@ endif # Edit the path below to point to the base of your nghttp2 package. ifndef NGHTTP2_PATH -NGHTTP2_PATH = ../../nghttp2-0.6.4 +NGHTTP2_PATH = ../../nghttp2-0.6.7 endif # Edit the path below to point to the base of your fbopenssl package. diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6 index 15275e994..b235fdd56 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.8y +OPENSSL_PATH = ../../openssl-0.9.8zc !ENDIF !IFNDEF LIBSSH2_PATH diff --git a/lib/Makefile.vxworks b/lib/Makefile.vxworks index 0f9de51ed..7ff197f03 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.8y-vxWorks6.3/include -OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8y-vxWorks6.3 +OPENSSL_INC := D:/libraries/openssl/openssl-0.9.8zc-vxWorks6.3/include +OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8zc-vxWorks6.3 ZLIB_INC := D:/libraries/zlib/zlib-1.2.8-VxWorks6.3/zlib-1.2.8 ZLIB_LIB := D:/libraries/zlib/zlib-1.2.8-VxWorks6.3/binaries/vxworks_3.1_gnu/Debug/lib ARES_INC := diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom index 8d9754f0d..c48566560 100644 --- a/src/Makefile.Watcom +++ b/src/Makefile.Watcom @@ -108,7 +108,7 @@ LIBRTMP_ROOT = ../../rtmpdump-2.3 !ifdef %openssl_root OPENSSL_ROOT = $(%openssl_root) !else -OPENSSL_ROOT = ../../openssl-0.9.8y +OPENSSL_ROOT = ../../openssl-0.9.8zc !endif !ifdef %ares_root diff --git a/src/Makefile.b32 b/src/Makefile.b32 index 9f9885a7f..6638a0115 100644 --- a/src/Makefile.b32 +++ b/src/Makefile.b32 @@ -27,7 +27,7 @@ ZLIB_PATH = ..\..\zlib-1.2.8 # Edit the path below to point to the base of your OpenSSL package. !ifndef OPENSSL_PATH -OPENSSL_PATH = ..\..\openssl-0.9.8y +OPENSSL_PATH = ..\..\openssl-0.9.8zc !endif # Set program's name diff --git a/src/Makefile.m32 b/src/Makefile.m32 index 22269298c..e54175ced 100644 --- a/src/Makefile.m32 +++ b/src/Makefile.m32 @@ -18,7 +18,7 @@ ZLIB_PATH = ../../zlib-1.2.8 endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH -OPENSSL_PATH = ../../openssl-0.9.8y +OPENSSL_PATH = ../../openssl-0.9.8zc endif # Edit the path below to point to the base of your LibSSH2 package. ifndef LIBSSH2_PATH @@ -56,7 +56,7 @@ LDAP_SDK = c:/novell/ndk/cldapsdk/win32 endif # Edit the path below to point to the base of your nghttp2 package. ifndef NGHTTP2_PATH -NGHTTP2_PATH = ../../nghttp2-0.6.4 +NGHTTP2_PATH = ../../nghttp2-0.6.7 endif PROOT = .. diff --git a/src/Makefile.netware b/src/Makefile.netware index 5b0c16bfe..b6b4861c8 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.8y +OPENSSL_PATH = ../../openssl-0.9.8zc endif # Edit the path below to point to the base of your LibSSH2 package. @@ -44,7 +44,7 @@ endif # Edit the path below to point to the base of your nghttp2 package. ifndef NGHTTP2_PATH -NGHTTP2_PATH = ../../nghttp2-0.6.4 +NGHTTP2_PATH = ../../nghttp2-0.6.7 endif # Edit the path below to point to the base of your fbopenssl package. diff --git a/src/Makefile.vc6 b/src/Makefile.vc6 index fb7fdd90f..c8693afb9 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.8y +OPENSSL_PATH = ../../openssl-0.9.8zc !ENDIF !IFNDEF ZLIB_PATH