aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuenter Knauf <lists@gknw.net>2013-05-11 17:08:00 +0200
committerGuenter Knauf <lists@gknw.net>2013-05-11 17:08:00 +0200
commitae26ee3489588f07a882a1f3fed18652a22ded90 (patch)
tree87144cfad59bd3dc6bc43a36b7358d339fc55de6
parent992bee504dce7605ebe424dcecf167e9cffeaee7 (diff)
Updated zlib version in build files.
-rw-r--r--docs/INSTALL4
-rw-r--r--docs/examples/Makefile.m324
-rw-r--r--docs/examples/Makefile.netware2
-rw-r--r--lib/Makefile.Watcom2
-rw-r--r--lib/Makefile.b322
-rw-r--r--lib/Makefile.m324
-rw-r--r--lib/Makefile.netware2
-rw-r--r--lib/Makefile.vc62
-rw-r--r--lib/Makefile.vxworks4
-rw-r--r--src/Makefile.Watcom2
-rw-r--r--src/Makefile.b322
-rw-r--r--src/Makefile.m324
-rw-r--r--src/Makefile.netware2
-rw-r--r--src/Makefile.vc62
14 files changed, 19 insertions, 19 deletions
diff --git a/docs/INSTALL b/docs/INSTALL
index 737128b36..50c82e104 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -220,7 +220,7 @@ Win32
adjust as necessary. It is also possible to override these paths with
environment variables, for example:
- set ZLIB_PATH=c:\zlib-1.2.7
+ set ZLIB_PATH=c:\zlib-1.2.8
set OPENSSL_PATH=c:\openssl-0.9.8y
set LIBSSH2_PATH=c:\libssh2-1.4.3
@@ -323,7 +323,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.7
+ set ZLIB_PATH=c:\zlib-1.2.8
Then run 'nmake vc-zlib' in curl's root directory.
diff --git a/docs/examples/Makefile.m32 b/docs/examples/Makefile.m32
index 10ad698ad..6bfb9fa81 100644
--- a/docs/examples/Makefile.m32
+++ b/docs/examples/Makefile.m32
@@ -27,14 +27,14 @@
## 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.7
+## set ZLIB_PATH=c:/zlib-1.2.8
## set ZLIB=1
#
###########################################################################
# Edit the path below to point to the base of your Zlib sources.
ifndef ZLIB_PATH
-ZLIB_PATH = ../../../zlib-1.2.7
+ZLIB_PATH = ../../../zlib-1.2.8
endif
# Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH
diff --git a/docs/examples/Makefile.netware b/docs/examples/Makefile.netware
index 44fde7e99..2816cbd77 100644
--- a/docs/examples/Makefile.netware
+++ b/docs/examples/Makefile.netware
@@ -14,7 +14,7 @@ endif
# Edit the path below to point to the base of your Zlib sources.
ifndef ZLIB_PATH
-ZLIB_PATH = ../../../zlib-1.2.7
+ZLIB_PATH = ../../../zlib-1.2.8
endif
# Edit the path below to point to the base of your OpenSSL package.
diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom
index ff991dc31..b77536531 100644
--- a/lib/Makefile.Watcom
+++ b/lib/Makefile.Watcom
@@ -83,7 +83,7 @@ CFLAGS += -dWANT_IDN_PROTOTYPES
!ifdef %zlib_root
ZLIB_ROOT = $(%zlib_root)
!else
-ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.7
+ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.8
!endif
!ifdef %libssh2_root
diff --git a/lib/Makefile.b32 b/lib/Makefile.b32
index fbd584fb6..86251ba0b 100644
--- a/lib/Makefile.b32
+++ b/lib/Makefile.b32
@@ -22,7 +22,7 @@ BCCDIR = $(MAKEDIR)\..
# Edit the path below to point to the base of your Zlib sources.
!ifndef ZLIB_PATH
-ZLIB_PATH = ..\..\zlib-1.2.7
+ZLIB_PATH = ..\..\zlib-1.2.8
!endif
# Edit the path below to point to the base of your OpenSSL package.
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 3df923a72..a401c71f6 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -7,14 +7,14 @@
## 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.7
+## set ZLIB_PATH=c:/zlib-1.2.8
## set ZLIB=1
#
###########################################################################
# Edit the path below to point to the base of your Zlib sources.
ifndef ZLIB_PATH
-ZLIB_PATH = ../../zlib-1.2.7
+ZLIB_PATH = ../../zlib-1.2.8
endif
# Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH
diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index cd87c8d18..058047bb2 100644
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -14,7 +14,7 @@ endif
# Edit the path below to point to the base of your Zlib sources.
ifndef ZLIB_PATH
-ZLIB_PATH = ../../zlib-1.2.7
+ZLIB_PATH = ../../zlib-1.2.8
endif
# Edit the path below to point to the base of your OpenSSL package.
diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 18dfbb97c..f22e0c355 100644
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -73,7 +73,7 @@ LIBSSH2_PATH = ../../libssh2-1.4.3
!ENDIF
!IFNDEF ZLIB_PATH
-ZLIB_PATH = ../../zlib-1.2.7
+ZLIB_PATH = ../../zlib-1.2.8
!ENDIF
!IFNDEF MACHINE
diff --git a/lib/Makefile.vxworks b/lib/Makefile.vxworks
index 0860df8e7..0f9de51ed 100644
--- a/lib/Makefile.vxworks
+++ b/lib/Makefile.vxworks
@@ -35,8 +35,8 @@ 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
-ZLIB_INC := D:/libraries/zlib/zlib-1.2.7-VxWorks6.3/zlib-1.2.7
-ZLIB_LIB := D:/libraries/zlib/zlib-1.2.7-VxWorks6.3/binaries/vxworks_3.1_gnu/Debug/lib
+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 :=
ARES_LIB :=
diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index 761ceb515..6b3103a35 100644
--- a/src/Makefile.Watcom
+++ b/src/Makefile.Watcom
@@ -72,7 +72,7 @@ CFLAGS += -d_WIN32_WINNT=0x0501 -dENABLE_IPV6
!ifdef %zlib_root
ZLIB_ROOT = $(%zlib_root)
!else
-ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.7
+ZLIB_ROOT = ..$(DS)..$(DS)zlib-1.2.8
!endif
!ifdef %libssh2_root
diff --git a/src/Makefile.b32 b/src/Makefile.b32
index 4622868ab..092c35ad9 100644
--- a/src/Makefile.b32
+++ b/src/Makefile.b32
@@ -22,7 +22,7 @@ BCCDIR = $(MAKEDIR)\..
# Edit the path below to point to the base of your Zlib sources.
!ifndef ZLIB_PATH
-ZLIB_PATH = ..\..\zlib-1.2.7
+ZLIB_PATH = ..\..\zlib-1.2.8
!endif
# Edit the path below to point to the base of your OpenSSL package.
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 3dd7bd6b8..b4b1b0b60 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -7,14 +7,14 @@
## 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.7
+## set ZLIB_PATH=c:/zlib-1.2.8
## set ZLIB=1
#
###########################################################################
# Edit the path below to point to the base of your Zlib sources.
ifndef ZLIB_PATH
-ZLIB_PATH = ../../zlib-1.2.7
+ZLIB_PATH = ../../zlib-1.2.8
endif
# Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH
diff --git a/src/Makefile.netware b/src/Makefile.netware
index 2b252c908..0ecc753b0 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -14,7 +14,7 @@ endif
# Edit the path below to point to the base of your Zlib sources.
ifndef ZLIB_PATH
-ZLIB_PATH = ../../zlib-1.2.7
+ZLIB_PATH = ../../zlib-1.2.8
endif
# Edit the path below to point to the base of your OpenSSL package.
diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index 02665c9e2..ada265f24 100644
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -60,7 +60,7 @@ OPENSSL_PATH = ../../openssl-0.9.8y
!ENDIF
!IFNDEF ZLIB_PATH
-ZLIB_PATH = ../../zlib-1.2.7
+ZLIB_PATH = ../../zlib-1.2.8
!ENDIF
!IFNDEF MACHINE