Commit 0f548802 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Updated dependency lib versions.

parent 5cd524df

docs/INSTALL

+2 −2
Original line number Diff line number Diff line
@@ -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

docs/examples/Makefile.m32

+4 −4
Original line number Diff line number Diff line
@@ -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

docs/examples/Makefile.netware

+3 −3
Original line number Diff line number Diff line
@@ -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.

lib/Makefile.Watcom

+1 −1
Original line number Diff line number Diff line
@@ -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

lib/Makefile.b32

+2 −2
Original line number Diff line number Diff line
@@ -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