summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/INSTALL4
-rw-r--r--docs/examples/Makefile.m328
-rw-r--r--docs/examples/Makefile.netware6
-rw-r--r--lib/Makefile.Watcom2
-rw-r--r--lib/Makefile.b324
-rw-r--r--lib/Makefile.m322
-rw-r--r--lib/Makefile.netware2
-rw-r--r--lib/Makefile.vc62
-rw-r--r--lib/Makefile.vxworks8
-rw-r--r--src/Makefile.Watcom2
-rw-r--r--src/Makefile.b324
-rw-r--r--src/Makefile.m322
-rw-r--r--src/Makefile.netware2
-rw-r--r--src/Makefile.vc62
14 files changed, 25 insertions, 25 deletions
diff --git a/docs/INSTALL b/docs/INSTALL
index eb56e0d25..43f02f64e 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 3c3d121ed..469d7a1cd 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 fdea6b81b..cba66a7a0 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 56f994748..395fffbd9 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 487993a95..37430acf2 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 a6270b218..adb5e5fe4 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 94e57c8c5..32a1a84c3 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 63dd0eeb3..e69f31a15 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 81a36cc0f..3d555dd5c 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 c88291e2c..77fa91b4d 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 37981b83c..1a91c1461 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 29edc2839..17c6116c8 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 9ea779935..146d7e8e8 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 864e9b94d..4b52b1641 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
View Lorry Controller Status