use our own ziplib to avoid linking problems (see #6149)

.travis.yml

@@ -39,7 +39,7 @@ install_linux: &install_linux
       awscli
   - wget https://raw.github.com/ocaml/opam/master/shell/opam_installer.sh -O - | sh -s /usr/local/bin system
   - export OPAMYES=1
-  - opam install sedlex camlzip xml-light extlib rope ptmap
+  - opam install sedlex xml-light extlib rope ptmap
   # Setup database
   - travis_retry sudo apt-get install mysql-server-5.6 -y
   - mysql -u root -e "create user travis@localhost identified by '';"
@@ -63,7 +63,7 @@ install_osx: &install_osx
   - travis_retry brew install opam;
   - export OPAMYES=1
   - opam init
-  - opam install camlp4 sedlex ocamlfind camlzip xml-light extlib rope ptmap
+  - opam install camlp4 sedlex ocamlfind xml-light extlib rope ptmap
   - eval `opam config env`
   # Install neko
   - travis_retry brew install neko --HEAD;

Makefile

@@ -28,8 +28,8 @@ STATICLINK?=0
 # Configuration
 
 HAXE_DIRECTORIES=compiler context generators generators/gencommon macro filters optimization syntax typing display
-EXTLIB_LIBS=extlib-leftovers extc neko javalib swflib ttflib ilib objsize pcre
-FINDLIB_LIBS=unix str threads sedlex camlzip xml-light extlib rope ptmap
+EXTLIB_LIBS=extlib-leftovers extc neko javalib swflib ttflib ilib objsize pcre ziplib
+FINDLIB_LIBS=unix str threads sedlex xml-light extlib rope ptmap
 
 # Includes, packages and compiler
 

appveyor.yml

@@ -39,7 +39,7 @@ install:
     - 7z x "opam64.tar.xz" -so | 7z x -aoa -si -ttar
     - '%CYG_ROOT%/bin/bash -lc "cd \"$OLDPWD\" && bash opam64/install.sh"'
     - '%CYG_ROOT%/bin/bash -lc "opam init mingw \"https://github.com/fdopen/opam-repository-mingw.git\" --comp 4.02.3+mingw64c --switch 4.02.3+mingw64c --auto-setup --yes"'
-    - '%CYG_ROOT%/bin/bash -lc "opam install camlp4 sedlex ocamlfind camlzip xml-light extlib rope ptmap --yes"'
+    - '%CYG_ROOT%/bin/bash -lc "opam install camlp4 sedlex ocamlfind xml-light extlib rope ptmap --yes"'
     # Install neko
     - choco install neko --prerelease --ignore-dependencies -s 'https://ci.appveyor.com/nuget/neko' -y
     - choco install chocolatey-core.extension php --ignore-dependencies -y

libs

@@ -1 +1 @@
-Subproject commit 5396ed3306f5a10be138d309d3f9dbf90b8ee07f
+Subproject commit dcd31f270aa5e770d7e8af068a0a45d9e076386b