Fix the handling of --with-zlib-include