Simon F authored 6 years ago and Natanael Copa committed 5 years ago

Also remove the --without-spdylay options as it no longer exists
and fix an unittest error on my machine.