Merge commit 'ed434be1'

* commit 'ed434be1':
  configure: Bail out if both GnuTLS and OpenSSL are enabled
  configure: Move x86 assembler sanity check into assembler probe function
  build: Add missing zlib dependencies for several protocols

This commit is a noop, see
6dfcbd80
5cae5a1d
4600b061Merged-by: NJames Almer <jamrial@gmail.com>