Merge commit 'dad7a9c7c0ae8ebc56f2e3a24e6fa4da5c2cd491'
authorJames Almer <jamrial@gmail.com>
Wed, 27 Sep 2017 21:56:08 +0000 (18:56 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 27 Sep 2017 22:00:50 +0000 (19:00 -0300)
commit7659f35638e2ca7a8b202cb3007ca5473b108fa4
tree2832fafc044eddc970f74fd569a67a6ade401b44
parentf3aefb3e1c3c6afeaca889d4fd2648458fd74dfe
parentdad7a9c7c0ae8ebc56f2e3a24e6fa4da5c2cd491
Merge commit 'dad7a9c7c0ae8ebc56f2e3a24e6fa4da5c2cd491'

* commit 'dad7a9c7c0ae8ebc56f2e3a24e6fa4da5c2cd491':
  configure: Rework dependency handling for conflicting components

Includes an important fix made by c546147db07d16a76c2fb698d2e8a3057f393475
as well.

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