Closes: #4886 [Peter: fix whitespace, C++ dep, optional zlib dep] Signed-off-by: Simon Dawson <spdawson at gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>