Merge commit 'ed434be106a4615e0419b3ac7664220741afda2d'
authorJames Almer <jamrial@gmail.com>
Wed, 1 Nov 2017 21:45:23 +0000 (18:45 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 1 Nov 2017 21:45:23 +0000 (18:45 -0300)
* commit 'ed434be106a4615e0419b3ac7664220741afda2d':
  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
6dfcbd80ad446ff163b47f2bf432bbf706436ea8
5cae5a1defa360da076365a786093a749d1ddf4e
4600b0619afc58b58de1a21d7a2c472e0d788282

Merged-by: James Almer <jamrial@gmail.com>

Trivial merge