diff --git a/docs/INSTALL b/docs/INSTALL index 737128b369c0cdb4b2d437930c8840371729b4a8..50c82e104fe1277c2c93e5d9abc7d5c051aaf36e 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 10ad698ade2fcefacefaed601e669bb16bb669b9..6bfb9fa813a4f4df956a8e6d18d748c806a02682 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 44fde7e999ecab55158e3ac134167452be4056f5..2816cbd77f8256f71af83338b4f4dc7d7182fc51 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 ff991dc31199c23a4e80f7a7c26ed738f42ff447..b775365312899fe425d04b2f51b56b74d3923515 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 fbd584fb6c2a6987d063ad06614d8183244c779c..86251ba0b64538fa002969742a8b2e26c4ea3cf8 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 3df923a724b7116c0f2ea992ef36162db18688b6..a401c71f6232db3a12013c290bb6605b3795a27b 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 cd87c8d184a1bbc03306f0bdb21a7e78f2af519c..058047bb2b94b0928f47ee97451419789709e50b 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 18dfbb97c83a1e44b03beebba90f36cac0d21326..f22e0c3551dd41077481b07f44d46e8d4844e5b6 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 0860df8e7bcb754f5abbbb1ab93c8295e6b2222b..0f9de51ed5a5d97338cc3d21727ac29ff1d6fe92 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 761ceb5153e06aa1ff3cc66ca27c8fc63a973505..6b3103a35b1d1ab979e51247db8e0d7382e3b7ea 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 4622868ab1cc16e319ad176cc678936990b9ab0c..092c35ad99994a5d96e3b65040253245ef0950aa 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 3dd7bd6b84cade94e223a02b02c90ec70beef9e2..b4b1b0b6063c208418da8ea1d7ab035f495705b6 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 2b252c908511fb35ed36f6be0faae728a379ec6b..0ecc753b0a60c462da78edb1fbde254278b7aedb 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 02665c9e24b89aa75b5865193dd69cc35b4a21f4..ada265f24b5e143b1af1a563e2f8f8368f56d989 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