fixed typo in ifdef
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
added zlib version
added first attempt for cmake
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
more tests with cmake