moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

Updated dependency lib versions.

This commit is contained in:
Guenter Knauf 2012-04-12 20:44:50 +02:00
parent 51114f07f1
commit 03d4b9f078
9 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/INSTALL
View File

@ -217,9 +217,9 @@ Win32
adjust as necessary. It is also possible to override these paths with adjust as necessary. It is also possible to override these paths with
environment variables, for example: environment variables, for example:
set ZLIB_PATH=c:\zlib-1.2.5 set ZLIB_PATH=c:\zlib-1.2.6
set OPENSSL_PATH=c:\openssl-0.9.8r set OPENSSL_PATH=c:\openssl-0.9.8u
set LIBSSH2_PATH=c:\libssh2-1.2.8 set LIBSSH2_PATH=c:\libssh2-1.4.0
ATTENTION: if you want to build with libssh2 support you have to use latest 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! 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 documentation on how to compile zlib. Define the ZLIB_PATH environment
variable to the location of zlib.h and zlib.lib, for example: 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. 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 Before running nmake define the OPENSSL_PATH environment variable with
the root/base directory of OpenSSL, for example: 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 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 directory. 'nmake vc-ssl' will create a libcurl static and dynamic

6
lib/Makefile.Watcom
View File

@ -83,13 +83,13 @@ CFLAGS += -dWANT_IDN_PROTOTYPES
!ifdef %zlib_root !ifdef %zlib_root
ZLIB_ROOT = $(%zlib_root) ZLIB_ROOT = $(%zlib_root)
!else !else
ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.5 ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.6
!endif !endif
!ifdef %libssh2_root !ifdef %libssh2_root
LIBSSH2_ROOT = $(%libssh2_root) LIBSSH2_ROOT = $(%libssh2_root)
!else !else
LIBSSH2_ROOT = ..$(DS)..$(DS)libssh2-1.3.0 LIBSSH2_ROOT = ..$(DS)..$(DS)libssh2-1.4.0
!endif !endif
!ifdef %librtmp_root !ifdef %librtmp_root
@ -101,7 +101,7 @@ LIBRTMP_ROOT = ..$(DS)..$(DS)rtmpdump-2.3
!ifdef %openssl_root !ifdef %openssl_root
OPENSSL_ROOT = $(%openssl_root) OPENSSL_ROOT = $(%openssl_root)
!else !else
OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8r OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8u
!endif !endif
!ifdef %ares_root !ifdef %ares_root

8
lib/Makefile.m32
View File

@ -7,18 +7,18 @@
## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-sspi-winidn ## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-sspi-winidn
## ##
## Hint: you can also set environment vars to control the build, f.e.: ## 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 ## set ZLIB=1
# #
########################################################################### ###########################################################################
# Edit the path below to point to the base of your Zlib sources. # Edit the path below to point to the base of your Zlib sources.
ifndef ZLIB_PATH ifndef ZLIB_PATH
ZLIB_PATH = ../../zlib-1.2.5 ZLIB_PATH = ../../zlib-1.2.6
endif endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8r OPENSSL_PATH = ../../openssl-0.9.8u
endif endif
ifndef OPENSSL_INCLUDE ifndef OPENSSL_INCLUDE
OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc
@ -31,7 +31,7 @@ OPENSSL_LIBS = -leay32 -lssl32
endif endif
# Edit the path below to point to the base of your LibSSH2 package. # Edit the path below to point to the base of your LibSSH2 package.
ifndef LIBSSH2_PATH ifndef LIBSSH2_PATH
LIBSSH2_PATH = ../../libssh2-1.3.0 LIBSSH2_PATH = ../../libssh2-1.4.0
endif endif
# Edit the path below to point to the base of your librtmp package. # Edit the path below to point to the base of your librtmp package.
ifndef LIBRTMP_PATH ifndef LIBRTMP_PATH

6
lib/Makefile.netware
View File

@ -14,17 +14,17 @@ endif
# Edit the path below to point to the base of your Zlib sources. # Edit the path below to point to the base of your Zlib sources.
ifndef ZLIB_PATH ifndef ZLIB_PATH
ZLIB_PATH = ../../zlib-1.2.5 ZLIB_PATH = ../../zlib-1.2.6
endif endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8r OPENSSL_PATH = ../../openssl-0.9.8u
endif endif
# Edit the path below to point to the base of your LibSSH2 package. # Edit the path below to point to the base of your LibSSH2 package.
ifndef LIBSSH2_PATH ifndef LIBSSH2_PATH
LIBSSH2_PATH = ../../libssh2-1.3.0 LIBSSH2_PATH = ../../libssh2-1.4.0
endif endif
# Edit the path below to point to the base of your axTLS package. # Edit the path below to point to the base of your axTLS package.

6
lib/Makefile.vc6
View File

@ -65,15 +65,15 @@
!INCLUDE ..\Makefile.msvc.names !INCLUDE ..\Makefile.msvc.names
!IFNDEF OPENSSL_PATH !IFNDEF OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8r OPENSSL_PATH = ../../openssl-0.9.8u
!ENDIF !ENDIF
!IFNDEF LIBSSH2_PATH !IFNDEF LIBSSH2_PATH
LIBSSH2_PATH = ../../libssh2-1.2.8 LIBSSH2_PATH = ../../libssh2-1.4.0
!ENDIF !ENDIF
!IFNDEF ZLIB_PATH !IFNDEF ZLIB_PATH
ZLIB_PATH = ../../zlib-1.2.5 ZLIB_PATH = ../../zlib-1.2.6
!ENDIF !ENDIF
!IFNDEF MACHINE !IFNDEF MACHINE

6
src/Makefile.Watcom
View File

@ -72,13 +72,13 @@ CFLAGS += -d_WIN32_WINNT=0x0501 -dENABLE_IPV6
!ifdef %zlib_root !ifdef %zlib_root
ZLIB_ROOT = $(%zlib_root) ZLIB_ROOT = $(%zlib_root)
!else !else
ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.5 ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.6
!endif !endif
!ifdef %libssh2_root !ifdef %libssh2_root
LIBSSH2_ROOT = $(%libssh2_root) LIBSSH2_ROOT = $(%libssh2_root)
!else !else
LIBSSH2_ROOT = ..$(DS)..$(DS)libssh2-1.3.0 LIBSSH2_ROOT = ..$(DS)..$(DS)libssh2-1.4.0
!endif !endif
!ifdef %librtmp_root !ifdef %librtmp_root
@ -90,7 +90,7 @@ LIBRTMP_ROOT = ..$(DS)..$(DS)rtmpdump-2.3
!ifdef %openssl_root !ifdef %openssl_root
OPENSSL_ROOT = $(%openssl_root) OPENSSL_ROOT = $(%openssl_root)
!else !else
OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8r OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8u
!endif !endif
!ifdef %ares_root !ifdef %ares_root

8
src/Makefile.m32
View File

@ -7,18 +7,18 @@
## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-spi-winidn ## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-spi-winidn
## ##
## Hint: you can also set environment vars to control the build, f.e.: ## 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 ## set ZLIB=1
# #
########################################################################### ###########################################################################
# Edit the path below to point to the base of your Zlib sources. # Edit the path below to point to the base of your Zlib sources.
ifndef ZLIB_PATH ifndef ZLIB_PATH
ZLIB_PATH = ../../zlib-1.2.5 ZLIB_PATH = ../../zlib-1.2.6
endif endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8r OPENSSL_PATH = ../../openssl-0.9.8u
endif endif
ifndef OPENSSL_LIBPATH ifndef OPENSSL_LIBPATH
OPENSSL_LIBPATH = $(OPENSSL_PATH)/out OPENSSL_LIBPATH = $(OPENSSL_PATH)/out
@ -28,7 +28,7 @@ OPENSSL_LIBS = -leay32 -lssl32
endif endif
# Edit the path below to point to the base of your LibSSH2 package. # Edit the path below to point to the base of your LibSSH2 package.
ifndef LIBSSH2_PATH ifndef LIBSSH2_PATH
LIBSSH2_PATH = ../../libssh2-1.3.0 LIBSSH2_PATH = ../../libssh2-1.4.0
endif endif
# Edit the path below to point to the base of your librtmp package. # Edit the path below to point to the base of your librtmp package.
ifndef LIBRTMP_PATH ifndef LIBRTMP_PATH

6
src/Makefile.netware
View File

@ -14,17 +14,17 @@ endif
# Edit the path below to point to the base of your Zlib sources. # Edit the path below to point to the base of your Zlib sources.
ifndef ZLIB_PATH ifndef ZLIB_PATH
ZLIB_PATH = ../../zlib-1.2.5 ZLIB_PATH = ../../zlib-1.2.6
endif endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8r OPENSSL_PATH = ../../openssl-0.9.8u
endif endif
# Edit the path below to point to the base of your LibSSH2 package. # Edit the path below to point to the base of your LibSSH2 package.
ifndef LIBSSH2_PATH ifndef LIBSSH2_PATH
LIBSSH2_PATH = ../../libssh2-1.3.0 LIBSSH2_PATH = ../../libssh2-1.4.0
endif endif
# Edit the path below to point to the base of your axTLS package. # Edit the path below to point to the base of your axTLS package.

4
src/Makefile.vc6
View File

@ -57,11 +57,11 @@ PROGRAM_NAME = curl.exe
!IFNDEF OPENSSL_PATH !IFNDEF OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8r OPENSSL_PATH = ../../openssl-0.9.8u
!ENDIF !ENDIF
!IFNDEF ZLIB_PATH !IFNDEF ZLIB_PATH
ZLIB_PATH = ../../zlib-1.2.5 ZLIB_PATH = ../../zlib-1.2.6
!ENDIF !ENDIF
!IFNDEF MACHINE !IFNDEF MACHINE