r6118: Make it so that we can do --with-zlib=no in configure and also a couple