Commit 03d4b9f0 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Updated dependency lib versions.

parent 51114f07

docs/INSTALL

+5 −5
Original line number Diff line number Diff line
@@ -217,9 +217,9 @@ Win32 
   adjust as necessary. It is also possible to override these paths with

   environment variables, for example:



     set ZLIB_PATH=c:\zlib-1.2.5

     set OPENSSL_PATH=c:\openssl-0.9.8r

     set LIBSSH2_PATH=c:\libssh2-1.2.8

     set ZLIB_PATH=c:\zlib-1.2.6

     set OPENSSL_PATH=c:\openssl-0.9.8u

     set LIBSSH2_PATH=c:\libssh2-1.4.0



   ATTENTION: if you want to build with libssh2 support you have to use latest

   version 0.17 - previous versions will NOT work with 7.17.0 and later!
@@ -320,7 +320,7 @@ Win32 
   documentation on how to compile zlib. Define the ZLIB_PATH environment

   variable to the location of zlib.h and zlib.lib, for example:



     set ZLIB_PATH=c:\zlib-1.2.5

     set ZLIB_PATH=c:\zlib-1.2.6



   Then run 'nmake vc-zlib' in curl's root directory.
@@ -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.8q

     set OPENSSL_PATH=c:\openssl-0.9.8u



   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

lib/Makefile.Watcom

+3 −3
Original line number Diff line number Diff line
@@ -83,13 +83,13 @@ CFLAGS += -dWANT_IDN_PROTOTYPES 
!ifdef %zlib_root

ZLIB_ROOT = $(%zlib_root)

!else

ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.5

ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.6

!endif



!ifdef %libssh2_root

LIBSSH2_ROOT = $(%libssh2_root)

!else

LIBSSH2_ROOT = ..$(DS)..$(DS)libssh2-1.3.0

LIBSSH2_ROOT = ..$(DS)..$(DS)libssh2-1.4.0

!endif



!ifdef %librtmp_root
@@ -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.8r

OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8u

!endif



!ifdef %ares_root

lib/Makefile.m32

+4 −4
Original line number Diff line number Diff line
@@ -7,18 +7,18 @@ 
## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-sspi-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.8u

endif

ifndef OPENSSL_INCLUDE

OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc
@@ -31,7 +31,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.0

endif

# Edit the path below to point to the base of your librtmp package.

ifndef LIBRTMP_PATH

lib/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.8u

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.0

endif



# Edit the path below to point to the base of your axTLS package.

lib/Makefile.vc6

+3 −3
Original line number Diff line number Diff line
@@ -65,15 +65,15 @@ 
!INCLUDE ..\Makefile.msvc.names



!IFNDEF OPENSSL_PATH

OPENSSL_PATH   = ../../openssl-0.9.8r

OPENSSL_PATH   = ../../openssl-0.9.8u

!ENDIF



!IFNDEF LIBSSH2_PATH

LIBSSH2_PATH   = ../../libssh2-1.2.8

LIBSSH2_PATH   = ../../libssh2-1.4.0

!ENDIF



!IFNDEF ZLIB_PATH

ZLIB_PATH  = ../../zlib-1.2.5

ZLIB_PATH  = ../../zlib-1.2.6

!ENDIF



!IFNDEF MACHINE